Support requires static transitive

.github/workflows/maven.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest, macOS-latest]
-        java: [8, 11, 14, 15, 16, 17-ea]
+        java: [8, 11, 16, 17-ea]
         jdk: [adopt-hotspot, zulu, adopt-openj9]
       fail-fast: false
 
@@ -45,7 +45,7 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK
-        uses: actions/setup-java@v2.1.0
+        uses: actions/setup-java@v2.2.0
         with:
           distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}

README.md

@@ -1,5 +1,5 @@
 # Plexus Language
-[![Build Status](https://travis-ci.org/codehaus-plexus/plexus-languages.svg?branch=master)](https://travis-ci.org/codehaus-plexus/plexus-languages)
+![Build Status](https://github.com/codehaus-plexus/plexus-languages/workflows/GitHub%20CI/badge.svg)
 
 Plexus Languages:
 

plexus-java/pom.xml

@@ -81,6 +81,18 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>2.2</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-library</artifactId>
+        <version>2.2</version>
+        <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -90,7 +102,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.11.2</version>
+      <version>3.12.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/AsmModuleInfoParser.java

@@ -25,7 +25,9 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
@@ -60,10 +62,19 @@ public ModuleVisitor visitModule( String name, int arg1, String arg2 )
                     @Override
                     public void visitRequire( String module, int access, String version )
                     {
-                        if ( ( access & Opcodes.ACC_STATIC_PHASE ) != 0 )
+                        if ( ( access & ( Opcodes.ACC_STATIC_PHASE | Opcodes.ACC_TRANSITIVE ) ) != 0 )
                         {
-                            wrapper.builder.requires​( Collections.singleton( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC ),
-                                                       module );
+                            Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers = new LinkedHashSet<>();
+                            if ( ( access & Opcodes.ACC_STATIC_PHASE ) != 0 )
+                            {
+                                modifiers.add( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC );
+                            }
+                            if ( ( access & Opcodes.ACC_TRANSITIVE ) != 0 )
+                            {
+                                modifiers.add( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );
+                            }
+
+                            wrapper.builder.requires​( modifiers, module );
                         }
                         else
                         {

plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/JavaModuleDescriptor.java

@@ -26,7 +26,7 @@
 import java.util.Set;
 
 /**
- * Simple representation of a Module containing info required by this plugin.
+ * Simple representation of a ModuleDescriptor containing info required by this plugin.
  * It will provide only methods matching Java 9 ModuleDescriptor, so once Java 9  is required, we can easily switch 
  * 
  * @author Robert Scholte
@@ -231,7 +231,7 @@ public JavaModuleDescriptor build()
     }
 
     /**
-     * Represents Module.Requires
+     * Represents ModuleDescriptor.Requires
      * 
      * @author Robert Scholte
      * @since 1.0.0
@@ -265,14 +265,14 @@ public String name()
         }
 
         /**
-         * Represents Module.Requires.Modifier
+         * Represents ModuleDescriptor.Requires.Modifier
          * 
          * @author Robert Scholte
          * @since 1.0.0
          */
         public static enum JavaModifier
         {
-            STATIC
+            STATIC, TRANSITIVE
         }
 
         @Override
@@ -311,7 +311,7 @@ public boolean equals( Object obj )
     }
 
     /**
-     * Represents Module.Requires
+     * Represents ModuleDescriptor.Exports
      * 
      * @author Robert Scholte
      * @since 1.0.0
@@ -380,7 +380,7 @@ public boolean equals( Object obj )
     }
 
     /**
-     * Represents Module.Provides
+     * Represents ModuleDescriptor.Provides
      * 
      * @author Robert Scholte
      * @since 1.0.0

plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java

@@ -261,6 +261,7 @@ public String extract( Path path )
                             Collections.unmodifiableMap( availableNamedModules ),
                             Collections.unmodifiableMap( availableProviders ), 
                             requiredNamedModules,
+                            true, 
                             true );
         }
 
@@ -270,7 +271,8 @@ public String extract( Path path )
                           Collections.unmodifiableMap( availableNamedModules ), 
                           Collections.unmodifiableMap( availableProviders ), 
                           requiredNamedModules,
-                          request.isIncludeStatic() );
+                          request.isIncludeStatic(), 
+                          true );
         }
 
         // in case of identical module names, first one wins
@@ -398,13 +400,19 @@ private void selectRequires( JavaModuleDescriptor module,
                                  Map<String, JavaModuleDescriptor> availableModules,
                                  Map<String, Set<String>> availableProviders,
                                  Set<String> namedModules,
-                                 boolean includeStatic )
+                                 boolean includeStatic, 
+                                 boolean includeTransitive )
     {
         for ( JavaModuleDescriptor.JavaRequires requires : module.requires() )
         {
+            // includeTransitive is one level deeper compared to includeStatic
             if ( includeStatic || !requires.modifiers​().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC )  )
             {
-                selectModule( requires.name(), availableModules, availableProviders, namedModules, false );
+                selectModule( requires.name(), availableModules, availableProviders, namedModules, false, includeStatic );
+            }
+            else if ( includeTransitive && requires.modifiers​().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE )  )
+            {
+                selectModule( requires.name(), availableModules, availableProviders, namedModules, false, includeStatic );
             }
         }
 
@@ -418,21 +426,21 @@ private void selectRequires( JavaModuleDescriptor module,
 
                     if ( requiredModule != null && namedModules.add( providerModule ) )
                     {
-                        selectRequires( requiredModule, availableModules, availableProviders, namedModules, false );
+                        selectRequires( requiredModule, availableModules, availableProviders, namedModules, false, includeStatic );
                     }
                 }
             }
         }        
     }
 
     private void selectModule( String module, Map<String, JavaModuleDescriptor> availableModules, Map<String, Set<String>> availableProviders,
-                               Set<String> namedModules, boolean includeStatic )
+                               Set<String> namedModules, boolean includeStatic, boolean includeTransitive )
     {
         JavaModuleDescriptor requiredModule = availableModules.get( module );
 
         if ( requiredModule != null && namedModules.add( module ) )
         {
-            selectRequires( requiredModule, availableModules, availableProviders, namedModules, includeStatic );
+            selectRequires( requiredModule, availableModules, availableProviders, namedModules, includeStatic, includeTransitive );
         }
     }
 

plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/SourceModuleInfoParser.java

@@ -24,6 +24,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -56,10 +57,19 @@ public org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor fromSourcePa
 
             for ( JavaModuleDescriptor.JavaRequires requires : descriptor.getRequires() )
             {
-                if ( requires.isStatic() )
+                if ( requires.isStatic() || requires.isTransitive() )
                 {
-                    builder.requires​( Collections.singleton( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC ),
-                                      requires.getModule().getName() );
+                    Set<org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers =
+                        new LinkedHashSet<>( 2 );
+                    if ( requires.isStatic() )
+                    {
+                        modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC );
+                    }
+                    if ( requires.isTransitive() )
+                    {
+                        modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );
+                    }
+                    builder.requires​( modifiers , requires.getModule().getName() );
                 }
                 else
                 {

plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParser.java

@@ -24,6 +24,8 @@
 
 import java.lang.module.ModuleDescriptor;
 import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.Builder;
 
@@ -38,10 +40,19 @@ JavaModuleDescriptor parse( InputStream in ) throws IOException
 
         for ( ModuleDescriptor.Requires requires : descriptor.requires() )
         {
-            if ( requires.modifiers().contains( ModuleDescriptor.Requires.Modifier.STATIC ) )
+            if ( requires.modifiers().contains( ModuleDescriptor.Requires.Modifier.STATIC )
+                || requires.modifiers().contains( ModuleDescriptor.Requires.Modifier.TRANSITIVE ) )
             {
-                builder.requires​( Collections.singleton( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC ),
-                                  requires.name() );
+                Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers = new LinkedHashSet<>();
+                if ( requires.modifiers().contains( ModuleDescriptor.Requires.Modifier.STATIC ) )
+                {
+                    modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC );
+                }
+                if ( requires.modifiers().contains( ModuleDescriptor.Requires.Modifier.TRANSITIVE ) )
+                {
+                    modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );
+                }
+                builder.requires​( modifiers, requires.name() );
             }
             else
             {