Skip to content

Commit ab77551

Browse files
committed
U fix get module dependencies
1 parent 72125ad commit ab77551

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
2-
#Thu Jan 09 11:09:02 GMT 2020
2+
#Thu Jan 09 12:04:14 GMT 2020
33
javapackager-0.8.7.pom>=
44
javapackager-0.8.7.jar>=
181 Bytes
Binary file not shown.

releases/fvarrui/maven/javapackager/maven-metadata-local.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<version>0.8.6</version>
1919
<version>0.8.7</version>
2020
</versions>
21-
<lastUpdated>20200109110902</lastUpdated>
21+
<lastUpdated>20200109120414</lastUpdated>
2222
</versioning>
2323
</metadata>

src/main/java/fvarrui/maven/plugin/javapackager/PackageMojo.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,10 +687,11 @@ private String getRequiredModules(File libsFolder) throws MojoExecutionException
687687

688688
modulesList = Arrays.asList(modules.split(","))
689689
.stream()
690+
.filter(module -> !module.startsWith("jdk."))
690691
.collect(Collectors.toList());
691692

692693

693-
} else {
694+
} else if (JavaUtils.getJavaMajorVersion() >= 9) {
694695

695696
String modules =
696697
ProcessUtils.execute(
@@ -706,8 +707,13 @@ private String getRequiredModules(File libsFolder) throws MojoExecutionException
706707
.stream()
707708
.map(module -> module.trim())
708709
.filter(module -> !module.startsWith("JDK removed internal"))
710+
.filter(module -> !module.startsWith("jdk."))
709711
.collect(Collectors.toList());
710712

713+
} else {
714+
715+
modulesList = Arrays.asList("ALL-MODULE-PATH");
716+
711717
}
712718

713719
modulesList.addAll(additionalModules);

src/main/java/fvarrui/maven/plugin/javapackager/utils/JavaUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ public class JavaUtils {
44

55
public static int getJavaMajorVersion() {
66
String version = System.getProperty("java.version");
7-
return Integer.parseInt(version.split("\\.")[0]);
7+
8+
int major = Integer.parseInt(version.split("\\.")[0]);
9+
if (major >= 2) return major;
10+
11+
return Integer.parseInt(version.split("\\.")[1]);
812
}
913

1014
}

0 commit comments

Comments
 (0)