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 e255be22 [MRESOLVER-442] Build JDK transport MR JAR the proper way
(#381)
e255be22 is described below
commit e255be2274fc6c74a25419349f393e9d07689c47
Author: Tamas Cservenak <[email protected]>
AuthorDate: Tue Nov 28 11:34:56 2023 +0100
[MRESOLVER-442] Build JDK transport MR JAR the proper way (#381)
The current master builds JAR that it is not reusable in any project that
uses enforcer (like Maven is).
Make JAR "java 8" and let "java 11" byte classes get into their proper
place.
---
https://issues.apache.org/jira/browse/MRESOLVER-442
---
.../maven-resolver-transport-jdk-11}/pom.xml | 35 +------
.../eclipse/aether/transport/jdk/JdkException.java | 0
.../aether/transport/jdk/JdkTransporter.java | 0
.../jdk/JdkTransporterConfigurationKeys.java | 0
.../transport/jdk/JdkTransporterFactory.java | 13 +--
.../aether/transport/jdk/JdkTransporterTest.java | 0
.../maven-resolver-transport-jdk-8}/pom.xml | 51 +--------
.../transport/jdk/JdkTransporterFactory.java | 30 ++----
.../eclipse/aether/transport/jdk/package-info.java | 0
.../maven-resolver-transport-jdk}/pom.xml | 115 +++++++++++++--------
maven-resolver-transport-jdk-parent/pom.xml | 40 +++++++
pom.xml | 2 +-
12 files changed, 131 insertions(+), 155 deletions(-)
diff --git a/maven-resolver-transport-jdk/pom.xml
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/pom.xml
similarity index 76%
copy from maven-resolver-transport-jdk/pom.xml
copy to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/pom.xml
index 7918a81c..cd3b54cb 100644
--- a/maven-resolver-transport-jdk/pom.xml
+++
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/pom.xml
@@ -22,21 +22,20 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver</artifactId>
+ <artifactId>maven-resolver-transport-jdk-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>maven-resolver-transport-jdk</artifactId>
+ <artifactId>maven-resolver-transport-jdk-11</artifactId>
<packaging>jar</packaging>
- <name>Maven Artifact Resolver Transport JDK</name>
+ <name>Maven Artifact Resolver Transport JDK 11</name>
<description>Maven Artifact Transport JDK Java 11+.</description>
<properties>
<Automatic-Module-Name>org.apache.maven.resolver.transport.jdk</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>
- <!-- SPI stays java 8 but rest is java11+ -->
<javaVersion>11</javaVersion>
</properties>
@@ -63,6 +62,7 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -99,33 +99,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>force-java8-spi</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <release>8</release>
- <includes>**/JdkTransporterFactory.java</includes>
- </configuration>
- </execution>
- <execution>
- <id>default-compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <excludes>**/JdkTransporterFactory.java</excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkException.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkException.java
similarity index 100%
rename from
maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkException.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkException.java
diff --git
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
similarity index 100%
rename from
maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
diff --git
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
similarity index 100%
rename from
maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterConfigurationKeys.java
diff --git
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
similarity index 86%
copy from
maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
copy to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
index b245ddfa..2188db26 100644
---
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
+++
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
@@ -25,12 +25,11 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.transport.Transporter;
import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.transfer.NoTransporterException;
-import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
/**
- * JDK Transport factory.
+ * JDK Transport factory: on Java11+ it works.
*
* @since 2.0.0
*/
@@ -56,17 +55,11 @@ public final class JdkTransporterFactory implements
TransporterFactory {
requireNonNull(session, "session cannot be null");
requireNonNull(repository, "repository cannot be null");
- int javaVersion = javaVersion();
- if (javaVersion < 11) {
- LoggerFactory.getLogger(JdkTransporterFactory.class).debug("Needs
Java11+ to function");
- throw new NoTransporterException(repository, "JDK Transport needs
Java11+");
- }
-
if (!"http".equalsIgnoreCase(repository.getProtocol()) &&
!"https".equalsIgnoreCase(repository.getProtocol())) {
throw new NoTransporterException(repository, "Only HTTP/HTTPS is
supported");
}
- return new JdkTransporter(session, repository, javaVersion);
+ return new JdkTransporter(session, repository, javaVersion());
}
private static int javaVersion() {
@@ -77,7 +70,7 @@ public final class JdkTransporterFactory implements
TransporterFactory {
final int sep = (dot > 0 && dot < hyphen || hyphen < 0) ? dot :
hyphen;
return Integer.parseInt(sep > 0 ? version.substring(0, sep) :
version);
} catch (final NumberFormatException nfe) {
- return 11; // unlikely to be a pre-java 11 version so let it pass
+ return 11; // cannot be a pre-java 11 version so let it pass
}
}
}
diff --git
a/maven-resolver-transport-jdk/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
similarity index 100%
rename from
maven-resolver-transport-jdk/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
diff --git a/maven-resolver-transport-jdk/pom.xml
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml
similarity index 64%
copy from maven-resolver-transport-jdk/pom.xml
copy to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml
index 7918a81c..90c3be49 100644
--- a/maven-resolver-transport-jdk/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml
@@ -22,22 +22,21 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver</artifactId>
+ <artifactId>maven-resolver-transport-jdk-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>maven-resolver-transport-jdk</artifactId>
+ <artifactId>maven-resolver-transport-jdk-8</artifactId>
<packaging>jar</packaging>
- <name>Maven Artifact Resolver Transport JDK</name>
+ <name>Maven Artifact Resolver Transport JDK 8</name>
<description>Maven Artifact Transport JDK Java 11+.</description>
<properties>
<Automatic-Module-Name>org.apache.maven.resolver.transport.jdk</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>
- <!-- SPI stays java 8 but rest is java11+ -->
- <javaVersion>11</javaVersion>
+ <javaVersion>8</javaVersion>
</properties>
<dependencies>
@@ -63,21 +62,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-test-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-impl</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -99,33 +83,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>force-java8-spi</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <release>8</release>
- <includes>**/JdkTransporterFactory.java</includes>
- </configuration>
- </execution>
- <execution>
- <id>default-compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <excludes>**/JdkTransporterFactory.java</excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
similarity index 62%
rename from
maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
index b245ddfa..94da7b7f 100644
---
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
+++
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
@@ -25,12 +25,13 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.transport.Transporter;
import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.transfer.NoTransporterException;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
/**
- * JDK Transport factory.
+ * JDK Transport factory: on Java 8 it is defunct.
*
* @since 2.0.0
*/
@@ -38,6 +39,8 @@ import static java.util.Objects.requireNonNull;
public final class JdkTransporterFactory implements TransporterFactory {
public static final String NAME = "jdk";
+ private static final Logger LOGGER =
LoggerFactory.getLogger(JdkTransporterFactory.class);
+
private float priority = 10.0f;
@Override
@@ -56,28 +59,7 @@ public final class JdkTransporterFactory implements
TransporterFactory {
requireNonNull(session, "session cannot be null");
requireNonNull(repository, "repository cannot be null");
- int javaVersion = javaVersion();
- if (javaVersion < 11) {
- LoggerFactory.getLogger(JdkTransporterFactory.class).debug("Needs
Java11+ to function");
- throw new NoTransporterException(repository, "JDK Transport needs
Java11+");
- }
-
- if (!"http".equalsIgnoreCase(repository.getProtocol()) &&
!"https".equalsIgnoreCase(repository.getProtocol())) {
- throw new NoTransporterException(repository, "Only HTTP/HTTPS is
supported");
- }
-
- return new JdkTransporter(session, repository, javaVersion);
- }
-
- private static int javaVersion() {
- try {
- final String version = System.getProperty("java.version", "11" /*
default must pass */);
- final int dot = version.indexOf('.');
- final int hyphen = version.indexOf('-');
- final int sep = (dot > 0 && dot < hyphen || hyphen < 0) ? dot :
hyphen;
- return Integer.parseInt(sep > 0 ? version.substring(0, sep) :
version);
- } catch (final NumberFormatException nfe) {
- return 11; // unlikely to be a pre-java 11 version so let it pass
- }
+ LOGGER.debug("Needs Java11+ to function");
+ throw new NoTransporterException(repository, "JDK Transport needs
Java11+");
}
}
diff --git
a/maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
similarity index 100%
rename from
maven-resolver-transport-jdk/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
diff --git a/maven-resolver-transport-jdk/pom.xml
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
similarity index 57%
rename from maven-resolver-transport-jdk/pom.xml
rename to
maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
index 7918a81c..521198fe 100644
--- a/maven-resolver-transport-jdk/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
@@ -22,25 +22,38 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver</artifactId>
+ <artifactId>maven-resolver-transport-jdk-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-transport-jdk</artifactId>
<packaging>jar</packaging>
- <name>Maven Artifact Resolver Transport JDK</name>
+ <name>Maven Artifact Resolver Transport JDK (mr)</name>
<description>Maven Artifact Transport JDK Java 11+.</description>
<properties>
<Automatic-Module-Name>org.apache.maven.resolver.transport.jdk</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>
- <!-- SPI stays java 8 but rest is java11+ -->
<javaVersion>11</javaVersion>
</properties>
<dependencies>
+ <!-- These dependencies are actually included in this multi-release JAR -->
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-jdk-8</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-jdk-11</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -63,69 +76,87 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-test-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-impl</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>${project.build.directory}/generated-resources</directory>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>sisu-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>force-java8-spi</id>
+ <id>java8</id>
<goals>
- <goal>compile</goal>
+ <goal>unpack</goal>
</goals>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<configuration>
- <release>8</release>
- <includes>**/JdkTransporterFactory.java</includes>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-jdk-8</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+ <excludes>META-INF/maven/**</excludes>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
<execution>
- <id>default-compile</id>
+ <id>java11</id>
<goals>
- <goal>compile</goal>
+ <goal>unpack</goal>
</goals>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<configuration>
- <excludes>**/JdkTransporterFactory.java</excludes>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-jdk-11</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+
<outputDirectory>${project.build.directory}/generated-resources/META-INF/versions/11</outputDirectory>
+ <includes>**/*.class</includes>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <Multi-Release>true</Multi-Release>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/maven-resolver-transport-jdk-parent/pom.xml
b/maven-resolver-transport-jdk-parent/pom.xml
new file mode 100644
index 00000000..1b4dabcb
--- /dev/null
+++ b/maven-resolver-transport-jdk-parent/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-resolver-transport-jdk-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Maven Artifact Resolver Transport JDK Parent</name>
+ <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-jdk</module>
+ </modules>
+</project>
diff --git a/pom.xml b/pom.xml
index 9378e6ca..9a4f5912 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<module>maven-resolver-transport-classpath</module>
<module>maven-resolver-transport-file</module>
<module>maven-resolver-transport-jetty</module>
- <module>maven-resolver-transport-jdk</module>
+ <module>maven-resolver-transport-jdk-parent</module>
<module>maven-resolver-transport-apache</module>
<module>maven-resolver-transport-wagon</module>
<module>maven-resolver-supplier</module>
