Merge pull request #214 from Cousjava/jakarta-rename

Jakarta package rename from javax

api/pom.xml

diff --git a/api/pom.xml b/api/pom.xml
index b3439cb..77a961d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
     <packaging>bundle</packaging>
-    <version>1.2-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>Jakarta JSON Processing API</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

api/src/main/java/jakarta/json/EmptyArray.java

diff --git a/api/src/main/java/javax/json/EmptyArray.java b/api/src/main/java/jakarta/json/EmptyArray.java
similarity index 98%
rename from api/src/main/java/javax/json/EmptyArray.java
rename to api/src/main/java/jakarta/json/EmptyArray.java
index 405aa23..1f4d741 100644
--- a/api/src/main/java/javax/json/EmptyArray.java
+++ b/api/src/main/java/jakarta/json/EmptyArray.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.Serializable;
 import java.util.AbstractList;

api/src/main/java/jakarta/json/EmptyObject.java

diff --git a/api/src/main/java/javax/json/EmptyObject.java b/api/src/main/java/jakarta/json/EmptyObject.java
similarity index 98%
rename from api/src/main/java/javax/json/EmptyObject.java
rename to api/src/main/java/jakarta/json/EmptyObject.java
index 9e5750a..1e58252 100644
--- a/api/src/main/java/javax/json/EmptyObject.java
+++ b/api/src/main/java/jakarta/json/EmptyObject.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.Serializable;
 import java.util.AbstractMap;

api/src/main/java/jakarta/json/Json.java

