change module name of the implementation to org.glassfish.jakarta.json Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/bundles/ri/src/main/resources/README.txt b/bundles/ri/src/main/resources/README.txt index c0cd490..566c3ae 100644 --- a/bundles/ri/src/main/resources/README.txt +++ b/bundles/ri/src/main/resources/README.txt
@@ -4,7 +4,7 @@ For running on JPMS, following modules are provided: * mods/jakarta.json-api-${project.version}.jar - 'java.json' module containing only API classes -* mods/jakarta.json-${project.version}-module.jar - 'org.glassfish.java.json' module containing implementation +* mods/jakarta.json-${project.version}-module.jar - 'org.glassfish.jakarta.json' module containing implementation Integration with Jakarta RESTful Web Services: * jaxrs/jsonp-jaxrs-${project.version}.jar
diff --git a/demos/customprovider-jdk9/pom.xml b/demos/customprovider-jdk9/pom.xml index 501a3bf..8fdcee4 100644 --- a/demos/customprovider-jdk9/pom.xml +++ b/demos/customprovider-jdk9/pom.xml
@@ -63,11 +63,11 @@ <configuration> <argLine> --module-path ${project.build.directory}/classes:${mod.dir}:${project.build.directory}/test-classes - --add-modules org.glassfish.java.json.demos.customprovider + --add-modules org.glassfish.jakarta.json.demos.customprovider </argLine> <!-- - - -add-modules org.glassfish.java.json.demos.customprovider,org.glassfish.java.json,junit - - -patch-module org.glassfish.java.json.demos.customprovider=${project.build.directory}/test-classes + - -add-modules org.glassfish.jakarta.json.demos.customprovider,org.glassfish.jakarta.json,junit + - -patch-module org.glassfish.jakarta.json.demos.customprovider=${project.build.directory}/test-classes --> </configuration> </plugin>
diff --git a/demos/customprovider-jdk9/src/main/jdk9/module-info.java b/demos/customprovider-jdk9/src/main/jdk9/module-info.java index 626b863..dfdd58a 100644 --- a/demos/customprovider-jdk9/src/main/jdk9/module-info.java +++ b/demos/customprovider-jdk9/src/main/jdk9/module-info.java
@@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -module org.glassfish.java.json.demos.customprovider { +module org.glassfish.jakarta.json.demos.customprovider { requires transitive jakarta.json; exports org.glassfish.json.customprovider; provides jakarta.json.spi.JsonProvider with org.glassfish.json.customprovider.TestProvider;
diff --git a/demos/facebook/pom.xml b/demos/facebook/pom.xml index 228a91c..6ee6f53 100644 --- a/demos/facebook/pom.xml +++ b/demos/facebook/pom.xml
@@ -133,11 +133,11 @@ <executable>java</executable> <arguments> <argument>--add-modules</argument> - <argument>org.glassfish.java.json</argument> + <argument>org.glassfish.jakarta.json</argument> <argument>--module-path</argument> <argument>${modules.directory}</argument> <argument>-m</argument> - <argument>org.glassfish.java.json.demos.facebook/${main.class}</argument> + <argument>org.glassfish.jakarta.json.demos.facebook/${main.class}</argument> </arguments> </configuration> <executions>
diff --git a/demos/facebook/src/main/jdk9/module-info.java b/demos/facebook/src/main/jdk9/module-info.java index 433f5cd..aa91fb0 100644 --- a/demos/facebook/src/main/jdk9/module-info.java +++ b/demos/facebook/src/main/jdk9/module-info.java
@@ -8,6 +8,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -module org.glassfish.java.json.demos.facebook { - requires org.glassfish.java.json; +module org.glassfish.jakarta.json.demos.facebook { + requires org.glassfish.jakarta.json; }
diff --git a/demos/jsonpointer/pom.xml b/demos/jsonpointer/pom.xml index 0252be0..61bc2ff 100644 --- a/demos/jsonpointer/pom.xml +++ b/demos/jsonpointer/pom.xml
@@ -133,11 +133,11 @@ <executable>java</executable> <arguments> <argument>--add-modules</argument> - <argument>org.glassfish.java.json</argument> + <argument>org.glassfish.jakarta.json</argument> <argument>--module-path</argument> <argument>${modules.directory}</argument> <argument>-m</argument> - <argument>org.glassfish.java.json.demos.jsonpointer/${main.class}</argument> + <argument>org.glassfish.jakarta.json.demos.jsonpointer/${main.class}</argument> </arguments> </configuration> <executions>
diff --git a/demos/jsonpointer/src/main/jdk9/module-info.java b/demos/jsonpointer/src/main/jdk9/module-info.java index 24218f7..f7b2ac8 100644 --- a/demos/jsonpointer/src/main/jdk9/module-info.java +++ b/demos/jsonpointer/src/main/jdk9/module-info.java
@@ -8,6 +8,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -module org.glassfish.java.json.demos.jsonpointer { - requires org.glassfish.java.json; +module org.glassfish.jakarta.json.demos.jsonpointer { + requires org.glassfish.jakarta.json; }
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml index 1275492..135958e 100644 --- a/demos/twitter/pom.xml +++ b/demos/twitter/pom.xml
@@ -141,11 +141,11 @@ <executable>java</executable> <arguments> <argument>--add-modules</argument> - <argument>java.xml.bind,org.glassfish.java.json</argument> + <argument>java.xml.bind,org.glassfish.jakarta.json</argument> <argument>--module-path</argument> <argument>${modules.directory}</argument> <argument>-m</argument> - <argument>org.glassfish.java.json.demos.twitter/${main.class}</argument> + <argument>org.glassfish.jakarta.json.demos.twitter/${main.class}</argument> </arguments> </configuration> <executions>
diff --git a/demos/twitter/src/main/jdk9/module-info.java b/demos/twitter/src/main/jdk9/module-info.java index b19f64d..3e99213 100644 --- a/demos/twitter/src/main/jdk9/module-info.java +++ b/demos/twitter/src/main/jdk9/module-info.java
@@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -module org.glassfish.java.json.demos.twitter { +module org.glassfish.jakarta.json.demos.twitter { requires jakarta.xml.bind; - requires org.glassfish.java.json; + requires org.glassfish.jakarta.json; }
diff --git a/impl/src/main/java/module-info.java b/impl/src/main/java/module-info.java index 5528b96..53be057 100644 --- a/impl/src/main/java/module-info.java +++ b/impl/src/main/java/module-info.java
@@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -module org.glassfish.java.json { +module org.glassfish.jakarta.json { requires transitive jakarta.json; exports org.glassfish.json.api; provides jakarta.json.spi.JsonProvider with org.glassfish.json.JsonProviderImpl;