From 7b4cddefd942dc1af81984b359be5ded3b7a3b7e Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Tue, 16 Jan 2024 13:35:36 +0100
Subject: [PATCH] Fix plugin-tools transitive dependencies that can't contain
 wildfly-core/wildfly dependencies, conflicting when running arquillian dep
 scanner

---
 core/pom.xml |  4 ++++
 pom.xml      | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index cc9abecd..6cf35089 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,6 +22,10 @@
             <groupId>org.wildfly.plugins</groupId>
             <artifactId>wildfly-plugin-tools</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.common</groupId>
+            <artifactId>wildfly-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/pom.xml b/pom.xml
index 48c740ec..94ba0c65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
         <version.org.ow2.asm>9.5</version.org.ow2.asm>
         <version.biz.aQute.bnd>6.4.0</version.biz.aQute.bnd>
         <version.org.wildfly.plugins.wildfly-plugin-tools>1.0.0.Beta2</version.org.wildfly.plugins.wildfly-plugin-tools>
+        <version.org.wildfly.common.wildfly-common>1.7.0.Final</version.org.wildfly.common.wildfly-common>
         <version.com.puppycrawl.tools.checkstyle>8.18</version.com.puppycrawl.tools.checkstyle>
         <version.com.fasterxml.jackson.core>2.14.2</version.com.fasterxml.jackson.core>
         <version.io.smallrye.jandex>3.0.3</version.io.smallrye.jandex>
@@ -250,6 +251,19 @@
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-plugin-tools</artifactId>
                 <version>${version.org.wildfly.plugins.wildfly-plugin-tools}</version>
+                <!-- Excluding all. WildFly core dependencies can conflict when scanning with the Arquillian Maven plugin -->
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <!-- A wildfly-plugin-tools dependency required to build bootable jar. -->
+            <dependency>
+                <groupId>org.wildfly.common</groupId>
+                <artifactId>wildfly-common</artifactId>
+                <version>${version.org.wildfly.common.wildfly-common}</version>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.galleon-plugins</groupId>