diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index a5e89721d4fd..9d32fb3cd786 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -91,16 +91,11 @@ under the License. org.apache.maven.resolver maven-resolver-transport-wagon - + org.apache.maven.resolver maven-resolver-transport-apache - - - org.apache.maven.resolver - maven-resolver-transport-jdk - org.apache.maven maven-logging diff --git a/impl/maven-cli/pom.xml b/impl/maven-cli/pom.xml index a369ffd66322..39b6fcaa5e16 100644 --- a/impl/maven-cli/pom.xml +++ b/impl/maven-cli/pom.xml @@ -142,7 +142,7 @@ under the License. org.apache.maven.resolver - maven-resolver-transport-jdk + maven-resolver-transport-apache diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeStrategy.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeStrategy.java index 3828e3f03ae6..708fb359885c 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeStrategy.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeStrategy.java @@ -51,8 +51,8 @@ import org.eclipse.aether.spi.connector.transport.TransporterFactory; import org.eclipse.aether.spi.connector.transport.http.ChecksumExtractor; import org.eclipse.aether.spi.io.PathProcessor; +import org.eclipse.aether.transport.apache.ApacheTransporterFactory; import org.eclipse.aether.transport.file.FileTransporterFactory; -import org.eclipse.aether.transport.jdk.JdkTransporterFactory; import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.PARENT; @@ -309,10 +309,10 @@ protected org.apache.maven.api.model.Model buildEffectiveModel(Path pomPath) { static class TransporterFactoryConfig { @Provides - @Named(JdkTransporterFactory.NAME) - static TransporterFactory jdkTransporterFactory( + @Named(ApacheTransporterFactory.NAME) + static TransporterFactory apacheTransporterFactory( ChecksumExtractor checksumExtractor, PathProcessor pathProcessor) { - return new JdkTransporterFactory(checksumExtractor, pathProcessor); + return new ApacheTransporterFactory(checksumExtractor, pathProcessor); } @Provides diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index aebdffe5a795..2a27d9561f64 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -94,11 +94,9 @@ private void performTest(/* nullable */ final String transport, final String log private static final String APACHE_LOG_SNIPPET = "[DEBUG] Using transporter ApacheTransporter"; - private static final String JDK_LOG_SNIPPET = "[DEBUG] Using transporter JdkTransporter"; - @Test public void testResolverTransportDefault() throws Exception { - performTest(null, JDK_LOG_SNIPPET); + performTest(null, APACHE_LOG_SNIPPET); } @Test @@ -110,9 +108,4 @@ public void testResolverTransportWagon() throws Exception { public void testResolverTransportApache() throws Exception { performTest("apache", APACHE_LOG_SNIPPET); } - - @Test - public void testResolverTransportJdk() throws Exception { - performTest("jdk", JDK_LOG_SNIPPET); - } }