diff --git a/api/src/main/java/javax/json/Json.java b/api/src/main/java/jakarta/json/Json.java
similarity index 98%
rename from api/src/main/java/javax/json/Json.java
rename to api/src/main/java/jakarta/json/Json.java
index b6eb79e..1649c2c 100644
--- a/api/src/main/java/javax/json/Json.java
+++ b/api/src/main/java/jakarta/json/Json.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -25,11 +25,11 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
-import javax.json.spi.JsonProvider;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
+import jakarta.json.spi.JsonProvider;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
 
 /**
  * Factory class for creating JSON processing objects.

api/src/main/java/jakarta/json/JsonArray.java

diff --git a/api/src/main/java/javax/json/JsonArray.java b/api/src/main/java/jakarta/json/JsonArray.java
similarity index 98%
rename from api/src/main/java/javax/json/JsonArray.java
rename to api/src/main/java/jakarta/json/JsonArray.java
index a7bfae4..49f3fbd 100644
--- a/api/src/main/java/javax/json/JsonArray.java
+++ b/api/src/main/java/jakarta/json/JsonArray.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.util.List;
 import java.util.function.Function;
@@ -195,7 +195,7 @@
     /**
      * Returns the {@code String} value of {@code JsonString} at the specified
      * position in this JSON array values. If {@code JsonString} is found,
-     * its {@link javax.json.JsonString#getString()} is returned. Otherwise,
+     * its {@link jakarta.json.JsonString#getString()} is returned. Otherwise,
      * the specified default value is returned.
      *
      * @param index index of the {@code JsonString} value
@@ -221,7 +221,7 @@
     /**
      * Returns the int value of the {@code JsonNumber} at the specified position. 
      * If the value at that position is a {@code JsonNumber},
-     * this method returns {@link javax.json.JsonNumber#intValue()}. Otherwise
+     * this method returns {@link jakarta.json.JsonNumber#intValue()}. Otherwise
      * this method returns the specified default value.
      *
      * @param index index of the {@code JsonNumber} value

api/src/main/java/jakarta/json/JsonArrayBuilder.java

diff --git a/api/src/main/java/javax/json/JsonArrayBuilder.java b/api/src/main/java/jakarta/json/JsonArrayBuilder.java
similarity index 99%
rename from api/src/main/java/javax/json/JsonArrayBuilder.java
rename to api/src/main/java/jakarta/json/JsonArrayBuilder.java
index 9c980b6..63bd229 100644
--- a/api/src/main/java/javax/json/JsonArrayBuilder.java
+++ b/api/src/main/java/jakarta/json/JsonArrayBuilder.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -28,7 +28,7 @@
  * <p>Methods in this class can be chained to perform multiple values to
  * the array.</p>
  *
- * <p>The class {@link javax.json.Json} contains methods to create the builder
+ * <p>The class {@link jakarta.json.Json} contains methods to create the builder
  * object. The example code below shows how to build an empty {@code JsonArray}
  * instance.
  * <pre>

api/src/main/java/jakarta/json/JsonBuilderFactory.java

diff --git a/api/src/main/java/javax/json/JsonBuilderFactory.java b/api/src/main/java/jakarta/json/JsonBuilderFactory.java
similarity index 99%
rename from api/src/main/java/javax/json/JsonBuilderFactory.java
rename to api/src/main/java/jakarta/json/JsonBuilderFactory.java
index fa67eae..264145c 100644
--- a/api/src/main/java/javax/json/JsonBuilderFactory.java
+++ b/api/src/main/java/jakarta/json/JsonBuilderFactory.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.util.Collection;
 import java.util.Map;

api/src/main/java/jakarta/json/JsonException.java

diff --git a/api/src/main/java/javax/json/JsonException.java b/api/src/main/java/jakarta/json/JsonException.java
similarity index 98%
rename from api/src/main/java/javax/json/JsonException.java
rename to api/src/main/java/jakarta/json/JsonException.java
index 75da5b5..341f8c0 100644
--- a/api/src/main/java/javax/json/JsonException.java
+++ b/api/src/main/java/jakarta/json/JsonException.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * <code>JsonException</code> indicates that some exception happened during

api/src/main/java/jakarta/json/JsonMergePatch.java

diff --git a/api/src/main/java/javax/json/JsonMergePatch.java b/api/src/main/java/jakarta/json/JsonMergePatch.java
similarity index 98%
rename from api/src/main/java/javax/json/JsonMergePatch.java
rename to api/src/main/java/jakarta/json/JsonMergePatch.java
index 0801278..98806ae 100644
--- a/api/src/main/java/javax/json/JsonMergePatch.java
+++ b/api/src/main/java/jakarta/json/JsonMergePatch.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * <p>This interface represents an implementation of a JSON Merge Patch

api/src/main/java/jakarta/json/JsonNumber.java

diff --git a/api/src/main/java/javax/json/JsonNumber.java b/api/src/main/java/jakarta/json/JsonNumber.java
similarity index 99%
rename from api/src/main/java/javax/json/JsonNumber.java
rename to api/src/main/java/jakarta/json/JsonNumber.java
index 6173c8f..bd0e7a2 100644
--- a/api/src/main/java/javax/json/JsonNumber.java
+++ b/api/src/main/java/jakarta/json/JsonNumber.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

api/src/main/java/jakarta/json/JsonObject.java

diff --git a/api/src/main/java/javax/json/JsonObject.java b/api/src/main/java/jakarta/json/JsonObject.java
similarity index 97%
rename from api/src/main/java/javax/json/JsonObject.java
rename to api/src/main/java/jakarta/json/JsonObject.java
index 704243c..f99fb7e 100644
--- a/api/src/main/java/javax/json/JsonObject.java
+++ b/api/src/main/java/jakarta/json/JsonObject.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.util.Map;
 
@@ -171,7 +171,7 @@
     /**
      * Returns the string value of the associated {@code JsonString} mapping
      * for the specified name. If {@code JsonString} is found, then its
-     * {@link javax.json.JsonString#getString()} is returned. Otherwise,
+     * {@link jakarta.json.JsonString#getString()} is returned. Otherwise,
      * the specified default value is returned.
      *
      * @param name whose associated value is to be returned as String
@@ -197,7 +197,7 @@
     /**
      * Returns the int value of the associated {@code JsonNumber} mapping
      * for the specified name. If {@code JsonNumber} is found, then its
-     * {@link javax.json.JsonNumber#intValue()} is returned. Otherwise,
+     * {@link jakarta.json.JsonNumber#intValue()} is returned. Otherwise,
      * the specified default value is returned.
      *
      * @param name whose associated value is to be returned as int

api/src/main/java/jakarta/json/JsonObjectBuilder.java

diff --git a/api/src/main/java/javax/json/JsonObjectBuilder.java b/api/src/main/java/jakarta/json/JsonObjectBuilder.java
similarity index 98%
rename from api/src/main/java/javax/json/JsonObjectBuilder.java
rename to api/src/main/java/jakarta/json/JsonObjectBuilder.java
index 16a54cd..bf43c17 100644
--- a/api/src/main/java/javax/json/JsonObjectBuilder.java
+++ b/api/src/main/java/jakarta/json/JsonObjectBuilder.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -26,7 +26,7 @@
  * The methods in this class can be chained to add multiple name/value pairs
  * to the object.
  *
- * <p>The class {@link javax.json.Json} contains methods to create the builder
+ * <p>The class {@link jakarta.json.Json} contains methods to create the builder
  * object. The example code below shows how to build an empty {@code JsonObject}
  * instance.
  * <pre>

api/src/main/java/jakarta/json/JsonPatch.java

diff --git a/api/src/main/java/javax/json/JsonPatch.java b/api/src/main/java/jakarta/json/JsonPatch.java
similarity index 99%
rename from api/src/main/java/javax/json/JsonPatch.java
rename to api/src/main/java/jakarta/json/JsonPatch.java
index 6cbaa94..32c306f 100644
--- a/api/src/main/java/javax/json/JsonPatch.java
+++ b/api/src/main/java/jakarta/json/JsonPatch.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * <p>This interface represents an immutable implementation of a JSON Patch

api/src/main/java/jakarta/json/JsonPatchBuilder.java

diff --git a/api/src/main/java/javax/json/JsonPatchBuilder.java b/api/src/main/java/jakarta/json/JsonPatchBuilder.java
similarity index 99%
rename from api/src/main/java/javax/json/JsonPatchBuilder.java
rename to api/src/main/java/jakarta/json/JsonPatchBuilder.java
index 333f781..5454314 100644
--- a/api/src/main/java/javax/json/JsonPatchBuilder.java
+++ b/api/src/main/java/jakarta/json/JsonPatchBuilder.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * A builder for constructing a JSON Patch as defined by

api/src/main/java/jakarta/json/JsonPointer.java

diff --git a/api/src/main/java/javax/json/JsonPointer.java b/api/src/main/java/jakarta/json/JsonPointer.java
similarity index 99%
rename from api/src/main/java/javax/json/JsonPointer.java
rename to api/src/main/java/jakarta/json/JsonPointer.java
index 0d07c41..9e4b378 100644
--- a/api/src/main/java/javax/json/JsonPointer.java
+++ b/api/src/main/java/jakarta/json/JsonPointer.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * <p>This interface represents an immutable implementation of a JSON Pointer

api/src/main/java/jakarta/json/JsonReader.java

diff --git a/api/src/main/java/javax/json/JsonReader.java b/api/src/main/java/jakarta/json/JsonReader.java
similarity index 91%
rename from api/src/main/java/javax/json/JsonReader.java
rename to api/src/main/java/jakarta/json/JsonReader.java
index 99c1240..a4f5fb7 100644
--- a/api/src/main/java/javax/json/JsonReader.java
+++ b/api/src/main/java/jakarta/json/JsonReader.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.Closeable;
 
@@ -22,7 +22,7 @@
  * Reads a JSON {@link JsonObject object} or an {@link JsonArray array}
  * structure from an input source.
  *
- * <p>The class {@link javax.json.Json} contains methods to create readers from
+ * <p>The class {@link jakarta.json.Json} contains methods to create readers from
  * input sources ({@link java.io.InputStream} and {@link java.io.Reader}).
  *
  * <p>
@@ -61,7 +61,7 @@
      * @throws JsonException if a JSON object or array cannot
      *     be created due to i/o error (IOException would be
      * cause of JsonException)
-     * @throws javax.json.stream.JsonParsingException if a JSON object or array
+     * @throws jakarta.json.stream.JsonParsingException if a JSON object or array
      *     cannot be created due to incorrect representation
      * @throws IllegalStateException if read, readObject, readArray,
      *     readValue or close method is already called
@@ -77,7 +77,7 @@
      * @throws JsonException if a JSON object cannot
      *     be created due to i/o error (IOException would be
      *     cause of JsonException)
-     * @throws javax.json.stream.JsonParsingException if a JSON object cannot
+     * @throws jakarta.json.stream.JsonParsingException if a JSON object cannot
      *     be created due to incorrect representation
      * @throws IllegalStateException if read, readObject, readArray,
      *     readValue or close method is already called
@@ -93,7 +93,7 @@
      * @throws JsonException if a JSON array cannot
      *     be created due to i/o error (IOException would be
      *     cause of JsonException)
-     * @throws javax.json.stream.JsonParsingException if a JSON array cannot
+     * @throws jakarta.json.stream.JsonParsingException if a JSON array cannot
      *     be created due to incorrect representation
      * @throws IllegalStateException if read, readObject, readArray,
      *     readValue or close method is already called
@@ -109,7 +109,7 @@
      * @throws JsonException if a JSON value
      *     be created due to i/o error (IOException would be
      *     cause of JsonException)
-     * @throws javax.json.stream.JsonParsingException if a JSON value
+     * @throws jakarta.json.stream.JsonParsingException if a JSON value
      *     cannot be created due to incorrect representation
      * @throws IllegalStateException if read, readObject, readArray,
      *     readValue or close method is already called

api/src/main/java/jakarta/json/JsonReaderFactory.java

diff --git a/api/src/main/java/javax/json/JsonReaderFactory.java b/api/src/main/java/jakarta/json/JsonReaderFactory.java
similarity index 94%
rename from api/src/main/java/javax/json/JsonReaderFactory.java
rename to api/src/main/java/jakarta/json/JsonReaderFactory.java
index 4a4f0fb..c481a3f 100644
--- a/api/src/main/java/javax/json/JsonReaderFactory.java
+++ b/api/src/main/java/jakarta/json/JsonReaderFactory.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -22,12 +22,12 @@
 import java.util.Map;
 
 /**
- * Factory to create {@link javax.json.JsonReader} instances. If a factory
+ * Factory to create {@link jakarta.json.JsonReader} instances. If a factory
  * instance is configured with some configuration, that would be
  * used to configure the created reader instances.
  *
  * <p>
- * {@link javax.json.JsonReader} can also be created using {@link Json}'s
+ * {@link jakarta.json.JsonReader} can also be created using {@link Json}'s
  * {@code createReader} methods. If multiple reader instances are created,
  * then creating them using a reader factory is preferred.
  *

api/src/main/java/jakarta/json/JsonString.java

diff --git a/api/src/main/java/javax/json/JsonString.java b/api/src/main/java/jakarta/json/JsonString.java
similarity index 98%
rename from api/src/main/java/javax/json/JsonString.java
rename to api/src/main/java/jakarta/json/JsonString.java
index 6f341c4..d37e1d0 100644
--- a/api/src/main/java/javax/json/JsonString.java
+++ b/api/src/main/java/jakarta/json/JsonString.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * An immutable JSON string value.

api/src/main/java/jakarta/json/JsonStructure.java

diff --git a/api/src/main/java/javax/json/JsonStructure.java b/api/src/main/java/jakarta/json/JsonStructure.java
similarity index 98%
rename from api/src/main/java/javax/json/JsonStructure.java
rename to api/src/main/java/jakarta/json/JsonStructure.java
index 6dc9a77..1df5d99 100644
--- a/api/src/main/java/javax/json/JsonStructure.java
+++ b/api/src/main/java/jakarta/json/JsonStructure.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * Super type for the two structured types in JSON ({@link JsonObject object}s

api/src/main/java/jakarta/json/JsonValue.java

diff --git a/api/src/main/java/javax/json/JsonValue.java b/api/src/main/java/jakarta/json/JsonValue.java
similarity index 99%
rename from api/src/main/java/javax/json/JsonValue.java
rename to api/src/main/java/jakarta/json/JsonValue.java
index c4968e0..76decf5 100644
--- a/api/src/main/java/javax/json/JsonValue.java
+++ b/api/src/main/java/jakarta/json/JsonValue.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 /**
  * <code>JsonValue</code> represents an immutable JSON value.

api/src/main/java/jakarta/json/JsonValueImpl.java

diff --git a/api/src/main/java/javax/json/JsonValueImpl.java b/api/src/main/java/jakarta/json/JsonValueImpl.java
similarity index 98%
rename from api/src/main/java/javax/json/JsonValueImpl.java
rename to api/src/main/java/jakarta/json/JsonValueImpl.java
index 1a4a2e4..468386f 100644
--- a/api/src/main/java/javax/json/JsonValueImpl.java
+++ b/api/src/main/java/jakarta/json/JsonValueImpl.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.Serializable;
 

api/src/main/java/jakarta/json/JsonWriter.java

diff --git a/api/src/main/java/javax/json/JsonWriter.java b/api/src/main/java/jakarta/json/JsonWriter.java
similarity index 97%
rename from api/src/main/java/javax/json/JsonWriter.java
rename to api/src/main/java/jakarta/json/JsonWriter.java
index 16bfd6f..59c55c8 100644
--- a/api/src/main/java/javax/json/JsonWriter.java
+++ b/api/src/main/java/jakarta/json/JsonWriter.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.Closeable;
 
@@ -22,7 +22,7 @@
  * Writes a JSON {@link JsonObject object} or {@link JsonArray array} structure
  * to an output source.
  *
- * <p>The class {@link javax.json.Json} contains methods to create writers from
+ * <p>The class {@link jakarta.json.Json} contains methods to create writers from
  * output sources ({@link java.io.OutputStream} and {@link java.io.Writer}).
  *
  * <p>

api/src/main/java/jakarta/json/JsonWriterFactory.java

diff --git a/api/src/main/java/javax/json/JsonWriterFactory.java b/api/src/main/java/jakarta/json/JsonWriterFactory.java
similarity index 94%
rename from api/src/main/java/javax/json/JsonWriterFactory.java
rename to api/src/main/java/jakarta/json/JsonWriterFactory.java
index 540721e..faf0e2c 100644
--- a/api/src/main/java/javax/json/JsonWriterFactory.java
+++ b/api/src/main/java/jakarta/json/JsonWriterFactory.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json;
+package jakarta.json;
 
 import java.io.OutputStream;
 import java.io.Writer;
@@ -22,12 +22,12 @@
 import java.util.Map;
 
 /**
- * Factory to create {@link javax.json.JsonWriter} instances. If a factory
+ * Factory to create {@link jakarta.json.JsonWriter} instances. If a factory
  * instance is configured with some configuration, that would be
  * used to configure the created writer instances.
  *
  * <p>
- * {@link javax.json.JsonWriter} can also be created using {@link Json}'s
+ * {@link jakarta.json.JsonWriter} can also be created using {@link Json}'s
  * {@code createWriter} methods. If multiple writer instances are created,
  * then creating them using a writer factory is preferred.
  *

api/src/main/java/jakarta/json/package-info.java

diff --git a/api/src/main/java/javax/json/package-info.java b/api/src/main/java/jakarta/json/package-info.java
similarity index 77%
rename from api/src/main/java/javax/json/package-info.java
rename to api/src/main/java/jakarta/json/package-info.java
index e79212c..dc9e7c3 100644
--- a/api/src/main/java/javax/json/package-info.java
+++ b/api/src/main/java/jakarta/json/package-info.java
@@ -19,21 +19,21 @@
  *
  * <p>The object model API is a high-level API that provides immutable object
  * models for JSON object and array structures. These JSON structures are
- * represented as object models using the Java types {@link javax.json.JsonObject}
- * and {@link javax.json.JsonArray}. The interface {@code javax.json.JsonObject} provides
+ * represented as object models using the Java types {@link jakarta.json.JsonObject}
+ * and {@link jakarta.json.JsonArray}. The interface {@code jakarta.json.JsonObject} provides
  * a {@link java.util.Map} view to access the unordered collection of zero or
  * more name/value pairs from the model. Similarly, the interface
  * {@code JsonArray} provides a {@link java.util.List} view to access the
  * ordered sequence of zero or more values from the model.
  *
  * <p>The object model API uses builder patterns to create and modify
- * these object models. The classes {@link javax.json.JsonObjectBuilder} and 
- * {@link javax.json.JsonArrayBuilder} provide methods to create and modify models
+ * these object models. The classes {@link jakarta.json.JsonObjectBuilder} and 
+ * {@link jakarta.json.JsonArrayBuilder} provide methods to create and modify models
  * of type {@code JsonObject} and {@code JsonArray} respectively.
  *
  * <p>These object models can also be created from an input source using
- * the class {@link javax.json.JsonReader}. Similarly, these object models
- * can be written to an output source using the class {@link javax.json.JsonWriter}.
+ * the class {@link jakarta.json.JsonReader}. Similarly, these object models
+ * can be written to an output source using the class {@link jakarta.json.JsonWriter}.
  * <p>
  * This package includes several classes that implement other JSON related
  * standards: <a href="http://tools.ietf.org/html/rfc6901">JSON Pointer</a>,
@@ -42,4 +42,4 @@
  * They can be used to retrieve, transform or manipulate values in an
  * object model.
  */
