From 151e44898343894718228985a93f895ca64f4080 Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Tue, 30 May 2023 12:21:53 +0200
Subject: [PATCH] Fix for WFMP-209, Can't use maven http transport with maven <
 3.9

---
 plugin/pom.xml                 | 28 ----------------------------
 pom.xml                        | 13 ++++++++-----
 tests/standalone-tests/pom.xml |  8 +++++++-
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index ba22a74d..84405887 100644
--- 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
index f545533d..6c819e41 100644
--- 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
index 2eb27b4c..1faaf4c0 100644
--- 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>