Merge pull request #343 from jfdenise/main

Fix for WFMP-209, Can't use maven http transport with maven < 3.9
wildfly · Jun 5, 2023 · 5129133 · 5129133
2 parents bbfb55c + 151e448
commit 5129133
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 34 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -143,34 +143,6 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-connector-basic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-transport-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-named-locks</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.galleon</groupId>
             <artifactId>galleon-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -106,6 +106,9 @@
         <version.org.apache.maven.plugin-tools>3.7.0</version.org.apache.maven.plugin-tools>
         <version.org.apache.maven.shared>0.9.1</version.org.apache.maven.shared>
         <version.org.apache.maven.resolver>1.9.6</version.org.apache.maven.resolver>
+        <!-- maven dependencies only required by tests -->
+        <version.org.apache.maven.wagon>3.5.3</version.org.apache.maven.wagon>
+
         <version.org.eclipse.sisu>0.3.5</version.org.eclipse.sisu>
         <version.org.twdata.maven>2.3.1</version.org.twdata.maven>
 
@@ -297,18 +300,18 @@
                 <version>${version.org.apache.maven.resolver}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.maven.resolver</groupId>
-                <artifactId>maven-resolver-transport-http</artifactId>
-                <version>${version.org.apache.maven.resolver}</version>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-http</artifactId>
+                <version>${version.org.apache.maven.wagon}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.resolver</groupId>
-                <artifactId>maven-resolver-util</artifactId>
+                <artifactId>maven-resolver-transport-wagon</artifactId>
                 <version>${version.org.apache.maven.resolver}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.resolver</groupId>
-                <artifactId>maven-resolver-named-locks</artifactId>
+                <artifactId>maven-resolver-util</artifactId>
                 <version>${version.org.apache.maven.resolver}</version>
             </dependency>
             <dependency>

diff --git a/tests/standalone-tests/pom.xml b/tests/standalone-tests/pom.xml
@@ -80,7 +80,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-transport-http</artifactId>
+            <artifactId>maven-resolver-transport-wagon</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Only required by tests -->
+        <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-http</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>