This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 138878fac Fix automatic module names and missing methanol (#1651)
138878fac is described below
commit 138878fac7e4c401e3689db093ae238933f4c242
Author: Tamas Cservenak <[email protected]>
AuthorDate: Wed Nov 5 12:15:01 2025 +0100
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.
---
.../aether/transport/jdk/JdkRFC9457Reporter.java | 67 ----------------------
.../maven-resolver-transport-jdk/pom.xml | 16 ++++--
.../pom.xml | 3 +-
.../aether/transport/jdk/JdkRFC9457Reporter.java | 0
.../aether/transport/jdk/JdkTransporter.java | 0
.../aether/transport/jdk/JdkTransporterCloser.java | 0
.../jdk/JdkTransporterConfigurationKeys.java | 0
.../transport/jdk/JdkTransporterFactory.java | 0
.../aether/transport/jdk/JdkTransporterTest.java | 0
.../pom.xml | 2 +-
.../transport/jdk/JdkTransporterFactory.java | 0
.../eclipse/aether/transport/jdk/package-info.java | 0
maven-resolver-transport-jdk-parent/pom.xml | 14 ++++-
13 files changed, 24 insertions(+), 78 deletions(-)
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java
deleted file mode 100644
index 15f2d7be7..000000000
---
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.eclipse.aether.transport.jdk;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
-
-import
org.eclipse.aether.spi.connector.transport.http.HttpTransporterException;
-import org.eclipse.aether.spi.connector.transport.http.RFC9457.RFC9457Reporter;
-
-public class JdkRFC9457Reporter extends RFC9457Reporter<HttpURLConnection,
HttpTransporterException> {
- public static final JdkRFC9457Reporter INSTANCE = new JdkRFC9457Reporter();
-
- private JdkRFC9457Reporter() {}
-
- @Override
- protected boolean isRFC9457Message(final HttpURLConnection response) {
- String contentType = response.getContentType();
- return hasRFC9457ContentType(contentType);
- }
-
- @Override
- protected int getStatusCode(final HttpURLConnection response) {
- try {
- return response.getResponseCode();
- } catch (IOException e) {
- return -1;
- }
- }
-
- @Override
- protected String getReasonPhrase(final HttpURLConnection response) {
- return null;
- }
-
- @Override
- protected String getBody(final HttpURLConnection response) throws
IOException {
- try (BufferedReader br =
- new BufferedReader(new
InputStreamReader(response.getInputStream(), StandardCharsets.UTF_8))) {
- StringBuilder sb = new StringBuilder();
- String line;
- while ((line = br.readLine()) != null) {
- sb.append(line);
- }
- return sb.toString();
- }
- }
-}
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
index 41ee91d94..9bed21bde 100644
--- a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
@@ -43,17 +43,21 @@
<!-- These dependencies are actually included in this multi-release JAR -->
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-jdk-8</artifactId>
+ <artifactId>maven-resolver-transport-jdk8</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-jdk-11</artifactId>
+ <artifactId>maven-resolver-transport-jdk11</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.github.mizosoft.methanol</groupId>
+ <artifactId>methanol</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -104,9 +108,9 @@
<goals>
<goal>unpack-dependencies</goal>
</goals>
- <phase>prepare-package</phase>
+ <phase>generate-resources</phase>
<configuration>
-
<includeArtifactIds>maven-resolver-transport-jdk-8</includeArtifactIds>
+
<includeArtifactIds>maven-resolver-transport-jdk8</includeArtifactIds>
<excludeClassifiers>sources</excludeClassifiers>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<excludes>META-INF/maven/**</excludes>
@@ -117,9 +121,9 @@
<goals>
<goal>unpack-dependencies</goal>
</goals>
- <phase>prepare-package</phase>
+ <phase>generate-resources</phase>
<configuration>
-
<includeArtifactIds>maven-resolver-transport-jdk-11</includeArtifactIds>
+
<includeArtifactIds>maven-resolver-transport-jdk11</includeArtifactIds>
<excludeClassifiers>sources</excludeClassifiers>
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/11</outputDirectory>
<includes>**/*.class</includes>
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/pom.xml
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/pom.xml
similarity index 97%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/pom.xml
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/pom.xml
index b65220eb0..dfd6d6eae 100644
---
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.14-SNAPSHOT</version>
</parent>
- <artifactId>maven-resolver-transport-jdk-11</artifactId>
+ <artifactId>maven-resolver-transport-jdk11</artifactId>
<packaging>jar</packaging>
<name>Maven Artifact Resolver Transport JDK 11</name>
@@ -56,7 +56,6 @@
<dependency>
<groupId>com.github.mizosoft.methanol</groupId>
<artifactId>methanol</artifactId>
- <version>1.8.4</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkRFC9457Reporter.java
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterCloser.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterCloser.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterCloser.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterCloser.java
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/pom.xml
similarity index 97%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/pom.xml
index f2c0253a5..625a32951 100644
--- a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.14-SNAPSHOT</version>
</parent>
- <artifactId>maven-resolver-transport-jdk-8</artifactId>
+ <artifactId>maven-resolver-transport-jdk8</artifactId>
<packaging>jar</packaging>
<name>Maven Artifact Resolver Transport JDK 8</name>
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
similarity index 100%
rename from
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk8/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
diff --git a/maven-resolver-transport-jdk-parent/pom.xml
b/maven-resolver-transport-jdk-parent/pom.xml
index b081ed595..97c1067e2 100644
--- a/maven-resolver-transport-jdk-parent/pom.xml
+++ b/maven-resolver-transport-jdk-parent/pom.xml
@@ -33,8 +33,18 @@
<description>Maven Artifact Transport JDK Java 11+ parent.</description>
<modules>
- <module>maven-resolver-transport-jdk-8</module>
- <module>maven-resolver-transport-jdk-11</module>
+ <module>maven-resolver-transport-jdk8</module>
+ <module>maven-resolver-transport-jdk11</module>
<module>maven-resolver-transport-jdk</module>
</modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.mizosoft.methanol</groupId>
+ <artifactId>methanol</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
