You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2022/11/04 05:59:19 UTC
[felix-dev] branch master updated: FELIX-6578 : Migrate to jakarta json
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 14550ae359 FELIX-6578 : Migrate to jakarta json
14550ae359 is described below
commit 14550ae359750cf986b9bfdee30b12fd75509784
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 4 06:59:12 2022 +0100
FELIX-6578 : Migrate to jakarta json
---
cm.json/pom.xml | 11 ++++-----
.../ConfigurationReader.java | 4 ++--
.../ConfigurationResource.java | 2 +-
.../ConfigurationWriter.java | 4 ++--
.../cm/{json => configuration}/Configurations.java | 12 +++++-----
.../impl/ConfigurationReaderImpl.java | 16 ++++++-------
.../impl/ConfigurationWriterImpl.java | 14 ++++++------
.../{json => configuration}/impl/JsonSupport.java | 26 +++++++++++-----------
.../impl/OrderedDictionary.java | 4 ++--
.../impl/TypeConverter.java | 8 +++----
.../cm/{json => configuration}/package-info.java | 4 ++--
.../impl/ConfigurationReaderImplTest.java | 4 ++--
.../impl/JsonSupportTest.java | 12 +++++-----
.../impl/OrderedDictionaryTest.java | 2 +-
.../impl/TypeConverterTest.java | 10 ++++-----
15 files changed, 67 insertions(+), 66 deletions(-)
diff --git a/cm.json/pom.xml b/cm.json/pom.xml
index a229e47214..5c306c0934 100644
--- a/cm.json/pom.xml
+++ b/cm.json/pom.xml
@@ -33,7 +33,7 @@
<description>
Support for OSGi configurations specified in JSON documents.
</description>
- <version>1.0.9-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<scm>
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
@@ -107,9 +107,9 @@
<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>
@@ -121,7 +121,8 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.14</version>
+ <classifier>jakarta</classifier>
+ <version>1.2.19</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationReader.java
similarity index 98%
rename from cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationReader.java
index e80851e372..e5132fa4e7 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationReader.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationReader.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json;
+package org.apache.felix.cm.configuration;
import java.io.IOException;
import java.io.Reader;
import java.util.Hashtable;
import java.util.List;
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationResource.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationResource.java
similarity index 97%
rename from cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationResource.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationResource.java
index 0b254a7c0d..00b3f16428 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationResource.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationResource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json;
+package org.apache.felix.cm.configuration;
import java.util.Hashtable;
import java.util.LinkedHashMap;
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationWriter.java
similarity index 96%
rename from cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationWriter.java
index fb783cc12e..4498c117bd 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/ConfigurationWriter.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/ConfigurationWriter.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json;
+package org.apache.felix.cm.configuration;
import java.io.IOException;
import java.io.Writer;
import java.util.Dictionary;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGenerator;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/Configurations.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/Configurations.java
similarity index 92%
rename from cm.json/src/main/java/org/apache/felix/cm/json/Configurations.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/Configurations.java
index ba66b31253..fe23dcf877 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/Configurations.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/Configurations.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json;
+package org.apache.felix.cm.configuration;
import java.io.IOException;
import java.io.Reader;
import java.util.Hashtable;
-import javax.json.JsonValue;
+import org.apache.felix.cm.configuration.impl.ConfigurationReaderImpl;
+import org.apache.felix.cm.configuration.impl.ConfigurationWriterImpl;
+import org.apache.felix.cm.configuration.impl.JsonSupport;
+import org.apache.felix.cm.configuration.impl.OrderedDictionary;
-import org.apache.felix.cm.json.impl.ConfigurationReaderImpl;
-import org.apache.felix.cm.json.impl.ConfigurationWriterImpl;
-import org.apache.felix.cm.json.impl.JsonSupport;
-import org.apache.felix.cm.json.impl.OrderedDictionary;
+import jakarta.json.JsonValue;
/**
* Factory class for JSON and configuration support
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationReaderImpl.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImpl.java
similarity index 97%
rename from cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationReaderImpl.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImpl.java
index 159d86ed6f..d877c8b6e2 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationReaderImpl.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import java.io.IOException;
import java.io.Reader;
@@ -25,14 +25,14 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
-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.configuration.ConfigurationReader;
+import org.apache.felix.cm.configuration.ConfigurationResource;
+import org.apache.felix.cm.configuration.Configurations;
import org.osgi.service.configurator.ConfiguratorConstants;
import org.osgi.util.converter.ConversionException;
import org.osgi.util.converter.Converters;
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationWriterImpl.java
similarity index 93%
rename from cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationWriterImpl.java
index 01d36660f9..5b55208786 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/impl/ConfigurationWriterImpl.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/ConfigurationWriterImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import java.io.FilterWriter;
import java.io.IOException;
@@ -27,13 +27,13 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonValue;
-import javax.json.stream.JsonGenerator;
+import org.apache.felix.cm.configuration.ConfigurationResource;
+import org.apache.felix.cm.configuration.ConfigurationWriter;
-import org.apache.felix.cm.json.ConfigurationResource;
-import org.apache.felix.cm.json.ConfigurationWriter;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerator;
public class ConfigurationWriterImpl
implements ConfigurationWriter, ConfigurationWriter.Builder {
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/impl/JsonSupport.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/JsonSupport.java
similarity index 96%
rename from cm.json/src/main/java/org/apache/felix/cm/json/impl/JsonSupport.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/impl/JsonSupport.java
index 8668856a6d..35b9ba5abc 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/impl/JsonSupport.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/JsonSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import java.io.FilterReader;
import java.io.IOException;
@@ -27,19 +27,19 @@ import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.configuration.Configurations;
import org.osgi.util.converter.Converters;
public class JsonSupport {
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/impl/OrderedDictionary.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/OrderedDictionary.java
similarity index 99%
rename from cm.json/src/main/java/org/apache/felix/cm/json/impl/OrderedDictionary.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/impl/OrderedDictionary.java
index f2cc16a6bb..a476d8bd57 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/impl/OrderedDictionary.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/OrderedDictionary.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import java.io.Serializable;
import java.util.AbstractSet;
@@ -36,7 +36,7 @@ import java.util.Set;
* Actually this class is a simple adapter from the Dictionary interface
* to a synchronized LinkedHashMap
*/
-public class OrderedDictionary extends Hashtable<String, Object> implements Serializable {
+public class OrderedDictionary extends Hashtable<String, Object> {
private static final long serialVersionUID = -525111601546803041L;
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/impl/TypeConverter.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/TypeConverter.java
similarity index 98%
rename from cm.json/src/main/java/org/apache/felix/cm/json/impl/TypeConverter.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/impl/TypeConverter.java
index 5958437538..30e15030b2 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/impl/TypeConverter.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/impl/TypeConverter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -26,9 +26,9 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonValue;
import org.osgi.util.converter.ConversionException;
import org.osgi.util.converter.Converters;
diff --git a/cm.json/src/main/java/org/apache/felix/cm/json/package-info.java b/cm.json/src/main/java/org/apache/felix/cm/configuration/package-info.java
similarity index 88%
rename from cm.json/src/main/java/org/apache/felix/cm/json/package-info.java
rename to cm.json/src/main/java/org/apache/felix/cm/configuration/package-info.java
index 92e5b565ce..5fe976540c 100644
--- a/cm.json/src/main/java/org/apache/felix/cm/json/package-info.java
+++ b/cm.json/src/main/java/org/apache/felix/cm/configuration/package-info.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.0.2")
-package org.apache.felix.cm.json;
+@Version("1.0.0")
+package org.apache.felix.cm.configuration;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/cm.json/src/test/java/org/apache/felix/cm/json/impl/ConfigurationReaderImplTest.java b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImplTest.java
similarity index 98%
rename from cm.json/src/test/java/org/apache/felix/cm/json/impl/ConfigurationReaderImplTest.java
rename to cm.json/src/test/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImplTest.java
index 37e8f8df91..9d44b59736 100644
--- a/cm.json/src/test/java/org/apache/felix/cm/json/impl/ConfigurationReaderImplTest.java
+++ b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/ConfigurationReaderImplTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -33,7 +33,7 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
-import javax.json.JsonException;
+import jakarta.json.JsonException;
import org.junit.Test;
diff --git a/cm.json/src/test/java/org/apache/felix/cm/json/impl/JsonSupportTest.java b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/JsonSupportTest.java
similarity index 96%
rename from cm.json/src/test/java/org/apache/felix/cm/json/impl/JsonSupportTest.java
rename to cm.json/src/test/java/org/apache/felix/cm/configuration/impl/JsonSupportTest.java
index 56e6cc6f16..e7c700a832 100644
--- a/cm.json/src/test/java/org/apache/felix/cm/json/impl/JsonSupportTest.java
+++ b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/JsonSupportTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -27,12 +27,12 @@ import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.configuration.Configurations;
import org.junit.Test;
/**
diff --git a/cm.json/src/test/java/org/apache/felix/cm/json/impl/OrderedDictionaryTest.java b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/OrderedDictionaryTest.java
similarity index 98%
rename from cm.json/src/test/java/org/apache/felix/cm/json/impl/OrderedDictionaryTest.java
rename to cm.json/src/test/java/org/apache/felix/cm/configuration/impl/OrderedDictionaryTest.java
index 4085ed8003..94d59add69 100644
--- a/cm.json/src/test/java/org/apache/felix/cm/json/impl/OrderedDictionaryTest.java
+++ b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/OrderedDictionaryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/cm.json/src/test/java/org/apache/felix/cm/json/impl/TypeConverterTest.java b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/TypeConverterTest.java
similarity index 99%
rename from cm.json/src/test/java/org/apache/felix/cm/json/impl/TypeConverterTest.java
rename to cm.json/src/test/java/org/apache/felix/cm/configuration/impl/TypeConverterTest.java
index 5cfd4db5d2..03584ba5a5 100644
--- a/cm.json/src/test/java/org/apache/felix/cm/json/impl/TypeConverterTest.java
+++ b/cm.json/src/test/java/org/apache/felix/cm/configuration/impl/TypeConverterTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.cm.json.impl;
+package org.apache.felix.cm.configuration.impl;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -29,10 +29,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
import org.junit.Test;