[WFLY-16274] Remove the dependency on the Geronimo JSON API fork and …

…Apache Johnzon JSON implementation in favor of using the GlassFish library. The GlassFish JSON implementation includes both the API and the implementation. https://issues.redhat.com/browse/WFLY-16274 Signed-off-by: James R. Perkins <jperkins@redhat.com>
wildfly · Apr 19, 2022 · 8fc816d · 8fc816d
1 parent c14da87
commit 8fc816d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/ee-9/feature-pack/pom.xml b/ee-9/feature-pack/pom.xml
@@ -533,6 +533,9 @@
                                 jakarta names are used -->
                                 <exclude>org.apache.logging.log4j:log4j-api\z</exclude>
 
+                                <!-- Uses JSON only for formatting and uses an internal JSON generator -->
+                                <exlude>org.jboss.logmanager:jboss-logmanager\z</exlude>
+
                                 <!-- Don't transform Infinispan modules and its dependents -->
                                 <exclude>org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec</exclude>
                                 <exclude>org.infinispan:.+\z</exclude>
@@ -561,8 +564,7 @@
                                 <exclude>org.apache.activemq:artemis-core-client\z</exclude>
                                 <exclude>org.apache.activemq:artemis-dto\z</exclude>
                                 <exclude>org.apache.activemq:artemis-server\z</exclude>
-                                <exclude>org.apache.geronimo.specs:geronimo-json_1.1_spec\z</exclude>
-                                <exclude>org.apache.johnzon:johnzon-core\z</exclude>
+                                <exclude>org.glassfish:jakarta.json\z</exclude>
                                 <exclude>activemq-artemis-native\z</exclude>
                                 <exclude>org.jboss.activemq.artemis.integration:artemis-wildfly-jakarta-integration\z</exclude>
                             </jakarta-transform-excluded-artifacts>
@@ -607,10 +609,6 @@
             <exclusions>
                 <!-- Exclude deps that have been replaced with different artifacts in this FP.
                      TODO perhaps put these in a different maven module that we don't pull in -->
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>jakarta.json</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.jboss.invocation</groupId>
                     <artifactId>jboss-invocation</artifactId>

diff --git a/ee-9/source-transform/messaging-activemq/subsystem/pom.xml b/ee-9/source-transform/messaging-activemq/subsystem/pom.xml
@@ -175,15 +175,10 @@
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.1_spec</artifactId>
-        </dependency>
 
         <dependency>
-            <groupId>org.apache.johnzon</groupId>
-            <artifactId>johnzon-core</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
         </dependency>
 
         <dependency>