From 511fe2766c5b6bbc1974d8d701577265a44e0359 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 28 Nov 2023 15:24:11 +0100 Subject: [PATCH] [MRESOLVER-440] Addendum (#382) Seems the "atypical" modules like supplier and demo snippets were completely omitted from the transport rename, and were still using renamed transport-http instead the new transport-apache. --- https://issues.apache.org/jira/browse/MRESOLVER-440 --- .../maven-resolver-demo-snippets/pom.xml | 2 +- .../SupplierRepositorySystemFactory.java | 6 ++---- maven-resolver-supplier/pom.xml | 2 +- .../supplier/RepositorySystemSupplier.java | 19 ++++--------------- pom.xml | 2 +- 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml index 9eed3050d..3cd6eb8f4 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml @@ -65,7 +65,7 @@ org.apache.maven.resolver - maven-resolver-transport-http + maven-resolver-transport-apache org.apache.maven.resolver diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/supplier/SupplierRepositorySystemFactory.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/supplier/SupplierRepositorySystemFactory.java index 56df8a19a..699e84090 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/supplier/SupplierRepositorySystemFactory.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/supplier/SupplierRepositorySystemFactory.java @@ -23,7 +23,6 @@ import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.spi.connector.transport.TransporterFactory; import org.eclipse.aether.supplier.RepositorySystemSupplier; -import org.eclipse.aether.transport.http.ChecksumExtractor; import org.eclipse.aether.transport.jdk.JdkTransporterFactory; import org.eclipse.aether.transport.jetty.JettyTransporterFactory; @@ -34,9 +33,8 @@ public class SupplierRepositorySystemFactory { public static RepositorySystem newRepositorySystem() { return new RepositorySystemSupplier() { @Override - protected Map getTransporterFactories( - Map extractors) { - Map result = super.getTransporterFactories(extractors); + protected Map getTransporterFactories() { + Map result = super.getTransporterFactories(); result.put(JdkTransporterFactory.NAME, new JdkTransporterFactory()); result.put(JettyTransporterFactory.NAME, new JettyTransporterFactory()); return result; diff --git a/maven-resolver-supplier/pom.xml b/maven-resolver-supplier/pom.xml index 6b3c359df..525c9324c 100644 --- a/maven-resolver-supplier/pom.xml +++ b/maven-resolver-supplier/pom.xml @@ -67,7 +67,7 @@ org.apache.maven.resolver - maven-resolver-transport-http + maven-resolver-transport-apache diff --git a/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java b/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java index 38f1eb6d6..a30b14ce5 100644 --- a/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java +++ b/maven-resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java @@ -120,11 +120,8 @@ import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory; import org.eclipse.aether.spi.resolution.ArtifactResolverPostProcessor; import org.eclipse.aether.spi.synccontext.SyncContextFactory; +import org.eclipse.aether.transport.apache.ApacheTransporterFactory; import org.eclipse.aether.transport.file.FileTransporterFactory; -import org.eclipse.aether.transport.http.ChecksumExtractor; -import org.eclipse.aether.transport.http.HttpTransporterFactory; -import org.eclipse.aether.transport.http.Nexus2ChecksumExtractor; -import org.eclipse.aether.transport.http.XChecksumChecksumExtractor; import org.eclipse.aether.util.version.GenericVersionScheme; import org.eclipse.aether.version.VersionScheme; @@ -300,17 +297,10 @@ protected Map getProvidedChecksumsSources( return result; } - protected Map getChecksumExtractors() { - HashMap result = new HashMap<>(); - result.put(Nexus2ChecksumExtractor.NAME, new Nexus2ChecksumExtractor()); - result.put(XChecksumChecksumExtractor.NAME, new XChecksumChecksumExtractor()); - return result; - } - - protected Map getTransporterFactories(Map extractors) { + protected Map getTransporterFactories() { HashMap result = new HashMap<>(); result.put(FileTransporterFactory.NAME, new FileTransporterFactory()); - result.put(HttpTransporterFactory.NAME, new HttpTransporterFactory(extractors)); + result.put(ApacheTransporterFactory.NAME, new ApacheTransporterFactory()); return result; } @@ -555,8 +545,7 @@ public RepositorySystem get() { Map providedChecksumsSources = getProvidedChecksumsSources(trustedChecksumsSources); - Map checksumExtractors = getChecksumExtractors(); - Map transporterFactories = getTransporterFactories(checksumExtractors); + Map transporterFactories = getTransporterFactories(); TransporterProvider transporterProvider = getTransporterProvider(transporterFactories); BasicRepositoryConnectorFactory basic = getBasicRepositoryConnectorFactory( diff --git a/pom.xml b/pom.xml index fc3275de5..c51390997 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ org.apache.maven.resolver - maven-resolver-transport-http + maven-resolver-transport-apache ${project.version}