Merge pull request #42 from dmlloyd/wagon

Use Wagon HTTP instead of Wagon Lightweight HTTP
smallrye · May 18, 2023 · 6c507eb · 6c507eb
2 parents c564dbe + 4cbf339
commit 6c507eb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -138,7 +138,7 @@
 
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-http-lightweight</artifactId>
+            <artifactId>wagon-http</artifactId>
         </dependency>
 
         <dependency>

diff --git a/maven/src/test/java/io/smallrye/beanbag/maven/MavenFactoryTestCase.java b/maven/src/test/java/io/smallrye/beanbag/maven/MavenFactoryTestCase.java
@@ -8,7 +8,7 @@
 import org.apache.maven.settings.building.SettingsBuildingException;
 import org.apache.maven.settings.building.SettingsProblem;
 import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.providers.http.LightweightHttpsWagon;
+import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.eclipse.aether.RepositorySystem;
@@ -58,11 +58,9 @@ public void testWagonThings() {
         mavenFactory.getContainer().requireBean(Wagon.class);
         mavenFactory.getContainer().requireBean(Wagon.class, "file");
         mavenFactory.getContainer().requireBean(Wagon.class, "http");
-        mavenFactory.getContainer().requireBean(Wagon.class, "https");
 
-        LightweightHttpsWagon wagon = mavenFactory.getContainer().requireBean(LightweightHttpsWagon.class);
+        HttpWagon wagon = mavenFactory.getContainer().requireBean(HttpWagon.class);
         assertNotNull(wagon);
-        assertNotNull(wagon.getAuthenticator());
     }
 
     private static void handleProblem(SettingsProblem settingsProblem) {

diff --git a/pom.xml b/pom.xml
@@ -274,7 +274,7 @@
 
             <dependency>
                 <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-http-lightweight</artifactId>
+                <artifactId>wagon-http</artifactId>
                 <version>${version.maven.wagon}</version>
             </dependency>