From 74b1b5d36e47dc4240ae7b83d95adb24c57aadfb Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Wed, 4 Dec 2024 14:10:18 +0100
Subject: [PATCH] Some dependencies cleanup

---
 plugin/pom.xml                                |  38 ++---
 .../maven/common/OverriddenArtifact.java      |   2 +-
 pom.xml                                       | 141 +++++++++++-------
 tests/pom.xml                                 |   4 +-
 4 files changed, 110 insertions(+), 75 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 00da5c25..2e4585a6 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -47,6 +47,10 @@
             <groupId>org.twdata.maven</groupId>
             <artifactId>mojo-executor</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+        </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>wildfly-jar-cloud-extension</artifactId>
@@ -55,6 +59,14 @@
             <groupId>org.jboss.galleon</groupId>
             <artifactId>galleon-maven-plugin</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.galleon</groupId>
+            <artifactId>galleon-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-artifact-transfer</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
@@ -88,32 +100,14 @@
         <dependency>
             <groupId>org.wildfly.plugins</groupId>
             <artifactId>wildfly-plugin-core</artifactId>
-            <exclusions>
-              <exclusion>
-                    <groupId>org.jboss.modules</groupId>
-                    <artifactId>jboss-modules</artifactId>
-              </exclusion>
-          </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wildfly.plugins</groupId>
             <artifactId>wildfly-maven-plugin</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wildfly.plugins</groupId>
             <artifactId>wildfly-plugin-tools</artifactId>
-            <exclusions>
-              <exclusion>
-                    <groupId>org.jboss.modules</groupId>
-                    <artifactId>jboss-modules</artifactId>
-              </exclusion>
-          </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wildfly.channel</groupId>
@@ -127,6 +121,14 @@
             <groupId>org.wildfly.prospero</groupId>
             <artifactId>prospero-metadata</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.wildfly.core</groupId>
+          <artifactId>wildfly-protocol</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.wildfly.core</groupId>
+          <artifactId>wildfly-controller-client</artifactId>
+      </dependency>
         <!-- Required by Galleon during provisioning --> 
         <dependency>
             <groupId>org.wildfly.common</groupId>
