This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 5a8d41af72 build(deps): bump felix.configurator 1.0.18 + migrate to
felix.cm.json 2.0.6 (jakarta.json) + bump sling.commons.johnzon 2.0.0 (#2108)
5a8d41af72 is described below
commit 5a8d41af725443804fd980a80b2950d205dea375
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 30 16:56:33 2026 +0200
build(deps): bump felix.configurator 1.0.18 + migrate to felix.cm.json
2.0.6 (jakarta.json) + bump sling.commons.johnzon 2.0.0 (#2108)
* build(deps): bump org.apache.felix:org.apache.felix.configurator
Bumps org.apache.felix:org.apache.felix.configurator from 1.0.16 to 1.0.18.
---
updated-dependencies:
- dependency-name: org.apache.felix:org.apache.felix.configurator
dependency-version: 1.0.18
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
* build(deps): bump felix.cm.json 1.0.8 -> 2.0.6 and migrate to jakarta.json
felix.configurator 1.0.18 (bumped from 1.0.16, supersedes #2108) requires
felix.cm.json 2.x, which switched the API package from
org.apache.felix.cm.json
to org.apache.felix.cm.json.io and the JSON-P provider from javax.json to
jakarta.json. This commit:
- bumps felix.configurator 1.0.16 -> 1.0.18
- bumps felix.cm.json 1.0.8 -> 2.0.6
- bumps sling.commons.johnzon 1.2.16 -> 2.0.0 (the matching
jakarta.json-exporting bundle in the framework feature)
- updates the Configurations imports in ConfigRepositoryImpl,
JsonConfigInstaller and FeatureConfigInstaller
- replaces geronimo-json_1.1_spec (javax.json) with
jakarta.json-api 2.1.3 on the compile classpath in features/core
and config/core
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JB Onofré <[email protected]>
---
config/core/pom.xml | 6 +++---
.../org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java | 2 +-
.../java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java | 2 +-
features/core/pom.xml | 6 +++---
.../karaf/features/internal/service/FeatureConfigInstaller.java | 2 +-
pom.xml | 6 +++---
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/config/core/pom.xml b/config/core/pom.xml
index b5d19cf4c1..718d37f24b 100644
--- a/config/core/pom.xml
+++ b/config/core/pom.xml
@@ -86,9 +86,9 @@
<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>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>2.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
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 3f057863e3..dba78bf250 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.Enumeration;
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 a1754195a9..1c82595b0a 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 4e1007c568..23a089cbad 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -97,9 +97,9 @@
<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>
+ <version>2.1.3</version>
<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 7d530ae4e6..e4ca871ed0 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.nio.charset.StandardCharsets;
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 592a801575..74e78c17dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,10 +207,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>
@@ -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>
