[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
apache · Nov 28, 2023 · 511fe27 · 511fe27
1 parent 3e56c51
commit 511fe27
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
@@ -65,7 +65,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-http</artifactId>
+      <artifactId>maven-resolver-transport-apache</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>

diff --git a/...ain/java/org/apache/maven/resolver/examples/supplier/SupplierRepositorySystemFactory.java b/...ain/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<String, TransporterFactory> getTransporterFactories(
-                    Map<String, ChecksumExtractor> extractors) {
-                Map<String, TransporterFactory> result = super.getTransporterFactories(extractors);
+            protected Map<String, TransporterFactory> getTransporterFactories() {
+                Map<String, TransporterFactory> 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
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-http</artifactId>
+      <artifactId>maven-resolver-transport-apache</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...resolver-supplier/src/main/java/org/eclipse/aether/supplier/RepositorySystemSupplier.java b/...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<String, ProvidedChecksumsSource> getProvidedChecksumsSources(
         return result;
     }
 
-    protected Map<String, ChecksumExtractor> getChecksumExtractors() {
-        HashMap<String, ChecksumExtractor> result = new HashMap<>();
-        result.put(Nexus2ChecksumExtractor.NAME, new Nexus2ChecksumExtractor());
-        result.put(XChecksumChecksumExtractor.NAME, new XChecksumChecksumExtractor());
-        return result;
-    }
-
-    protected Map<String, TransporterFactory> getTransporterFactories(Map<String, ChecksumExtractor> extractors) {
+    protected Map<String, TransporterFactory> getTransporterFactories() {
         HashMap<String, TransporterFactory> 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<String, ProvidedChecksumsSource> providedChecksumsSources =
                 getProvidedChecksumsSources(trustedChecksumsSources);
 
-        Map<String, ChecksumExtractor> checksumExtractors = getChecksumExtractors();
-        Map<String, TransporterFactory> transporterFactories = getTransporterFactories(checksumExtractors);
+        Map<String, TransporterFactory> transporterFactories = getTransporterFactories();
         TransporterProvider transporterProvider = getTransporterProvider(transporterFactories);
 
         BasicRepositoryConnectorFactory basic = getBasicRepositoryConnectorFactory(

diff --git a/pom.xml b/pom.xml
@@ -160,7 +160,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.resolver</groupId>
-        <artifactId>maven-resolver-transport-http</artifactId>
+        <artifactId>maven-resolver-transport-apache</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>