-package javax.json;
+package jakarta.json;

api/src/main/java/jakarta/json/spi/JsonProvider.java

diff --git a/api/src/main/java/javax/json/spi/JsonProvider.java b/api/src/main/java/jakarta/json/spi/JsonProvider.java
similarity index 98%
rename from api/src/main/java/javax/json/spi/JsonProvider.java
rename to api/src/main/java/jakarta/json/spi/JsonProvider.java
index f1ac7c8..96aebc6 100644
--- a/api/src/main/java/javax/json/spi/JsonProvider.java
+++ b/api/src/main/java/jakarta/json/spi/JsonProvider.java
@@ -14,13 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.spi;
+package jakarta.json.spi;
 
-import javax.json.*;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
+import jakarta.json.*;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;

api/src/main/java/jakarta/json/spi/package-info.java

diff --git a/api/src/main/java/javax/json/spi/package-info.java b/api/src/main/java/jakarta/json/spi/package-info.java
similarity index 92%
rename from api/src/main/java/javax/json/spi/package-info.java
rename to api/src/main/java/jakarta/json/spi/package-info.java
index 83e41e0..545b4cf 100644
--- a/api/src/main/java/javax/json/spi/package-info.java
+++ b/api/src/main/java/jakarta/json/spi/package-info.java
@@ -18,7 +18,7 @@
  * Service Provider Interface (SPI) to plug in implementations for
  * JSON processing objects.
  *
- * <p> {@link javax.json.spi.JsonProvider JsonProvider} is an abstract class 
+ * <p> {@link jakarta.json.spi.JsonProvider JsonProvider} is an abstract class 
  * that provides a service for creating JSON processing instances.
  * A <i>service provider</i> for {@code JsonProvider} provides an 
  * specific implementation by subclassing and implementing the methods in
@@ -29,4 +29,4 @@
  *
  * @since JSON Processing 1.0
  */
-package javax.json.spi;
+package jakarta.json.spi;

api/src/main/java/jakarta/json/stream/JsonCollectors.java

diff --git a/api/src/main/java/javax/json/stream/JsonCollectors.java b/api/src/main/java/jakarta/json/stream/JsonCollectors.java
similarity index 96%
rename from api/src/main/java/javax/json/stream/JsonCollectors.java
rename to api/src/main/java/jakarta/json/stream/JsonCollectors.java
index 4cbf2e4..11ee6cd 100644
--- a/api/src/main/java/javax/json/stream/JsonCollectors.java
+++ b/api/src/main/java/jakarta/json/stream/JsonCollectors.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -23,13 +23,13 @@
 import java.util.function.Function;
 import java.util.function.BiConsumer;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
