Skip to content

Commit 15031cc

Browse files
authored
Add an extra parameter to resolve requires static for modules see MJAVADOC-639
* add an extra parameter to resolve requires static for modules see MJAVADOC-639 Signed-off-by: olivier lamy <[email protected]> * simplify method name Signed-off-by: olivier lamy <[email protected]> * use parent pom released version Signed-off-by: olivier lamy <[email protected]> * minimum is jdk9 Signed-off-by: olivier lamy <[email protected]>
1 parent 2cd0a17 commit 15031cc

File tree

4 files changed

+39
-36
lines changed

4 files changed

+39
-36
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: java
22
jdk:
3-
- openjdk7
4-
- openjdk8
3+
- openjdk9
54
- openjdk11
65
- openjdk12
76
- openjdk13

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ public String extract( Path path )
268268
selectModule( additionalModule,
269269
Collections.unmodifiableMap( availableNamedModules ),
270270
Collections.unmodifiableMap( availableProviders ),
271-
requiredNamedModules );
271+
requiredNamedModules,
272+
request.isIncludeStatic() );
272273
}
273274

274275
// in case of identical module names, first one wins
@@ -381,7 +382,7 @@ private void selectRequires( JavaModuleDescriptor module,
381382
{
382383
if ( includeStatic || !requires.modifiers​().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC ) )
383384
{
384-
selectModule( requires.name(), availableModules, availableProviders, namedModules );
385+
selectModule( requires.name(), availableModules, availableProviders, namedModules, false );
385386
}
386387
}
387388

@@ -403,13 +404,13 @@ private void selectRequires( JavaModuleDescriptor module,
403404
}
404405

405406
private void selectModule( String module, Map<String, JavaModuleDescriptor> availableModules, Map<String, Set<String>> availableProviders,
406-
Set<String> namedModules )
407+
Set<String> namedModules, boolean includeStatic )
407408
{
408409
JavaModuleDescriptor requiredModule = availableModules.get( module );
409410

410411
if ( requiredModule != null && namedModules.add( module ) )
411412
{
412-
selectRequires( requiredModule, availableModules, availableProviders, namedModules, false );
413+
selectRequires( requiredModule, availableModules, availableProviders, namedModules, includeStatic );
413414
}
414415
}
415416

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

+13
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public abstract class ResolvePathsRequest<T>
4646

4747
private JavaModuleDescriptor resolvedMainModuleDescriptor;
4848

49+
private boolean includeStatic;
50+
4951
private ResolvePathsRequest()
5052
{
5153
}
@@ -232,4 +234,15 @@ public boolean isIncludeAllProviders()
232234
{
233235
return includeAllProviders;
234236
}
237+
238+
public boolean isIncludeStatic()
239+
{
240+
return includeStatic;
241+
}
242+
243+
public ResolvePathsRequest<T> setIncludeStatic( boolean includeStatic )
244+
{
245+
this.includeStatic = includeStatic;
246+
return this;
247+
}
235248
}

pom.xml

+20-30
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.codehaus.plexus</groupId>
77
<artifactId>plexus</artifactId>
8-
<version>6.1</version>
8+
<version>6.2</version>
99
</parent>
1010

1111
<artifactId>plexus-languages</artifactId>
@@ -79,6 +79,25 @@
7979
<topSiteURL>${scm.url}</topSiteURL>
8080
</configuration>
8181
</plugin>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-enforcer-plugin</artifactId>
85+
<executions>
86+
<execution>
87+
<id>enforce-java</id>
88+
<goals>
89+
<goal>enforce</goal>
90+
</goals>
91+
<configuration>
92+
<rules>
93+
<requireJavaVersion>
94+
<version>9</version>
95+
</requireJavaVersion>
96+
</rules>
97+
</configuration>
98+
</execution>
99+
</executions>
100+
</plugin>
82101
</plugins>
83102
</build>
84103

@@ -101,33 +120,4 @@
101120
</plugins>
102121
</reporting>
103122

104-
<profiles>
105-
<profile>
106-
<id>plexus-release</id>
107-
<build>
108-
<plugins>
109-
<plugin>
110-
<groupId>org.apache.maven.plugins</groupId>
111-
<artifactId>maven-enforcer-plugin</artifactId>
112-
<version>3.0.0-M1</version>
113-
<executions>
114-
<execution>
115-
<id>enforce-java</id>
116-
<goals>
117-
<goal>enforce</goal>
118-
</goals>
119-
<configuration>
120-
<rules>
121-
<requireJavaVersion>
122-
<version>9</version>
123-
</requireJavaVersion>
124-
</rules>
125-
</configuration>
126-
</execution>
127-
</executions>
128-
</plugin>
129-
</plugins>
130-
</build>
131-
</profile>
132-
</profiles>
133123
</project>

0 commit comments

Comments
 (0)