diff --git a/configurator/pom.xml b/configurator/pom.xml
index db54c5d6dfd32733e20cdd771db6885173428777..f5b0159b775f8b1e6298ff31ed5d76612600bba2 100644
--- a/configurator/pom.xml
+++ b/configurator/pom.xml
@@ -50,7 +50,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>4.2.1</version>
+                <version>5.1.4</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -98,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
@@ -111,13 +111,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.cm.json</artifactId>
-            <version>1.0.6</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.1_spec</artifactId>
-            <version>1.2</version>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>2.0.2</version>
             <scope>provided</scope>
          </dependency>
         <dependency>
@@ -147,7 +147,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -160,6 +160,7 @@
             <groupId>org.apache.johnzon</groupId>
             <artifactId>johnzon-core</artifactId>
             <version>1.2.19</version>
+            <classifier>jakarta</classifier>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/configurator/src/main/java/org/apache/felix/configurator/impl/json/BinaryManager.java b/configurator/src/main/java/org/apache/felix/configurator/impl/json/BinaryManager.java
index 974220593ad0caeb57656581ccdab618f6b11a79..984e24fb841bfac7492df0f43c4d4444c71f81c1 100644
--- a/configurator/src/main/java/org/apache/felix/configurator/impl/json/BinaryManager.java
+++ b/configurator/src/main/java/org/apache/felix/configurator/impl/json/BinaryManager.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.felix.cm.json.ConfigurationReader.BinaryHandler;
+import org.apache.felix.cm.json.io.ConfigurationReader.BinaryHandler;
 import org.apache.felix.configurator.impl.json.JSONUtil.Report;
 
 public class BinaryManager implements BinaryHandler {
diff --git a/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java b/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
index b3b7fe76b94355026ef8aefbd71ec83e987bfa22..434dd4e32b801ce095d27f8b12deb370086ba0e1 100644
--- a/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
+++ b/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
@@ -34,9 +34,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.felix.cm.json.ConfigurationReader;
-import org.apache.felix.cm.json.ConfigurationResource;
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.json.io.ConfigurationReader;
+import org.apache.felix.cm.json.io.ConfigurationResource;
+import org.apache.felix.cm.json.io.Configurations;
 import org.apache.felix.configurator.impl.model.BundleState;
 import org.apache.felix.configurator.impl.model.Config;
 import org.apache.felix.configurator.impl.model.ConfigPolicy;