-import javax.json.JsonException;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonException;
 
 /**
  * This class contains some implementations of {@code java.util.stream.Collector} for accumulating

api/src/main/java/jakarta/json/stream/JsonGenerationException.java

diff --git a/api/src/main/java/javax/json/stream/JsonGenerationException.java b/api/src/main/java/jakarta/json/stream/JsonGenerationException.java
similarity index 96%
rename from api/src/main/java/javax/json/stream/JsonGenerationException.java
rename to api/src/main/java/jakarta/json/stream/JsonGenerationException.java
index b77d929..f544526 100644
--- a/api/src/main/java/javax/json/stream/JsonGenerationException.java
+++ b/api/src/main/java/jakarta/json/stream/JsonGenerationException.java
@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
-import javax.json.JsonException;
+import jakarta.json.JsonException;
 
 /**
  * {@code JsonGenerationException} indicates an incorrect JSON is

api/src/main/java/jakarta/json/stream/JsonGenerator.java

diff --git a/api/src/main/java/javax/json/stream/JsonGenerator.java b/api/src/main/java/jakarta/json/stream/JsonGenerator.java
similarity index 88%
rename from api/src/main/java/javax/json/stream/JsonGenerator.java
rename to api/src/main/java/jakarta/json/stream/JsonGenerator.java
index 1c309c2..0987c15 100644
--- a/api/src/main/java/javax/json/stream/JsonGenerator.java
+++ b/api/src/main/java/jakarta/json/stream/JsonGenerator.java
@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
-import javax.json.JsonValue;
+import jakarta.json.JsonValue;
 import java.io.Closeable;
 import java.io.Flushable;
 import java.math.BigDecimal;
@@ -24,7 +24,7 @@
 
 /**
  * Writes JSON data to an output source in a streaming way. The class
- * {@link javax.json.Json} contains methods to create generators for character
+ * {@link jakarta.json.Json} contains methods to create generators for character
  * or output streams ({@link java.io.Writer} and {@link java.io.OutputStream}).
  *
  * <p>
@@ -134,7 +134,7 @@
  * The generated JSON text must strictly conform to the grammar defined in
  * <a href="http://www.ietf.org/rfc/rfc7159.txt">RFC 7159</a>.
  *
- * @see javax.json.Json
+ * @see jakarta.json.Json
  * @see JsonGeneratorFactory
  */
 public interface JsonGenerator extends Flushable, /*Auto*/Closeable {
@@ -143,7 +143,7 @@
      * must support this property. The value of the property could be
      * be anything.
      */
-    String PRETTY_PRINTING = "javax.json.stream.JsonGenerator.prettyPrinting" ;
+    String PRETTY_PRINTING = "jakarta.json.stream.JsonGenerator.prettyPrinting" ;
 
     /**
      * Writes the JSON start object character. It starts a new child object
@@ -153,7 +153,7 @@
      * no context.
      *
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is called within an
      *      object context or if it is called more than once in no context.
@@ -167,7 +167,7 @@
      *
      * @param name a name within the JSON name/object pair to be written
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *     object context
@@ -183,7 +183,7 @@
      *
      * @param name name of json field
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *     object context
@@ -200,7 +200,7 @@
      * no context.
      *
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is called within an
      *      object context or if called more than once in no context
@@ -214,7 +214,7 @@
      *
      * @param name a name within the JSON name/array pair to be written
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within
      *      an object context
@@ -229,7 +229,7 @@
      * @param value a value in the JSON name/value pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context
@@ -245,7 +245,7 @@
      * @param value a value in the JSON name/string pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context
@@ -263,7 +263,7 @@
      * @param value a value in the JSON name/number pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context.
@@ -280,7 +280,7 @@
      * @param value a value in the JSON name/number pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context.
@@ -298,7 +298,7 @@
      * @param value a value in the JSON name/number pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context.
@@ -316,7 +316,7 @@
      * @param value a value in the JSON name/number pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context.
@@ -334,7 +334,7 @@
      * @param value a value in the JSON name/number pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws NumberFormatException if the value is Not-a-Number (NaN) or infinity.
      * @throws JsonGenerationException if this method is not called within an
@@ -352,7 +352,7 @@
      * @param value a value in the JSON name/boolean pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context.
@@ -366,7 +366,7 @@
      * @param name a name in the JSON name/null pair to be written in
      *             current JSON object
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      object context
@@ -382,7 +382,7 @@
      * If parent context is field context, it is closed.
      *
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is called in no context.
      */
@@ -394,7 +394,7 @@
      *
      * @param value a value to be written in current JSON array
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
@@ -407,7 +407,7 @@
      *
      * @param value a value to be written in current JSON array
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
@@ -421,12 +421,12 @@
      *
      * @param value a value to be written in current JSON array
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
      *
-     * @see javax.json.JsonNumber
+     * @see jakarta.json.JsonNumber
      */
     JsonGenerator write(BigDecimal value);
 
@@ -437,12 +437,12 @@
      *
      * @param value a value to be written in current JSON array
      * @return this generator.
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
      *
-     * @see javax.json.JsonNumber
+     * @see jakarta.json.JsonNumber
      */
     JsonGenerator write(BigInteger value);
 
@@ -453,7 +453,7 @@
      *
      * @param value a value to be written in current JSON array
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
@@ -467,7 +467,7 @@
      *
      * @param value a value to be written in current JSON array
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
@@ -481,7 +481,7 @@
      *
      * @param value a value to be written in current JSON array
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
@@ -496,7 +496,7 @@
      *
      * @param value a {@code boolean} value
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
@@ -507,7 +507,7 @@
      * Writes a JSON null value within the current array, field or root context.
      *
      * @return this generator
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if this method is not called within an
      *      array or root context.
@@ -518,7 +518,7 @@
      * Closes this generator and frees any resources associated with it.
      * This method closes the underlying output source.
      *
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonGenerationException if an incomplete JSON is generated
      */
@@ -530,7 +530,7 @@
      * any characters in a buffer, writes them immediately to the underlying
      * output source before flushing it.
      *
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      */
     @Override

api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java

diff --git a/api/src/main/java/javax/json/stream/JsonGeneratorFactory.java b/api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java
similarity index 96%
rename from api/src/main/java/javax/json/stream/JsonGeneratorFactory.java
rename to api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java
index 83b01ad..c91d0a6 100644
--- a/api/src/main/java/javax/json/stream/JsonGeneratorFactory.java
+++ b/api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
 import java.io.OutputStream;
 import java.io.Writer;
@@ -27,7 +27,7 @@
  * to all generator instances created using that factory instance.
  *
  * <p>
- * The class {@link javax.json.Json Json} also provides methods to create
+ * The class {@link jakarta.json.Json Json} also provides methods to create
  * {@link JsonGenerator} instances, but using {@code JsonGeneratorFactory} is
  * preferred when creating multiple generator instances as shown in the
  * following example:

api/src/main/java/jakarta/json/stream/JsonLocation.java

diff --git a/api/src/main/java/javax/json/stream/JsonLocation.java b/api/src/main/java/jakarta/json/stream/JsonLocation.java
similarity index 95%
rename from api/src/main/java/javax/json/stream/JsonLocation.java
rename to api/src/main/java/jakarta/json/stream/JsonLocation.java
index 6f0c12c..98375b6 100644
--- a/api/src/main/java/javax/json/stream/JsonLocation.java
+++ b/api/src/main/java/jakarta/json/stream/JsonLocation.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
 /**
  * Provides the location information of a JSON event in an input source. The
@@ -25,7 +25,7 @@
  * example, a provider may only report line numbers. Also, there may not be any
  * location information for an input source. For example, if a
  * {@code JsonParser} is created using
- * {@link javax.json.JsonArray JsonArray} input source, all the methods in
+ * {@link jakarta.json.JsonArray JsonArray} input source, all the methods in
  * this class return -1.
  * @see JsonParser
  * @see JsonParsingException

api/src/main/java/jakarta/json/stream/JsonParser.java

diff --git a/api/src/main/java/javax/json/stream/JsonParser.java b/api/src/main/java/jakarta/json/stream/JsonParser.java
similarity index 97%
rename from api/src/main/java/javax/json/stream/JsonParser.java
rename to api/src/main/java/jakarta/json/stream/JsonParser.java
index 67e5aec..934cfaa 100644
--- a/api/src/main/java/javax/json/stream/JsonParser.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParser.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
 
 import java.io.Closeable;
@@ -22,16 +22,16 @@
 import java.util.stream.Stream;
 import java.util.Map;
 
-import javax.json.JsonValue;
-import javax.json.JsonObject;
-import javax.json.JsonArray;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonArray;
 
 /**
  * Provides forward, read-only access to JSON data in a streaming way. This
  * is the most efficient way for reading JSON data.
  * This is the only way to parse and process JSON data that are too big to be loaded in memory.
  * <p>The class
- * {@link javax.json.Json} contains methods to create parsers from input
+ * {@link jakarta.json.Json} contains methods to create parsers from input
  * sources ({@link java.io.InputStream} and {@link java.io.Reader}).
  *
  * <p>
@@ -166,7 +166,7 @@
  * }
  * </code></pre>
  *
- * @see javax.json.Json
+ * @see jakarta.json.Json
  * @see JsonParserFactory
  */
 public interface JsonParser extends /*Auto*/Closeable {
@@ -232,7 +232,7 @@
      * {@code false} if the parser reaches the end of the JSON text.
      *
      * @return {@code true} if there are more parsing states.
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonParsingException if the parser encounters invalid JSON
      * when advancing to next state.
@@ -242,7 +242,7 @@
     /**
      * Returns the event for the next parsing state.
      *
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      * @throws JsonParsingException if the parser encounters invalid JSON
      * when advancing to next state.
@@ -479,7 +479,7 @@
      * Closes this parser and frees any resources associated with the
      * parser. This method closes the underlying input source.
      *
-     * @throws javax.json.JsonException if an i/o error occurs (IOException
+     * @throws jakarta.json.JsonException if an i/o error occurs (IOException
      * would be cause of JsonException)
      */
     @Override

api/src/main/java/jakarta/json/stream/JsonParserFactory.java

diff --git a/api/src/main/java/javax/json/stream/JsonParserFactory.java b/api/src/main/java/jakarta/json/stream/JsonParserFactory.java
similarity index 93%
rename from api/src/main/java/javax/json/stream/JsonParserFactory.java
rename to api/src/main/java/jakarta/json/stream/JsonParserFactory.java
index 32a4325..df29300 100644
--- a/api/src/main/java/javax/json/stream/JsonParserFactory.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParserFactory.java
@@ -14,10 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
@@ -29,7 +29,7 @@
  * to all parser instances created using that factory instance.
  *
  * <p>
- * The class {@link javax.json.Json Json} also provides methods to create
+ * The class {@link jakarta.json.Json Json} also provides methods to create
  * {@link JsonParser} instances, but using {@code JsonParserFactory} is 
  * preferred when creating multiple parser instances as shown in the following
  * example:
@@ -62,7 +62,7 @@
      *
      * @param in i/o stream from which JSON is to be read
      * @return the created JSON parser
-     * @throws javax.json.JsonException if encoding cannot be determined
+     * @throws jakarta.json.JsonException if encoding cannot be determined
      *         or i/o error (IOException would be cause of JsonException)
      */
     JsonParser createParser(InputStream in);

api/src/main/java/jakarta/json/stream/JsonParsingException.java

diff --git a/api/src/main/java/javax/json/stream/JsonParsingException.java b/api/src/main/java/jakarta/json/stream/JsonParsingException.java
similarity index 97%
rename from api/src/main/java/javax/json/stream/JsonParsingException.java
rename to api/src/main/java/jakarta/json/stream/JsonParsingException.java
index 212900b..ec6617c 100644
--- a/api/src/main/java/javax/json/stream/JsonParsingException.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParsingException.java
@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.stream;
+package jakarta.json.stream;
 
-import javax.json.JsonException;
+import jakarta.json.JsonException;
 
 /**
  * {@code JsonParsingException} is used when an incorrect JSON is

api/src/main/java/jakarta/json/stream/package-info.java

diff --git a/api/src/main/java/javax/json/stream/package-info.java b/api/src/main/java/jakarta/json/stream/package-info.java
similarity index 91%
rename from api/src/main/java/javax/json/stream/package-info.java
rename to api/src/main/java/jakarta/json/stream/package-info.java
index 33a2cf1..0983b46 100644
--- a/api/src/main/java/javax/json/stream/package-info.java
+++ b/api/src/main/java/jakarta/json/stream/package-info.java
@@ -20,8 +20,8 @@
  *
  * <p>
  * The streaming API consists of the interfaces
- * {@link javax.json.stream.JsonParser} and
- * {@link javax.json.stream.JsonGenerator}. The interface {@code JsonParser}
+ * {@link jakarta.json.stream.JsonParser} and
+ * {@link jakarta.json.stream.JsonGenerator}. The interface {@code JsonParser}
  * contains methods to parse JSON in a streaming way. The interface
  * {@code JsonGenerator} contains methods to write JSON to an output source
  * in a streaming way.
@@ -44,4 +44,4 @@
  *
  * @since JSON Processing 1.0
  */
-package javax.json.stream;
+package jakarta.json.stream;

api/src/main/javadoc/overview.html

diff --git a/api/src/main/javadoc/overview.html b/api/src/main/javadoc/overview.html
index 151f1b4..fa7effa 100644
--- a/api/src/main/javadoc/overview.html
+++ b/api/src/main/javadoc/overview.html
@@ -42,8 +42,8 @@
 
 <h2>The Streaming API</h2>
 <p>The streaming API is similar to the StAX API for XML and consists of the
-interfaces {@link javax.json.stream.JsonParser} and
-{@link javax.json.stream.JsonGenerator}. {@code JsonParser}
+interfaces {@link jakarta.json.stream.JsonParser} and
+{@link jakarta.json.stream.JsonGenerator}. {@code JsonParser}
 contains methods to parse JSON data using the streaming model.
 {@code JsonGenerator} contains methods to write JSON data to an ouptut source.
 
@@ -52,13 +52,13 @@
 application code controls the thread and calls methods in the parser interface
 to move the parser forward or to obtain JSON data from the current state of
 the parser. Refer to
-<a href="javax/json/stream/JsonParser.html#JsonParserExample2">this example</a>
+<a href="jakarta/json/stream/JsonParser.html#JsonParserExample2">this example</a>
 for more details.
 
 <p>{@code JsonGenerator} provides methods to write JSON to a stream. The
 generator writes name/value pairs in JSON objects and values in JSON arrays.
 Refer to
-<a href="javax/json/stream/JsonGenerator.html#JsonGeneratorExample3">this
+<a href="jakarta/json/stream/JsonGenerator.html#JsonGeneratorExample3">this
 example</a> for more details.
 
 <p>The streaming API is a low-level API designed to process large amounts of
@@ -69,32 +69,32 @@
 <p>The object model API is similar to the DOM API for XML. It is a high-level
 API that provides immutable object models for JSON object and array structures.
 These JSON structures are represented as object models using the Java types
-{@link javax.json.JsonObject} and {@link javax.json.JsonArray}.
+{@link jakarta.json.JsonObject} and {@link jakarta.json.JsonArray}.
 {@code JsonObject} provides a {@link java.util.Map} view to access the unordered
 collection of zero or more name/value pairs from the model. Similarly,
 {@code JsonArray} provides a {@link java.util.List} view to access the ordered
 sequence of zero or more values from the model.
 
 <p>The object model API uses builder patterns to create these object models.
-Application code can use the interface {@link javax.json.JsonObjectBuilder}
+Application code can use the interface {@link jakarta.json.JsonObjectBuilder}
 to create models that represent JSON objects. The resulting model is of type
 {@code JsonObject}. Refer to
-<a href="javax/json/JsonObjectBuilder.html#JsonObjectBuilderExample1">this example</a>
+<a href="jakarta/json/JsonObjectBuilder.html#JsonObjectBuilderExample1">this example</a>
 for more details. Application code can use the interface
-{@link javax.json.JsonArrayBuilder} to create models that represent JSON arrays.
+{@link jakarta.json.JsonArrayBuilder} to create models that represent JSON arrays.
 The resulting model is of type {@code JsonArray}. Refer to
-<a href="javax/json/JsonArrayBuilder.html#JsonArrayBuilderExample1">this example</a>
+<a href="jakarta/json/JsonArrayBuilder.html#JsonArrayBuilderExample1">this example</a>
 for more details.
 
 <p>These object models can also be created from an input source (such as
 {@link java.io.InputStream} or {@link java.io.Reader}) using the interface
-{@link javax.json.JsonReader}.
-<a href="javax/json/JsonReader.html#JsonReaderExample1">This example</a> shows
+{@link jakarta.json.JsonReader}.
+<a href="jakarta/json/JsonReader.html#JsonReaderExample1">This example</a> shows
 how to read and create an empty {@code JsonArray} model using the interface
 {@code JsonReader}. Similarly, these object models can be written to an output
 source (such as {@link java.io.OutputStream} or {@link java.io.Writer}) using
-the class {@link javax.json.JsonWriter}.
-<a href="javax/json/JsonWriter.html#JsonWriterExample1">This example</a> shows
+the class {@link jakarta.json.JsonWriter}.
+<a href="jakarta/json/JsonWriter.html#JsonWriterExample1">This example</a> shows
 how to write an empty {@code JsonObject} model using the interface
 {@code JsonWriter}.
 

api/src/main/jdk9/module-info.java

diff --git a/api/src/main/jdk9/module-info.java b/api/src/main/jdk9/module-info.java
index 2b15d4c..c5743da 100644
--- a/api/src/main/jdk9/module-info.java
+++ b/api/src/main/jdk9/module-info.java
@@ -18,8 +18,8 @@
  * Jakarta JSON Processing API.
  */
 module java.json {
-    exports javax.json;
-    exports javax.json.spi;
-    exports javax.json.stream;
-    uses javax.json.spi.JsonProvider;
+    exports jakarta.json;
+    exports jakarta.json.spi;
+    exports jakarta.json.stream;
+    uses jakarta.json.spi.JsonProvider;
 }

bundles/pom.xml

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 70a01a4..0c26a80 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

bundles/ri/pom.xml

diff --git a/bundles/ri/pom.xml b/bundles/ri/pom.xml
index c3c82ba..229bab7 100755
--- a/bundles/ri/pom.xml
+++ b/bundles/ri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json-bundles</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>json-ri-bundle</artifactId>

demos/customprovider-jdk9/pom.xml

diff --git a/demos/customprovider-jdk9/pom.xml b/demos/customprovider-jdk9/pom.xml
index 9835b21..526553c 100644
--- a/demos/customprovider-jdk9/pom.xml
+++ b/demos/customprovider-jdk9/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java

diff --git a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
index f93fcc1..01d6f29 100644
--- a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
+++ b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
@@ -10,9 +10,9 @@
 
 package org.glassfish.json.customprovider;
 
-import javax.json.JsonException;
-import javax.json.JsonValue;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.JsonException;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerator;
 import java.io.IOException;
 import java.io.Writer;
 import java.math.BigDecimal;

demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java

diff --git a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
index 0a97ffc..ebabfd3 100644
--- a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
+++ b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
@@ -10,24 +10,24 @@
 
 package org.glassfish.json.customprovider;
 
-import javax.json.spi.JsonProvider;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
+import jakarta.json.spi.JsonProvider;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Map;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
 
 /**
  * @author Jitendra Kotamraju

demos/customprovider-jdk9/src/main/jdk9/module-info.java

diff --git a/demos/customprovider-jdk9/src/main/jdk9/module-info.java b/demos/customprovider-jdk9/src/main/jdk9/module-info.java
index a77a7eb..3804603 100644
--- a/demos/customprovider-jdk9/src/main/jdk9/module-info.java
+++ b/demos/customprovider-jdk9/src/main/jdk9/module-info.java
@@ -11,5 +11,5 @@
 module org.glassfish.java.json.demos.customprovider {
     requires transitive java.json;
     exports org.glassfish.json.customprovider;
-    provides javax.json.spi.JsonProvider with org.glassfish.json.customprovider.TestProvider;
+    provides jakarta.json.spi.JsonProvider with org.glassfish.json.customprovider.TestProvider;
 }

demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java

diff --git a/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java b/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
index d36b251..da98a60 100644
--- a/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
+++ b/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
@@ -10,8 +10,8 @@
 
 package customprovider.test;
 
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
 import org.glassfish.json.customprovider.TestGenerator;
 import org.junit.Assert;
 import org.junit.Test;

demos/facebook/pom.xml

diff --git a/demos/facebook/pom.xml b/demos/facebook/pom.xml
index bbfbf80..f45c135 100644
--- a/demos/facebook/pom.xml
+++ b/demos/facebook/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java

diff --git a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
index 4388fcb..1f7a297 100644
--- a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
+++ b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.facebook;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;

demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java

diff --git a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
index e104cb0..17f555f 100644
--- a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
+++ b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
@@ -10,9 +10,9 @@
 
 package org.glassfish.jsondemos.facebook;
 
-import javax.json.*;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.*;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 import java.io.*;
 
 /**

demos/jaxrs/pom.xml

diff --git a/demos/jaxrs/pom.xml b/demos/jaxrs/pom.xml
index f99e0f3..16ff052 100644
--- a/demos/jaxrs/pom.xml
+++ b/demos/jaxrs/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java
index 30b057d..0489730 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java
@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java
index 0446382..5f441c2 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java
@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGenerator;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 import java.util.HashMap;

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
index 8be73d2..58de870 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
@@ -10,8 +10,8 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java
index d79d2ba..69f6f56 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java
@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
index 886be9a..731501a 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
@@ -10,9 +10,9 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.Json;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java

diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java
index 2194d70..7415ebc 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java
@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jaxrs;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 

demos/jsonpointer/pom.xml

diff --git a/demos/jsonpointer/pom.xml b/demos/jsonpointer/pom.xml
index 28b8eff..d5abd6f 100644
--- a/demos/jsonpointer/pom.xml
+++ b/demos/jsonpointer/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java

diff --git a/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java b/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
index 781a6c7..5a8c067 100644
--- a/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
+++ b/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.jsonpointer;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.*;
 
 /**

demos/pom.xml

diff --git a/demos/pom.xml b/demos/pom.xml
index 1c281f5..364d8fc 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

demos/servlet/pom.xml

diff --git a/demos/servlet/pom.xml b/demos/servlet/pom.xml
index 5271005..095ae3d 100644
--- a/demos/servlet/pom.xml
+++ b/demos/servlet/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java

diff --git a/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java b/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
index 70d8bbc..0dc077d 100644
--- a/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
+++ b/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
@@ -10,7 +10,7 @@
 
 package org.glassfish.jsondemos.servlet;
 
-import javax.json.*;
+import jakarta.json.*;
 import javax.servlet.*;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.*;

demos/twitter/pom.xml

diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index cfd5b31..0891c96 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>demos</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java

diff --git a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
index 87b6d3f..5b61e9a 100644
--- a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
+++ b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
@@ -12,7 +12,7 @@
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import javax.json.*;
+import jakarta.json.*;
 import javax.xml.bind.DatatypeConverter;
 import java.io.*;
 import java.net.HttpURLConnection;

demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java

diff --git a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
index ba16f54..c71ef46 100644
--- a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
+++ b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
@@ -10,9 +10,9 @@
 
 package org.glassfish.jsondemos.twitter;
 
-import javax.json.*;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.*;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 import java.io.*;
 
 /**

gf/customprovider/pom.xml

diff --git a/gf/customprovider/pom.xml b/gf/customprovider/pom.xml
index 52ff649..593ee61 100644
--- a/gf/customprovider/pom.xml
+++ b/gf/customprovider/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>providers</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java

diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
index a0295fa..cbccf00 100644
--- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
+++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
@@ -16,9 +16,9 @@
 
 package org.glassfish.json.customprovider;
 
-import javax.json.JsonException;
-import javax.json.JsonValue;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.JsonException;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerator;
 import java.io.IOException;
 import java.io.Writer;
 import java.math.BigDecimal;

gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java

diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java
index 0d810f5..3015d1b 100644
--- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java
+++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java
@@ -16,12 +16,12 @@
 
 package org.glassfish.json.customprovider;
 
-import javax.json.*;
-import javax.json.spi.JsonProvider;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
+import jakarta.json.*;
+import jakarta.json.spi.JsonProvider;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;

gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java

diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java
index ef7523b..92aa0f3 100644
--- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java
+++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java
@@ -20,8 +20,8 @@
 import javax.servlet.http.*;
 import javax.servlet.*;
 import java.io.IOException;
-import javax.json.*;
-import javax.json.stream.*;
+import jakarta.json.*;
+import jakarta.json.stream.*;
 import java.io.*;
 
 /**

gf/customprovider/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider

diff --git a/gf/customprovider/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/gf/customprovider/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
similarity index 100%
rename from gf/customprovider/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
rename to gf/customprovider/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider

gf/defaultprovider/pom.xml

diff --git a/gf/defaultprovider/pom.xml b/gf/defaultprovider/pom.xml
index 83cf08e..412f2cd 100644
--- a/gf/defaultprovider/pom.xml
+++ b/gf/defaultprovider/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jsonp</groupId>
         <artifactId>providers</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java

diff --git a/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java b/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java
index 01001cf..782521c 100644
--- a/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java
+++ b/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java
@@ -20,8 +20,8 @@
 import javax.servlet.http.*;
 import javax.servlet.*;
 import java.io.IOException;
-import javax.json.*;
-import javax.json.stream.*;
+import jakarta.json.*;
+import jakarta.json.stream.*;
 import java.io.*;
 
 /**

gf/pom.xml

diff --git a/gf/pom.xml b/gf/pom.xml
index 5d3af36..7891870 100644
--- a/gf/pom.xml
+++ b/gf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

impl/pom.xml

diff --git a/impl/pom.xml b/impl/pom.xml
index 0ca99cb..891e1e3 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.glassfish</groupId>
     <artifactId>jakarta.json</artifactId>
     <packaging>bundle</packaging>
-    <version>1.2-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>JSON-P Default Provider</name>
     <description>Default provider for Jakarta JSON Processing</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java b/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java
index 7040d70..b0c3085 100644
--- a/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonArrayBuilderImpl.java
@@ -18,7 +18,7 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;

impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
index ad1967e..482c8e0 100644
--- a/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
@@ -19,11 +19,11 @@
 import java.util.Collection;
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonObject;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObjectBuilder;
 import java.util.Collections;
 import java.util.Map;
 

impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
index c1baad8..fdff105 100644
--- a/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;

impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java b/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
index 05abf94..a06a65e 100644
--- a/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
@@ -18,9 +18,9 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
-import javax.json.stream.JsonGenerationException;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.*;
+import jakarta.json.stream.JsonGenerationException;
+import jakarta.json.stream.JsonGenerator;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;

impl/src/main/java/org/glassfish/json/JsonLocationImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java b/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
index 048c286..e488a49 100644
--- a/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.stream.JsonLocation;
+import jakarta.json.stream.JsonLocation;
 
 /**
  * @author Jitendra Kotamraju

impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java b/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
index bd9fdd9..9d9df6e 100644
--- a/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
@@ -16,11 +16,11 @@
 
 package org.glassfish.json;
 
-import javax.json.Json;
-import javax.json.JsonMergePatch;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonMergePatch;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
 
 /**
  * This class is an implementation of a JSON Merge Patch as specified in

impl/src/main/java/org/glassfish/json/JsonMessages.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonMessages.java b/impl/src/main/java/org/glassfish/json/JsonMessages.java
index b2afca9..482198d 100644
--- a/impl/src/main/java/org/glassfish/json/JsonMessages.java
+++ b/impl/src/main/java/org/glassfish/json/JsonMessages.java
@@ -17,12 +17,12 @@
 package org.glassfish.json;
 
 
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
 
 /**
  * Defines string formatting method for each constant in the resource file

impl/src/main/java/org/glassfish/json/JsonNumberImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java b/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java
index 0a9578a..6678270 100644
--- a/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonNumberImpl.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonNumber;
+import jakarta.json.JsonNumber;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 

impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java b/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java
index c1dc0e0..9d20e4a 100644
--- a/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonObjectBuilderImpl.java
@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonArrayBuilder;
-import javax.json.*;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.*;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;

impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
index 7502e63..9cc896d 100644
--- a/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
@@ -18,10 +18,10 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.stream.JsonParserFactory;
-import javax.json.stream.JsonParser;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.stream.JsonParserFactory;
+import jakarta.json.stream.JsonParser;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;

impl/src/main/java/org/glassfish/json/JsonParserImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonParserImpl.java b/impl/src/main/java/org/glassfish/json/JsonParserImpl.java
index 899cfe0..8710ee7 100644
--- a/impl/src/main/java/org/glassfish/json/JsonParserImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonParserImpl.java
@@ -31,16 +31,16 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
+import jakarta.json.stream.JsonParsingException;
 
 import org.glassfish.json.JsonTokenizer.JsonToken;
 import org.glassfish.json.api.BufferPool;

impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java b/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
index 862b01d..82ddc3b 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
@@ -16,15 +16,15 @@
 
 package org.glassfish.json;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonException;
-import javax.json.JsonPatch;
-import javax.json.JsonPatch.Operation;
-import javax.json.JsonPatchBuilder;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonException;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonPatch.Operation;
+import jakarta.json.JsonPatchBuilder;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 /**
  * A builder for constructing a JSON Patch by adding

impl/src/main/java/org/glassfish/json/JsonPatchImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java b/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java
index fa64142..fe060c9 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPatchImpl.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.json;
 
-import javax.json.*;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.*;
+import jakarta.json.JsonValue.ValueType;
 
 /**
  * This class is an immutable representation of a JSON Patch as specified in

impl/src/main/java/org/glassfish/json/JsonPointerImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java b/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
index dea5b0f..f6eba73 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
@@ -16,12 +16,12 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonPointer;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 import java.io.Serializable;
 import java.util.function.BiFunction;
 

impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java b/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java
index 51d37eb..da845b4 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java
@@ -18,7 +18,7 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGenerator;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;

impl/src/main/java/org/glassfish/json/JsonProviderImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java b/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
index 8cd623e..bbb435b 100644
--- a/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
@@ -18,12 +18,12 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
-import javax.json.spi.JsonProvider;
+import jakarta.json.*;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
+import jakarta.json.spi.JsonProvider;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;

impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
index 50baf2f..15a02bf 100644
--- a/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;

impl/src/main/java/org/glassfish/json/JsonReaderImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java b/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
index 5517382..f22749d 100644
--- a/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
@@ -21,14 +21,14 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParsingException;
 
 /**
  * JsonReader impl using parser and builders.

impl/src/main/java/org/glassfish/json/JsonStringImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonStringImpl.java b/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
index 5963fd4..d597069 100644
--- a/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonString;
+import jakarta.json.JsonString;
 
 /**
  * JsonString impl

impl/src/main/java/org/glassfish/json/JsonStructureParser.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonStructureParser.java b/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
index b3ae8e6..242eca0 100644
--- a/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
+++ b/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
@@ -16,9 +16,9 @@
 
 package org.glassfish.json;
 
-import javax.json.*;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
+import jakarta.json.*;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
 import java.math.BigDecimal;
 import java.util.ArrayDeque;
 import java.util.Deque;

impl/src/main/java/org/glassfish/json/JsonTokenizer.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonTokenizer.java b/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
index f9ea433..8ace1f4 100644
--- a/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
+++ b/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
@@ -18,15 +18,15 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonException;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.JsonException;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParsingException;
 import java.io.*;
 import java.math.BigDecimal;
 import java.util.Arrays;
 
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.stream.JsonParser.Event;
 
 /**
  * JSON Tokenizer

impl/src/main/java/org/glassfish/json/JsonUtil.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonUtil.java b/impl/src/main/java/org/glassfish/json/JsonUtil.java
index e077f12..cce2aeb 100644
--- a/impl/src/main/java/org/glassfish/json/JsonUtil.java
+++ b/impl/src/main/java/org/glassfish/json/JsonUtil.java
@@ -17,10 +17,10 @@
 package org.glassfish.json;
 
 import java.io.StringReader;
-import javax.json.Json;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParsingException;
 
 /**
  * A utility class

impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
index c59afc9..d81bc1e 100644
--- a/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
@@ -18,8 +18,8 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;

impl/src/main/java/org/glassfish/json/JsonWriterImpl.java

diff --git a/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java b/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
index e29dccb..2f9d68c 100644
--- a/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
@@ -18,7 +18,7 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;

impl/src/main/java/org/glassfish/json/MapUtil.java

diff --git a/impl/src/main/java/org/glassfish/json/MapUtil.java b/impl/src/main/java/org/glassfish/json/MapUtil.java
index a8b8854..1975973 100644
--- a/impl/src/main/java/org/glassfish/json/MapUtil.java
+++ b/impl/src/main/java/org/glassfish/json/MapUtil.java
@@ -18,9 +18,9 @@
 
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Collection;

impl/src/main/java/org/glassfish/json/NodeReference.java

diff --git a/impl/src/main/java/org/glassfish/json/NodeReference.java b/impl/src/main/java/org/glassfish/json/NodeReference.java
index 4bf126c..d5184e4 100644
--- a/impl/src/main/java/org/glassfish/json/NodeReference.java
+++ b/impl/src/main/java/org/glassfish/json/NodeReference.java
@@ -16,13 +16,13 @@
 
 package org.glassfish.json;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 /**
  * This class is a helper class for JsonPointer implementation,

impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java

diff --git a/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java b/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
index 57ec262..282991b 100644
--- a/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
+++ b/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.json;
 
-import javax.json.JsonException;
+import jakarta.json.JsonException;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;

impl/src/main/jdk9/module-info.java

diff --git a/impl/src/main/jdk9/module-info.java b/impl/src/main/jdk9/module-info.java
index 9e451a9..e0e20eb 100644
--- a/impl/src/main/jdk9/module-info.java
+++ b/impl/src/main/jdk9/module-info.java
@@ -17,5 +17,5 @@
 module org.glassfish.java.json {
     requires transitive java.json;
     exports org.glassfish.json.api;
-    provides javax.json.spi.JsonProvider with org.glassfish.json.JsonProviderImpl;
+    provides jakarta.json.spi.JsonProvider with org.glassfish.json.JsonProviderImpl;
 }

impl/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider

diff --git a/impl/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/impl/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
similarity index 100%
rename from impl/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
rename to impl/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider

jaxrs-1x/pom.xml

diff --git a/jaxrs-1x/pom.xml b/jaxrs-1x/pom.xml
index f89c952..1a8ebff 100644
--- a/jaxrs-1x/pom.xml
+++ b/jaxrs-1x/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jsonp-jaxrs-1x</artifactId>
     <packaging>bundle</packaging>
-    <version>1.2-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>Jakarta JSON Processing Media for JAX-RS 1.1</name>
     <description>JAX-RS 1.1 MessageBodyReader and MessageBodyWriter to support JsonObject/JsonArray/JsonStructure API of Jakarta JSON Processing</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java

diff --git a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java
index c551072..f6797b7 100644
--- a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java
+++ b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java
@@ -21,10 +21,10 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 
-import javax.json.Json;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonStructure;
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
+import jakarta.json.JsonStructure;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.WebApplicationException;

jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java

diff --git a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java
index 026ae09..6e7208d 100644
--- a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java
+++ b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java
@@ -23,10 +23,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.json.Json;
-import javax.json.JsonStructure;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
+import jakarta.json.Json;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
 
 import javax.annotation.PostConstruct;
 import javax.ws.rs.Produces;

jaxrs/pom.xml

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 558e8ce..c688054 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.glassfish</groupId>
     <artifactId>jsonp-jaxrs</artifactId>
     <packaging>bundle</packaging>
-    <version>1.2-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>Jakarta JSON Processing Media for Jakarta RESTful Web Services</name>
     <description>Jakarta RESTful Web Services MessageBodyReader and MessageBodyWriter to support JsonValue API of Jakarta JSON Processing</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java

diff --git a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java
index 11562b0..1381ff6 100644
--- a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java
+++ b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java
@@ -20,10 +20,10 @@
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
-import javax.json.Json;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
+import jakarta.json.JsonValue;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;

jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java

diff --git a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java
index 0cd0fd4..15be89b 100644
--- a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java
+++ b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java
@@ -23,11 +23,11 @@
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.PostConstruct;
-import javax.json.Json;
-import javax.json.JsonValue;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
+import jakarta.json.stream.JsonGenerator;
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Configuration;

pom.xml

diff --git a/pom.xml b/pom.xml
index 5c0c626..7de7281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <groupId>org.glassfish</groupId>
     <artifactId>json</artifactId>
     <packaging>pom</packaging>
-    <version>1.2-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <name>Jakarta JSON Processing</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

tests/pom.xml

diff --git a/tests/pom.xml b/tests/pom.xml
index 226c3a5..6b341d8 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>json</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java
index 17b516b..fdbfd0e 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.List;
@@ -119,7 +119,7 @@
         assertTrue(array1.hashCode() == array2.hashCode());
 
         JsonArray array3 = Json.createArrayBuilder().build(); //org.glassfish.json.JsonArrayBuilderImpl.JsonArrayImpl
-        JsonArray array4 = JsonValue.EMPTY_JSON_ARRAY; //javax.json.EmptyArray
+        JsonArray array4 = JsonValue.EMPTY_JSON_ARRAY; //jakarta.json.EmptyArray
 
         assertTrue(array3.equals(array4));
         assertTrue(array3.hashCode() == array4.hashCode()); //equal instances have same hashCode

tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java
index 0ca9655..e04a9a6 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java
@@ -17,11 +17,11 @@
 package org.glassfish.json.tests;
 
 import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 

tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java
index 3263bcf..8809574 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;

tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java
index 0885547..df255ab 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java
@@ -19,12 +19,12 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonPatchBuilder;
-import javax.json.JsonValue;
-import javax.json.stream.JsonCollectors;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPatchBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonCollectors;
 import org.glassfish.json.JsonUtil;
 
 import static org.junit.Assert.assertEquals;

tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java
index a3141ab..f047750 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java
@@ -18,13 +18,13 @@
 
 import junit.framework.TestCase;
 
-import javax.json.Json;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
-import javax.json.stream.JsonGenerationException;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerationException;
+import jakarta.json.stream.JsonGenerator;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;

tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java
index de8b8a1..bba031a 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java
@@ -18,9 +18,9 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
+import jakarta.json.*;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;

tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java
index 932c4b0..227608d 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java
@@ -19,8 +19,8 @@
 import junit.framework.TestCase;
 import org.glassfish.json.api.BufferPool;
 
-import javax.json.*;
-import javax.json.stream.*;
+import jakarta.json.*;
+import jakarta.json.stream.*;
 import java.io.*;
 import java.util.HashMap;
 import java.util.Map;

tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java
index 2ea6a0b..4fed520 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java
@@ -26,12 +26,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java
index 7a81bf3..4d76300 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java
@@ -26,12 +26,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java
index e55a357..abc3476 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.math.BigDecimal;

tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java
index c1c4b98..a1de2e4 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
+import jakarta.json.*;
 
 /**
  * @author Jitendra Kotamraju
@@ -163,7 +163,7 @@
         assertTrue(object1.hashCode() == object2.hashCode());
 
         JsonObject object3 = Json.createObjectBuilder().build(); //org.glassfish.json.JsonArrayBuilderImpl.JsonArrayImpl
-        JsonObject object4 = JsonValue.EMPTY_JSON_OBJECT; //javax.json.EmptyObject
+        JsonObject object4 = JsonValue.EMPTY_JSON_OBJECT; //jakarta.json.EmptyObject
 
         assertTrue(object3.equals(object4));
         assertTrue(object3.hashCode() == object4.hashCode()); //equal instances have same hashCode

tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java
index 8e8753b..450faa8 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java
@@ -18,9 +18,9 @@
 
 import junit.framework.TestCase;
 
-import javax.json.Json;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParserFactory;
 import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;

tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java
index c77d87b..9627f77 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java
@@ -17,8 +17,8 @@
 package org.glassfish.json.tests;
 
 import java.io.StringReader;
-import javax.json.Json;
-import javax.json.stream.JsonParser;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonParser;
 import junit.framework.TestCase;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;

tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java
index 83eb517..e7cb155 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java
@@ -23,11 +23,11 @@
 import java.io.StringReader;
 import junit.framework.TestCase;
 
-import javax.json.*;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
-import javax.json.stream.JsonParserFactory;
+import jakarta.json.*;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
+import jakarta.json.stream.JsonParserFactory;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -36,7 +36,7 @@
 import java.util.NoSuchElementException;
 import java.util.Random;
 import java.util.Scanner;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.stream.JsonParsingException;
 
 import org.glassfish.json.api.BufferPool;
 

tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java
index be724bb..3e17de5 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java
@@ -18,10 +18,10 @@
 
 import junit.framework.TestCase;
 
-import javax.json.Json;
-import javax.json.stream.JsonLocation;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonLocation;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParsingException;
 import java.io.StringReader;
 
 /**

tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java
index 6267b84..089dab9 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java
@@ -16,10 +16,10 @@
 
 package org.glassfish.json.tests;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonPatch;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonPatch;
 import org.junit.Test;
 
 /**

tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java
index d37d5bb..1607faa 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java
@@ -19,9 +19,9 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonPatchBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPatchBuilder;
 
 import org.junit.Test;
 

tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java
index cc95ec5..d799e8e 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java
@@ -26,14 +26,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonPatch;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java
index f523118..a1e3909 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.json.tests;
 
-import javax.json.JsonException;
-import javax.json.JsonPatch.Operation;
+import jakarta.json.JsonException;
+import jakarta.json.JsonPatch.Operation;
 import org.junit.Assert;
 import org.junit.Test;
 

tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java
index daeca41..dfda6e3 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java
@@ -26,14 +26,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonPatch;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java
index 41a92e6..5330320 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java
@@ -21,11 +21,11 @@
 
 import java.util.Arrays;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonPointer;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java
index cd9a8d8..de77a1a 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java
@@ -18,7 +18,7 @@
 
 import org.junit.Test;
 
-import javax.json.Json;
+import jakarta.json.Json;
 
 import static org.junit.Assert.assertEquals;
 

tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java
index bc9abdf..2fce02d 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java
@@ -21,11 +21,11 @@
 
 import java.util.Arrays;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonPointer;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java
index cc42002..5ef5b20 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java
@@ -24,12 +24,12 @@
 
 import java.util.Arrays;
 
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonPointer;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java
index 40459e4..9b79c18 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java
@@ -26,12 +26,12 @@
 import java.io.Reader;
 import java.util.Arrays;
 
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonPointer;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPointer;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
index b4f08e6..dcfaa48 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
@@ -22,8 +22,8 @@
 
 import java.util.Arrays;
 
-import javax.json.Json;
-import javax.json.JsonPointer;
+import jakarta.json.Json;
+import jakarta.json.JsonPointer;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
index 7a245fe..0e26778 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
@@ -24,13 +24,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
+import jakarta.json.JsonValue;
 
 import org.glassfish.json.api.BufferPool;
 

tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
index a845688..68b50ef 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
@@ -18,9 +18,9 @@
 
 import junit.framework.TestCase;
 
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.stream.JsonParser;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.stream.JsonParser;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;

tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java
index 6d1b164..d0aebb6 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.StringReader;
 
 /**

tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
index 5a5174d..4dcff40 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
@@ -22,9 +22,9 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Collections;
-import javax.json.JsonObject;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 import org.junit.Assert;
 import org.junit.Test;
 

tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
index e74b0ce..375d9f8 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.json.tests;
 
-import javax.json.*;
+import jakarta.json.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;

tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java b/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
index 80e3a5e..e809060 100644
--- a/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
+++ b/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import javax.json.*;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.*;
+import jakarta.json.stream.JsonGenerator;
 import java.io.StringWriter;
 import java.io.StringReader;
 

tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java b/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
index 47a97a2..cf5d561 100644
--- a/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
@@ -18,10 +18,10 @@
 
 import org.junit.Test;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonValue;
 
 import org.glassfish.json.JsonUtil;
 

tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java

diff --git a/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java b/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
index 33574d2..b1ce9e4 100644
--- a/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
@@ -18,9 +18,9 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
+import jakarta.json.*;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
 import java.io.*;
 import java.net.URL;
 

tests/src/test/resources/jsonpatch.json

diff --git a/tests/src/test/resources/jsonpatch.json b/tests/src/test/resources/jsonpatch.json
index 785c82d..4db4794 100644
--- a/tests/src/test/resources/jsonpatch.json
+++ b/tests/src/test/resources/jsonpatch.json
@@ -7,22 +7,22 @@
         {
             "op": { "op": "test", "path": "/x", "value": {} },
             "target": [ 1, 2 ],
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "test", "path": "", "value": true },
             "target": [ 1, 2 ],
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "test", "path": "/x", "value": -30.000 },
             "target": { "x": -29.020 },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "replace", "path": "", "value": false },
             "target": { "x": { "a": "b", "y": {} } },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "replace", "path": "/x/y", "value": "hello" },
@@ -42,7 +42,7 @@
         {
             "op": { "op": "replace", "path": "/x/y", "value": 42 },
             "target": { "x": {} },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "remove", "path": "/x/y" },
@@ -62,7 +62,7 @@
         {
             "op": { "op": "remove", "path": "/x/y" },
             "target": { "x": {} },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "move", "from": "/x/a", "path": "/x/b" },
@@ -77,7 +77,7 @@
         {
             "op": { "op": "move", "from": "/0", "path": "/0/x" },
             "target": [ "victim", {}, {} ],
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "move", "from": "/0", "path": "/-" },
@@ -92,17 +92,17 @@
         {
             "op": { "op": "move", "from": "/a", "path": "/a/b" },
             "target": {},
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "move", "from": "/a", "path": "/b/c" },
             "target": { "a": "b" },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "move", "from": "/x/a", "path": "/x/c" },
             "target": { "x": { "b": "helo" } },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "copy", "from": "/a", "path": "/b" },
@@ -127,37 +127,37 @@
         {
             "op": { "op": "copy", "from": "/a", "path": "/b" },
             "target": {},
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "copy", "from": "/a", "path": "/b/c" },
             "target": { "a": 1 },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "add", "path": "/a/b/c", "value": 1 },
             "target": { "a": "b" },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "add", "path": "/~1", "value": 1 },
             "target": [],
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "add", "path": "/3", "value": 1 },
             "target": [ 1, 2 ],
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "add", "path": "/-2", "value": 1 },
             "target": [ 1, 2 ],
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "add", "path": "/foo/f", "value": "bar" },
             "target": { "foo": "bar" },
-            "exception": "javax.json.JsonException"
+            "exception": "jakarta.json.JsonException"
         },
         {
             "op": { "op": "add", "path": "/a", "value": "b" },