From b3be3984ed5017f869e625641d97ace556e73d4e Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Thu, 4 Jan 2024 11:33:55 +0100
Subject: [PATCH] Fix for WFCORE-6656, CLI, shaded jar can't start embedded
 when logging json formater configured

---
 cli/pom.xml              | 16 ++++------------
 testsuite/shared/pom.xml | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index b3d4a8ca2ce..48218226f6d 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -729,19 +729,11 @@
             </exclusions>
         </dependency>
 
+        <!-- Dependency needed by the CLI fat jar (client classifier) to support JBoss Logging JSON Formatter 
+             that still depends on EE8 javax.json API -->
         <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.parsson</groupId>
-            <artifactId>parsson</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml
index 480c57be9aa..1b87d9c153a 100644
--- a/testsuite/shared/pom.xml
+++ b/testsuite/shared/pom.xml
@@ -112,6 +112,26 @@
             <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-cli</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-network</artifactId>