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 @@ jakarta.annotation-api ${spec.annotation.version} + + jakarta.json + jakarta.json-api + ${jakarta.json.version} + org.glassfish.jaxb jaxb-runtime 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 @@ org.apache.sling org.apache.sling.commons.johnzon - - org.apache.geronimo.specs - geronimo-json_1.1_spec - 1.5 - org.apache.felix org.apache.felix.fileinstall 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 @@ provided - org.apache.geronimo.specs - geronimo-json_1.1_spec - 1.5 + jakarta.json + jakarta.json-api provided 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 4b1ee8f6ac8..58e8168cee2 100644 --- a/pom.xml +++ b/pom.xml @@ -169,6 +169,7 @@ 1.9.21.1_1 9.9.1 2.1.1 + 2.1.3 3.1.6 1.84 4.14.5 @@ -207,10 +208,10 @@ 1.5.500 2.0.10 - 1.0.8 + 2.0.6 1.9.26 1.2.8 - 1.0.16 + 1.0.18 0.2.0 1.0.2 1.0.14 @@ -362,7 +363,7 @@ 5.7.12_4 6.2.7_3 - 1.2.16 + 2.0.0 2.17.1 1.3.10_1 4.30