diff --git a/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/common/OverriddenArtifact.java b/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/common/OverriddenArtifact.java
index de834b78..259dd98c 100644
--- a/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/common/OverriddenArtifact.java
+++ b/plugin/src/main/java/org/wildfly/plugins/bootablejar/maven/common/OverriddenArtifact.java
@@ -17,7 +17,7 @@
 package org.wildfly.plugins.bootablejar.maven.common;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
 
 public class OverriddenArtifact implements DependableCoordinate {
 
diff --git a/pom.xml b/pom.xml
index 17e9fee3..b25811b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,12 +61,13 @@
     <version.junit>4.13.1</version.junit>
     <version.adoc-maven-plugin-descriptor>1.0.0.Alpha3</version.adoc-maven-plugin-descriptor>
     <version.org.apache.maven.core>3.9.9</version.org.apache.maven.core>
-    <version.org.apache.maven.plugin-tools>3.7.0</version.org.apache.maven.plugin-tools>
+    <version.org.apache.maven.plugin-tools>3.15.1</version.org.apache.maven.plugin-tools>
     <version.org.apache.maven.plugin-plugin>3.9.0</version.org.apache.maven.plugin-plugin>
+    <version.org.apache.maven.shared>0.13.1</version.org.apache.maven.shared>
     <version.org.asciidoctor>2.0.0</version.org.asciidoctor>
     <version.org.jboss.galleon>6.0.4.Final</version.org.jboss.galleon>
     <version.org.wildfly.core.wildfly-core>27.0.0.Beta3</version.org.wildfly.core.wildfly-core>
-    <version.org.wildfly.launcher>1.0.0.Beta2</version.org.wildfly.launcher>
+    <version.org.wildfly.launcher>1.0.0.Beta3</version.org.wildfly.launcher>
     <version.org.wildfly.common>1.7.0.Final</version.org.wildfly.common>
     <version.org.wildfly.plugins.wildfly-maven-plugin>5.1.0.Alpha2</version.org.wildfly.plugins.wildfly-maven-plugin>
     <version.org.wildfly.plugins.wildfly-plugin-tools>1.2.0.Beta2</version.org.wildfly.plugins.wildfly-plugin-tools>
@@ -81,7 +82,8 @@
     <version.org.apache.maven.plugin-testing.maven-plugin-testing-harness>3.3.0
     </version.org.apache.maven.plugin-testing.maven-plugin-testing-harness>
     <version.org.jboss.shrinkwrap.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap.shrinkwrap>
-    <version.org.twdata.maven>2.3.1</version.org.twdata.maven>
+    <version.org.twdata.maven>2.4.0</version.org.twdata.maven>
+    <version.org.codehaus.plexus>3.0.24</version.org.codehaus.plexus>
     <!-- Checkstyle configuration -->
     <linkXRef>false</linkXRef>
     <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
@@ -127,30 +129,6 @@
         <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
-    <!-- repository needed to provision a full server used as patching distribution source -->
-    <repository>
-      <id>redhat-ga</id>
-      <name>Redhat GA</name>
-      <url>https://maven.repository.redhat.com/ga/</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </snapshots>
-    </repository>
-    <!-- Remove below repo after opensaml 4.2.0 is accessible from maven central repo-->
-    <repository>
-        <id>opensaml-repo</id>
-        <name>opensaml</name>
-        <url>https://build.shibboleth.net/nexus/content/groups/public</url>
-        <releases>
-            <enabled>true</enabled>
-        </releases>
-    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -173,17 +151,24 @@
         <groupId>org.twdata.maven</groupId>
         <artifactId>mojo-executor</artifactId>
         <version>${version.org.twdata.maven}</version>
+        <exclusions>
+            <exclusion>
+                <groupId>*</groupId>
+                <artifactId>*</artifactId>
+            </exclusion>
+        </exclusions>
+     </dependency>
+     <!-- Required for the dev goal and the maven-execute dependency -->
+     <dependency>
+         <groupId>org.codehaus.plexus</groupId>
+         <artifactId>plexus-utils</artifactId>
+         <version>${version.org.codehaus.plexus}</version>
      </dependency>
      <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>wildfly-jar-cloud-extension</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>wildfly-jar-maven-plugin-core</artifactId>
-          <version>${project.version}</version>
-      </dependency>
         
       <dependency>
         <groupId>org.wildfly.core</groupId>
@@ -192,9 +177,21 @@
       </dependency>
       
       <dependency>
-        <groupId>org.wildfly.core</groupId>
-        <artifactId>wildfly-patching</artifactId>
-        <version>${version.org.wildfly.core.wildfly-core}</version>
+          <groupId>org.wildfly.core</groupId>
+          <artifactId>wildfly-protocol</artifactId>
+          <version>${version.org.wildfly.core.wildfly-core}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.jboss.modules</groupId>
+                  <artifactId>jboss-modules</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+
+      <dependency>
+          <groupId>org.wildfly.core</groupId>
+          <artifactId>wildfly-controller-client</artifactId>
+          <version>${version.org.wildfly.core.wildfly-core}</version>
       </dependency>
 
       <!-- Required by controller-client and Galleon provisioning -->
@@ -223,15 +220,15 @@
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.galleon</groupId>
-        <artifactId>galleon-maven-plugin</artifactId>
-        <version>${version.org.jboss.galleon}</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.eclipse.aether</groupId>
-                <artifactId>*</artifactId>
-            </exclusion>
-        </exclusions>
+          <groupId>org.jboss.galleon</groupId>
+          <artifactId>galleon-maven-plugin</artifactId>
+          <version>${version.org.jboss.galleon}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>*</groupId>
+                  <artifactId>*</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
       
       <dependency>
@@ -279,7 +276,17 @@
         <version>${version.org.apache.maven.plugin-tools}</version>
         <scope>provided</scope>
       </dependency>
-
+      <dependency>
+          <groupId>org.apache.maven.shared</groupId>
+          <artifactId>maven-artifact-transfer</artifactId>
+          <version>${version.org.apache.maven.shared}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>*</groupId>
+                  <artifactId>*</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
       <dependency>
         <groupId>org.wildfly.checkstyle</groupId>
         <artifactId>wildfly-checkstyle-config</artifactId>
@@ -287,21 +294,47 @@
       </dependency>
       
       <dependency>
-        <groupId>org.wildfly.plugins</groupId>
-        <artifactId>wildfly-plugin-core</artifactId>
-        <version>${version.org.wildfly.plugins.wildfly-maven-plugin}</version>
+          <groupId>org.wildfly.plugins</groupId>
+          <artifactId>wildfly-plugin-core</artifactId>
+          <version>${version.org.wildfly.plugins.wildfly-maven-plugin}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>*</groupId>
+                  <artifactId>*</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
 
       <dependency>
-        <groupId>org.wildfly.plugins</groupId>
-        <artifactId>wildfly-plugin-tools</artifactId>
-        <version>${version.org.wildfly.plugins.wildfly-plugin-tools}</version>
+          <groupId>org.wildfly.plugins</groupId>
+          <artifactId>wildfly-plugin-tools</artifactId>
+          <version>${version.org.wildfly.plugins.wildfly-plugin-tools}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.jboss.modules</groupId>
+                  <artifactId>jboss-modules</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.wildfly.core</groupId>
+                  <artifactId>wildfly-controller-client</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.wildfly.core</groupId>
+                  <artifactId>wildfly-protocol</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
 
       <dependency>
-        <groupId>org.wildfly.plugins</groupId>
-        <artifactId>wildfly-maven-plugin</artifactId>
-        <version>${version.org.wildfly.plugins.wildfly-maven-plugin}</version>
+          <groupId>org.wildfly.plugins</groupId>
+          <artifactId>wildfly-maven-plugin</artifactId>
+          <version>${version.org.wildfly.plugins.wildfly-maven-plugin}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>*</groupId>
+                  <artifactId>*</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
 
       <dependency>
diff --git a/tests/pom.xml b/tests/pom.xml
index 3832e723..66457f00 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -122,8 +122,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-patching</artifactId>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>