From 9232b8c1e729e387160ab4f08614180c4f1bdd26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 13:21:03 +0000
Subject: [PATCH 1/2] Bump org.apache.sling:org.apache.sling.commons.johnzon

Bumps [org.apache.sling:org.apache.sling.commons.johnzon](https://github.com/apache/sling-org-apache-sling-commons-johnzon) from 1.2.16 to 2.0.0.
- [Commits](https://github.com/apache/sling-org-apache-sling-commons-johnzon/compare/org.apache.sling.commons.johnzon-1.2.16...org.apache.sling.commons.johnzon-2.0.0)

---
updated-dependencies:
- dependency-name: org.apache.sling:org.apache.sling.commons.johnzon
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4b1ee8f6ac8..129ec580ecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,7 +362,7 @@
         <spring.security57.version>5.7.12_4</spring.security57.version>
         <spring.security62.version>6.2.7_3</spring.security62.version>
 
-        <sling.commons.johnzon.version>1.2.16</sling.commons.johnzon.version>
+        <sling.commons.johnzon.version>2.0.0</sling.commons.johnzon.version>
         <sshd.version>2.17.1</sshd.version>
         <struts.bundle.version>1.3.10_1</struts.bundle.version>
         <xbean.version>4.30</xbean.version>

From 5b27f4f19bae7ea2a391a16c1c228e8db5b53eb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Tue, 21 Apr 2026 16:03:32 +0200
Subject: [PATCH 2/2] Bump org.apache.sling.commons.johnzon from 1.2.16 to
 2.0.0

The 2.0.0 release wraps Apache Johnzon 2.x which exports jakarta.json.*
instead of javax.json.*. This requires a coordinated upgrade of the
dependent stack:

- felix.cm.json 1.0.8 -> 2.0.6 (uses jakarta.json, exports
  org.apache.felix.cm.json.io instead of org.apache.felix.cm.json)
- felix.configurator 1.0.16 -> 1.0.18 (imports org.apache.felix.cm.json.io)
- Add jakarta.json:jakarta.json-api 2.1.3 to BOM and as provided
  dependency in features/core
- Update import in JsonConfigInstaller, ConfigRepositoryImpl and
  FeatureConfigInstaller from org.apache.felix.cm.json.Configurations
  to org.apache.felix.cm.json.io.Configurations
- Remove geronimo-json_1.1_spec compile dependency from config/core
  and features/core (replaced by jakarta.json-api)

Closes #2345
---
 bom/pom.xml                                                  | 5 +++++
 config/core/pom.xml                                          | 5 -----
 .../apache/karaf/config/core/impl/ConfigRepositoryImpl.java  | 2 +-
 .../apache/karaf/config/core/impl/JsonConfigInstaller.java   | 2 +-
 features/core/pom.xml                                        | 5 ++---
 .../features/internal/service/FeatureConfigInstaller.java    | 2 +-
 pom.xml                                                      | 5 +++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 64cefbc71dd..686180aa5ea 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1237,6 +1237,11 @@
                 <artifactId>jakarta.annotation-api</artifactId>
                 <version>${spec.annotation.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.json</groupId>
+                <artifactId>jakarta.json-api</artifactId>
+                <version>${jakarta.json.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
diff --git a/config/core/pom.xml b/config/core/pom.xml
index b5d19cf4c14..117f33db97f 100644
--- a/config/core/pom.xml
+++ b/config/core/pom.xml
@@ -85,11 +85,6 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.johnzon</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.1_spec</artifactId>
-            <version>1.5</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.fileinstall</artifactId>
diff --git a/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
index 3f057863e3f..dba78bf2505 100644
--- a/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
+++ b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
@@ -30,7 +30,7 @@
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
 import org.apache.felix.utils.properties.TypedProperties;
 import org.apache.karaf.config.core.ConfigRepository;
 import org.osgi.framework.Constants;
diff --git a/config/core/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java
index a1754195a96..1c82595b0a3 100644
--- a/config/core/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java
+++ b/config/core/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java
@@ -16,7 +16,7 @@
  */
 package org.apache.karaf.config.core.impl;
 
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
 import org.apache.felix.fileinstall.ArtifactInstaller;
 import org.apache.felix.fileinstall.internal.DirectoryWatcher;
 import org.apache.felix.utils.collections.DictionaryAsMap;
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 4e1007c568f..bb64abca043 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -97,9 +97,8 @@
             <scope>provided</scope>
         </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>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java
index 7d530ae4e68..e4ca871ed0f 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java
@@ -24,7 +24,7 @@
 import java.util.*;
 import java.util.regex.Pattern;
 
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
 import org.apache.felix.utils.properties.InterpolationHelper;
 import org.apache.felix.utils.properties.TypedProperties;
 import org.apache.karaf.features.ConfigFileInfo;
diff --git a/pom.xml b/pom.xml
index 129ec580ecf..58e8168cee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,6 +169,7 @@
         <aspectj.bundle.version>1.9.21.1_1</aspectj.bundle.version>
         <asm.version>9.9.1</asm.version>
         <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
+        <jakarta.json.version>2.1.3</jakarta.json.version>
         <awaitility.version>3.1.6</awaitility.version>
         <bouncycastle.version>1.84</bouncycastle.version>
         <camel.version>4.14.5</camel.version>
@@ -207,10 +208,10 @@
         <equinox.coordinator.version>1.5.500</equinox.coordinator.version>
 
         <felix.bundlerepository.version>2.0.10</felix.bundlerepository.version>
-        <felix.cm.json.version>1.0.8</felix.cm.json.version>
+        <felix.cm.json.version>2.0.6</felix.cm.json.version>
         <felix.configadmin.version>1.9.26</felix.configadmin.version>
         <felix.configadmin.interpolation.plugin.version>1.2.8</felix.configadmin.interpolation.plugin.version>
-        <felix.configurator.version>1.0.16</felix.configurator.version>
+        <felix.configurator.version>1.0.18</felix.configurator.version>
         <felix.connect.version>0.2.0</felix.connect.version>
         <felix.coordinator.version>1.0.2</felix.coordinator.version>
         <felix.converter.version>1.0.14</felix.converter.version>