From 72c1253cbac6240af6290ef01b40a8027a78f8a3 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Thu, 26 Dec 2024 21:25:23 +0100
Subject: [PATCH] [WAGON-641] Upgrade dependencies and pom cleanup

---
 pom.xml                                       | 96 +------------------
 wagon-provider-api/pom.xml                    |  1 -
 wagon-provider-test/pom.xml                   |  1 -
 wagon-providers/pom.xml                       | 14 ---
 wagon-providers/wagon-file/pom.xml            |  2 +-
 wagon-providers/wagon-ftp/pom.xml             |  4 +-
 .../wagon-http-lightweight/pom.xml            |  6 +-
 wagon-providers/wagon-http-shared/pom.xml     |  2 +-
 wagon-providers/wagon-http/pom.xml            | 10 +-
 wagon-providers/wagon-scm/pom.xml             |  2 +-
 wagon-providers/wagon-ssh-common-test/pom.xml |  8 +-
 wagon-providers/wagon-ssh-common/pom.xml      |  7 --
 wagon-providers/wagon-ssh-external/pom.xml    |  2 +-
 wagon-providers/wagon-ssh/pom.xml             |  7 +-
 .../wagon-webdav-jackrabbit/pom.xml           | 10 +-
 15 files changed, 32 insertions(+), 140 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8ef724cb..0f9e152e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,67 +126,6 @@ under the License.
     </contributor>
   </contributors>
 
-  <mailingLists>
-    <mailingList>
-      <name>Maven Developer List</name>
-      <subscribe>dev-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@maven.apache.org</unsubscribe>
-      <post>dev@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
-      <otherArchives>
-        <otherArchive>http://www.mail-archive.com/dev@maven.apache.org/</otherArchive>
-        <otherArchive>http://maven.40175.n5.nabble.com/Maven-Developers-f142166.html</otherArchive>
-        <otherArchive>http://maven-dev.markmail.org/</otherArchive>
-      </otherArchives>
-    </mailingList>
-    <mailingList>
-      <name>Maven User List</name>
-      <subscribe>users-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
-      <post>users@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
-      <otherArchives>
-        <otherArchive>http://www.mail-archive.com/users@maven.apache.org/</otherArchive>
-        <otherArchive>http://maven.40175.n5.nabble.com/Maven-Users-f40176.html</otherArchive>
-        <otherArchive>http://maven-users.markmail.org/</otherArchive>
-      </otherArchives>
-    </mailingList>
-
-    <mailingList>
-      <name>LEGACY Wagon User List (deprecated)</name>
-      <subscribe>wagon-users-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>wagon-users-unsubscribe@maven.apache.org</unsubscribe>
-      <post>wagon-users@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-users/</archive>
-      <otherArchives>
-        <otherArchive>http://www.mail-archive.com/wagon-users@maven.apache.org</otherArchive>
-        <otherArchive>http://maven.40175.n5.nabble.com/Wagon-Users-f326332.html</otherArchive>
-        <otherArchive>http://maven-wagon-users.markmail.org/</otherArchive>
-      </otherArchives>
-    </mailingList>
-    <mailingList>
-      <name>LEGACY Wagon Developer List (deprecated)</name>
-      <subscribe>wagon-dev-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>wagon-dev-unsubscribe@maven.apache.org</unsubscribe>
-      <post>wagon-dev@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-dev/</archive>
-      <otherArchives>
-        <otherArchive>http://www.mail-archive.com/wagon-dev@maven.apache.org</otherArchive>
-        <otherArchive>http://maven.40175.n5.nabble.com/Wagon-Dev-f326406.html</otherArchive>
-        <otherArchive>http://maven-wagon-dev.markmail.org/</otherArchive>
-      </otherArchives>
-    </mailingList>
-    <mailingList>
-      <name>Wagon Commits List</name>
-      <subscribe>wagon-commits-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>wagon-commits-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-wagon-commits/</archive>
-      <otherArchives>
-        <otherArchive>http://maven-wagon-commits.markmail.org/</otherArchive>
-      </otherArchives>
-    </mailingList>
-  </mailingLists>
-
   <modules>
     <module>wagon-provider-api</module>
     <module>wagon-providers</module>
@@ -221,6 +160,8 @@ under the License.
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <slf4jVersion>1.7.36</slf4jVersion>
     <maven.site.path>wagon-archives/wagon-LATEST</maven.site.path>
+    <version.plexus-utils>3.6.0</version.plexus-utils>
+    <version.sisu-maven-plugin>0.9.0.M3</version.sisu-maven-plugin>
     <project.build.outputTimestamp>2022-12-18T21:06:44Z</project.build.outputTimestamp>
   </properties>
 
@@ -259,14 +200,8 @@ under the License.
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
-        <version>2.1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
-        <version>3.3.1</version>
+        <version>2.1.1</version>
       </dependency>
