Skip to content

Commit 138878f

Browse files
authored
Fix automatic module names and missing methanol (#1651)
They were generated as illegal. See: https://github.com/sormuras/modules/blob/main/doc/suspicious/illegal-automatic-module-names.txt This goes along with coordinate change of `-jdk8` and `-jdk11` constituents, but hopefully nothing addresses those (at least in Maven), as everything should use the `-jdk` MR-JAR instead (created out of those two constituents). Also, by reordering m-dependency-p invocation, it is not overwriting now the bnd generated manifest, and it also fixes its module name as well. Another issue was Methanol, as MR-JAR did not enlist it as dependency, leading to defunct MR-JAR of jdk transport.
1 parent 2e40f22 commit 138878f

File tree

13 files changed

+24
-78
lines changed

13 files changed

+24
-78
lines changed

maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,21 @@
4343
<!-- These dependencies are actually included in this multi-release JAR -->
4444
<dependency>
4545
<groupId>org.apache.maven.resolver</groupId>
46-
<artifactId>maven-resolver-transport-jdk-8</artifactId>
46+
<artifactId>maven-resolver-transport-jdk8</artifactId>
4747
<version>${project.version}</version>
4848
<optional>true</optional>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.apache.maven.resolver</groupId>
52-
<artifactId>maven-resolver-transport-jdk-11</artifactId>
52+
<artifactId>maven-resolver-transport-jdk11</artifactId>
5353
<version>${project.version}</version>
5454
<optional>true</optional>
5555
</dependency>
5656

57+
<dependency>
58+
<groupId>com.github.mizosoft.methanol</groupId>
59+
<artifactId>methanol</artifactId>
60+
</dependency>
5761
<dependency>
5862
<groupId>org.slf4j</groupId>
5963
<artifactId>slf4j-api</artifactId>
@@ -104,9 +108,9 @@
104108
<goals>
105109
<goal>unpack-dependencies</goal>
106110
</goals>
107-
<phase>prepare-package</phase>
111+
<phase>generate-resources</phase>
108112
<configuration>
109-
<includeArtifactIds>maven-resolver-transport-jdk-8</includeArtifactIds>
113+
<includeArtifactIds>maven-resolver-transport-jdk8</includeArtifactIds>
110114
<excludeClassifiers>sources</excludeClassifiers>
111115
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
112116
<excludes>META-INF/maven/**</excludes>
@@ -117,9 +121,9 @@
117121
<goals>
118122
<goal>unpack-dependencies</goal>
119123
</goals>
120-
<phase>prepare-package</phase>
124+
<phase>generate-resources</phase>
121125
<configuration>
122-
<includeArtifactIds>maven-resolver-transport-jdk-11</includeArtifactIds>
126+
<includeArtifactIds>maven-resolver-transport-jdk11</includeArtifactIds>
123127
<excludeClassifiers>sources</excludeClassifiers>
124128
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/11</outputDirectory>
125129
<includes>**/*.class</includes>

maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/pom.xml renamed to maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<version>2.0.14-SNAPSHOT</version>
2727
</parent>
2828

29-
<artifactId>maven-resolver-transport-jdk-11</artifactId>
29+
<artifactId>maven-resolver-transport-jdk11</artifactId>
3030
<packaging>jar</packaging>
3131

3232
<name>Maven Artifact Resolver Transport JDK 11</name>
@@ -56,7 +56,6 @@
5656
<dependency>
5757
<groupId>com.github.mizosoft.methanol</groupId>
5858
<artifactId>methanol</artifactId>
59-
<version>1.8.4</version>
6059
</dependency>
6160
<dependency>
6261
<groupId>javax.inject</groupId>

maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml renamed to maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<version>2.0.14-SNAPSHOT</version>
2727
</parent>
2828

29-
<artifactId>maven-resolver-transport-jdk-8</artifactId>
29+
<artifactId>maven-resolver-transport-jdk8</artifactId>
3030
<packaging>jar</packaging>
3131

3232
<name>Maven Artifact Resolver Transport JDK 8</name>

0 commit comments

Comments
 (0)