From e8fa2bdedd3e9ad3155d5fca978492529dd8a84f Mon Sep 17 00:00:00 2001
From: Eduardo Martins <emartins@redhat.com>
Date: Tue, 24 Sep 2024 23:08:40 +0100
Subject: [PATCH] [WFLY-19779] Adds explicit dependency to our commons-logging
 fork

---
 helloworld-mutual-ssl-secured/pom.xml | 9 ++++++++-
 helloworld-mutual-ssl/pom.xml         | 8 ++++++++
 jaxrs-client/pom.xml                  | 8 ++++++++
 jaxrs-jwt/pom.xml                     | 8 ++++++++
 logging/pom.xml                       | 8 ++++++++
 microprofile-lra/pom.xml              | 8 ++++++++
 6 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml
index a5b0f331b5..c87f92c28c 100644
--- a/helloworld-mutual-ssl-secured/pom.xml
+++ b/helloworld-mutual-ssl-secured/pom.xml
@@ -101,7 +101,14 @@
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!-- httpclient needs commons-logging yet the server uses this instead,
+            to be fully compatible on apps we need to add this dependency whenever commons-logging is needed,
+            but on testing clients like this we could use commons-logging instead -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml
index 4a57252e57..fe55105dad 100644
--- a/helloworld-mutual-ssl/pom.xml
+++ b/helloworld-mutual-ssl/pom.xml
@@ -102,6 +102,14 @@
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- httpclient needs commons-logging yet the server uses this instead,
+            to be fully compatible on apps we need to add this dependency whenever commons-logging is needed,
+            but on testing clients like this we could use commons-logging instead -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
index ed9def2cec..a60011e866 100644
--- a/jaxrs-client/pom.xml
+++ b/jaxrs-client/pom.xml
@@ -117,6 +117,14 @@
             <artifactId>resteasy-client</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- resteasy client needs commons-logging yet the server uses this instead,
+            to be fully compatible on apps we need to add this dependency whenever commons-logging is needed,
+            but on testing clients like this we could use commons-logging instead -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-json-binding-provider</artifactId>
diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml
index 80751f9d16..27ce9941a1 100644
--- a/jaxrs-jwt/pom.xml
+++ b/jaxrs-jwt/pom.xml
@@ -119,6 +119,14 @@
             <artifactId>resteasy-client</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- resteasy client needs commons-logging yet the server uses this instead,
+            to be fully compatible on apps we need to add this dependency whenever commons-logging is needed,
+            but on testing clients like this we could use commons-logging instead -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-json-p-provider</artifactId>
diff --git a/logging/pom.xml b/logging/pom.xml
index 3986de2c18..999f46077a 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -123,6 +123,14 @@
             <artifactId>resteasy-client</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- resteasy client needs commons-logging yet the server uses this instead,
+            to be fully compatible on apps we need to add this dependency whenever commons-logging is needed,
+            but on testing clients like this we could use commons-logging instead -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-json-p-provider</artifactId>
diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml
index 1abdb99070..d5b7f2addb 100644
--- a/microprofile-lra/pom.xml
+++ b/microprofile-lra/pom.xml
@@ -78,6 +78,14 @@
             <artifactId>resteasy-client</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- resteasy client needs commons-logging yet the server uses this instead,
+            to be fully compatible on apps we need to add this dependency whenever commons-logging is needed,
+            but on testing clients like this we could use commons-logging instead -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson2-provider</artifactId>