[EE4J_8] Fixes #135: impl artifactId should be 'jakarta.json' (#137) Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a6f89c2 --- /dev/null +++ b/.gitignore
@@ -0,0 +1 @@ +/target/ \ No newline at end of file
diff --git a/api/pom.xml b/api/pom.xml index d325732..63162a2 100644 --- a/api/pom.xml +++ b/api/pom.xml
@@ -97,7 +97,11 @@ <execution> <goals> <goal>set-spec-properties</goal> - <goal>check-module</goal> + <!-- TODO: + glassfish-spec-version-maven-plugin needs to be updated + in order to check 'jakarta.' prefixed values in manifest entries + --> + <!--<goal>check-module</goal>--> </goals> </execution> </executions> @@ -121,6 +125,7 @@ <Specification-Version>${spec.specification.version}</Specification-Version> <Export-Package>${packages.export}</Export-Package> <Bundle-Description>Java API for JSON Processing (JSON-P) ${spec_version}</Bundle-Description> + <Specification-Vendor>Oracle</Specification-Vendor> </instructions> </configuration> </plugin>
diff --git a/bundles/ri/pom.xml b/bundles/ri/pom.xml index 0ee2bfa..d8978b1 100755 --- a/bundles/ri/pom.xml +++ b/bundles/ri/pom.xml
@@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> </dependency> <dependency> <groupId>org.glassfish</groupId> @@ -84,7 +84,7 @@ <dependencies> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <classifier>module</classifier> <version>${project.version}</version> </dependency>
diff --git a/bundles/ri/src/main/assembly/archive-jdk8.xml b/bundles/ri/src/main/assembly/archive-jdk8.xml index ddfd3e6..55b07e6 100644 --- a/bundles/ri/src/main/assembly/archive-jdk8.xml +++ b/bundles/ri/src/main/assembly/archive-jdk8.xml
@@ -44,10 +44,10 @@ <useProjectArtifact>false</useProjectArtifact> <outputDirectory>standalone</outputDirectory> <includes> - <include>org.glassfish:javax.json</include> + <include>org.glassfish:jakarta.json</include> </includes> <excludes> - <exclude>org.glassfish:javax.json:jar:module:*</exclude> + <exclude>org.glassfish:jakarta.json:jar:module:*</exclude> </excludes> </dependencySet> <dependencySet>
diff --git a/bundles/ri/src/main/assembly/archive.xml b/bundles/ri/src/main/assembly/archive.xml index 914329a..1c9e053 100755 --- a/bundles/ri/src/main/assembly/archive.xml +++ b/bundles/ri/src/main/assembly/archive.xml
@@ -38,17 +38,17 @@ <outputDirectory>mods</outputDirectory> <includes> <include>jakarta.json:jakarta.json-api:*</include> - <include>org.glassfish:javax.json:jar:module:*</include> + <include>org.glassfish:jakarta.json:jar:module:*</include> </includes> </dependencySet> <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>standalone</outputDirectory> <includes> - <include>org.glassfish:javax.json</include> + <include>org.glassfish:jakarta.json</include> </includes> <excludes> - <exclude>org.glassfish:javax.json:jar:module:*</exclude> + <exclude>org.glassfish:jakarta.json:jar:module:*</exclude> </excludes> </dependencySet> <dependencySet>
diff --git a/bundles/ri/src/main/resources/README.txt b/bundles/ri/src/main/resources/README.txt index c5cfd96..63fa361 100644 --- a/bundles/ri/src/main/resources/README.txt +++ b/bundles/ri/src/main/resources/README.txt
@@ -1,10 +1,10 @@ -* standalone/javax.json-${project.version}.jar contains both "JSR 374 : Java API for JSON Processing 1.1" API +* standalone/jakarta.json-${project.version}.jar contains both "JSR 374 : Java API for JSON Processing 1.1" API and its default provider implementation. Keep it in classpath for both compiling and running your application. Automatic module name is: 'java.json' For running on JPMS, following modules are provided: * mods/jakarta.json-api-${project.version}.jar - 'java.json' module containing only API classes -* mods/javax.json-${project.version}-module.jar - 'org.glassfish.java.json' module containing implementation +* mods/jakarta.json-${project.version}-module.jar - 'org.glassfish.java.json' module containing implementation Integration with JAX-RS: Java API for RESTful Web Services (JAX-RS) is provided through * jaxrs/jsonp-jaxrs-${project.version}.jar @@ -18,7 +18,7 @@ for standalone reference implementation which includes APIs and implementation classes: <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <version>${project.version}</version> </dependency> @@ -32,7 +32,7 @@ for implementation only: <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <classifier>module</classifier> <version>${project.version}</version> </dependency>
diff --git a/demos/facebook/pom.xml b/demos/facebook/pom.xml index 7d243f5..b9c1eee 100644 --- a/demos/facebook/pom.xml +++ b/demos/facebook/pom.xml
@@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <scope>runtime</scope> </dependency> </dependencies> @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <classifier>module</classifier> <scope>compile</scope> </dependency> @@ -105,7 +105,7 @@ <goal>copy-dependencies</goal> </goals> <configuration> - <includeArtifactIds>javax.json</includeArtifactIds> + <includeArtifactIds>jakarta.json</includeArtifactIds> </configuration> </execution> <execution>
diff --git a/demos/jsonpointer/pom.xml b/demos/jsonpointer/pom.xml index 47ded93..fa349c2 100644 --- a/demos/jsonpointer/pom.xml +++ b/demos/jsonpointer/pom.xml
@@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <scope>runtime</scope> </dependency> </dependencies> @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <classifier>module</classifier> <scope>compile</scope> </dependency> @@ -105,7 +105,7 @@ <goal>copy-dependencies</goal> </goals> <configuration> - <includeArtifactIds>javax.json</includeArtifactIds> + <includeArtifactIds>jakarta.json</includeArtifactIds> </configuration> </execution> <execution>
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml index 9bce432..a55fdf8 100644 --- a/demos/twitter/pom.xml +++ b/demos/twitter/pom.xml
@@ -68,7 +68,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <classifier>module</classifier> <scope>compile</scope> </dependency> @@ -108,7 +108,7 @@ <goal>copy-dependencies</goal> </goals> <configuration> - <includeArtifactIds>javax.json</includeArtifactIds> + <includeArtifactIds>jakarta.json</includeArtifactIds> </configuration> </execution> <execution>
diff --git a/impl/pom.xml b/impl/pom.xml index 7d8bea0..ed0a89a 100644 --- a/impl/pom.xml +++ b/impl/pom.xml
@@ -28,7 +28,7 @@ </parent> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <packaging>bundle</packaging> <version>1.1.5-SNAPSHOT</version> <name>JSR 374 (JSON Processing) Default Provider</name> @@ -62,7 +62,11 @@ <execution> <goals> <goal>set-spec-properties</goal> - <goal>check-module</goal> + <!-- TODO: + glassfish-spec-version-maven-plugin needs to be updated + in order to check 'jakarta.' prefixed values in manifest entries + --> + <!--<goal>check-module</goal>--> </goals> </execution> </executions> @@ -182,6 +186,7 @@ <Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName> <Extension-Name>${spec.extension.name}</Extension-Name> <Implementation-Version>${spec.implementation.version}</Implementation-Version> + <Specification-Vendor>Oracle</Specification-Vendor> <Specification-Version>${spec.specification.version}</Specification-Version> <Export-Package>${packages.export}</Export-Package> <Private-Package>${packages.private}</Private-Package>
diff --git a/pom.xml b/pom.xml index 71e5254..1998ca6 100644 --- a/pom.xml +++ b/pom.xml
@@ -70,7 +70,7 @@ </developers> <properties> - <api_package>javax.json</api_package> + <api_package>jakarta.json</api_package> <impl_namespace>org.glassfish</impl_namespace> <spec_version>1.1</spec_version> <new_spec_version>1.2</new_spec_version> @@ -297,12 +297,12 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <classifier>module</classifier> <version>${project.version}</version> </dependency>
diff --git a/tests/pom.xml b/tests/pom.xml index c5c9422..1740e0a 100644 --- a/tests/pom.xml +++ b/tests/pom.xml
@@ -38,7 +38,7 @@ </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> + <artifactId>jakarta.json</artifactId> <scope>test</scope> </dependency> <dependency>