-
       <!-- for slf4j -->
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -349,31 +284,6 @@ under the License.
             </excludes>
           </configuration>
         </plugin>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.rat</groupId>
-                    <artifactId>apache-rat-plugin</artifactId>
-                    <versionRange>[0.11,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-metadata</artifactId>
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index 57ca2d1c..80b7f595 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-provider-api</artifactId>
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index ee1540c1..dc9db99f 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-provider-test</artifactId>
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index fc93309a..6abc6987 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-providers</artifactId>
@@ -52,24 +51,11 @@ under the License.
         <artifactId>httpclient</artifactId>
         <version>4.5.14</version>
       </dependency>
-      <!-- Overwrite transitive dependency version of HttpClient -->
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.16.1</version>
-        <scope>runtime</scope>
-      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
         <version>4.4.16</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.sshd</groupId>
-        <artifactId>sshd-core</artifactId>
-        <version>0.8.0</version>
-        <scope>test</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml
index c7a2bb7a..122ce038 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-file</artifactId>
@@ -39,6 +38,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml
index 6e8533b5..08a9d0d1 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-ftp</artifactId>
@@ -35,7 +34,7 @@ under the License.
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>3.9.0</version>
+      <version>3.11.1</version>
     </dependency>
 
     <dependency>
@@ -51,6 +50,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml
index 02e9f8fe..789ec69a 100644
--- a/wagon-providers/wagon-http-lightweight/pom.xml
+++ b/wagon-providers/wagon-http-lightweight/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-http-lightweight</artifactId>
@@ -49,6 +48,10 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -62,6 +65,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/wagon-providers/wagon-http-shared/pom.xml b/wagon-providers/wagon-http-shared/pom.xml
index e0affcff..80708fa3 100644
--- a/wagon-providers/wagon-http-shared/pom.xml
+++ b/wagon-providers/wagon-http-shared/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-http-shared</artifactId>
@@ -57,6 +56,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/wagon-providers/wagon-http/pom.xml b/wagon-providers/wagon-http/pom.xml
index 997bc3c2..695a5180 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-http</artifactId>
@@ -47,6 +46,14 @@ under the License.
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -60,6 +67,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/wagon-providers/wagon-scm/pom.xml b/wagon-providers/wagon-scm/pom.xml
index 31f5876c..647ddc5c 100644
--- a/wagon-providers/wagon-scm/pom.xml
+++ b/wagon-providers/wagon-scm/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-scm</artifactId>
@@ -78,6 +77,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/wagon-providers/wagon-ssh-common-test/pom.xml b/wagon-providers/wagon-ssh-common-test/pom.xml
index 299b8d14..c2a30df0 100644
--- a/wagon-providers/wagon-ssh-common-test/pom.xml
+++ b/wagon-providers/wagon-ssh-common-test/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-ssh-common-test</artifactId>
@@ -55,6 +54,8 @@ under the License.
     <dependency>
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-core</artifactId>
+      <!-- lots of changes in later versions, we drop SSH provider in 4.x version -->
+      <version>0.8.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -63,10 +64,5 @@ under the License.
       <version>2.2.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/wagon-providers/wagon-ssh-common/pom.xml b/wagon-providers/wagon-ssh-common/pom.xml
index 92d763c4..272f8510 100644
--- a/wagon-providers/wagon-ssh-common/pom.xml
+++ b/wagon-providers/wagon-ssh-common/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-ssh-common</artifactId>
@@ -38,12 +37,6 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interactivity-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-component-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/wagon-providers/wagon-ssh-external/pom.xml b/wagon-providers/wagon-ssh-external/pom.xml
index 0ebd4d9a..5046c7ff 100644
--- a/wagon-providers/wagon-ssh-external/pom.xml
+++ b/wagon-providers/wagon-ssh-external/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-ssh-external</artifactId>
@@ -52,6 +51,7 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
diff --git a/wagon-providers/wagon-ssh/pom.xml b/wagon-providers/wagon-ssh/pom.xml
index 93cc73b5..e72c4a86 100644
--- a/wagon-providers/wagon-ssh/pom.xml
+++ b/wagon-providers/wagon-ssh/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-ssh</artifactId>
@@ -80,12 +79,18 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
index 7f94ba7a..0086cef4 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml
+++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml
@@ -24,7 +24,6 @@ under the License.
     <groupId>org.apache.maven.wagon</groupId>
     <artifactId>wagon-providers</artifactId>
     <version>3.5.4-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>wagon-webdav-jackrabbit</artifactId>
@@ -113,15 +112,8 @@ under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>biz.aQute</groupId>
-      <artifactId>bnd</artifactId>
-      <version>1.50.0</version>
-      <scope>provided</scope>
-    </dependency>
-
   </dependencies>
 
   <build>