Switch to Johnzon 2.x and jakarta.json

wcm-io-devops · Apr 15, 2024 · b888de6 · b888de6
1 parent 782de6e
commit b888de6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.20.2" date="not released">
+      <action type="update" dev="sseifert">
+        Switch to Johnzon 2.x and jakarta.json.
+      </action>
+    </release>
+
     <release version="2.20.0" date="2024-01-26">
       <action type="add" dev="sseifert" issue="86"><![CDATA[
         ContentPackageOsgiConfigPostProcessor: Accept both <a href="https://devops.wcm.io/conga/plugins/sling//osgi-config-combined-json.html">Combined JSON files</a>

diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -128,8 +128,8 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.1_spec</artifactId>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -68,7 +68,7 @@
       <dependency>
         <groupId>io.wcm.devops.conga.plugins</groupId>
         <artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -137,9 +137,9 @@
         <version>2.1.0</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-json_1.1_spec</artifactId>
-        <version>1.5</version>
+        <groupId>jakarta.json</groupId>
+        <artifactId>jakarta.json-api</artifactId>
+        <version>2.1.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.johnzon</groupId>