Skip to content

Commit 9ccc20a

Browse files
lukasjm0mus
lukasj
authored and
m0mus
committed
Fixes #135: impl artifactId should be 'jakarta.json' (#136)
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 3b142ee commit 9ccc20a

File tree

11 files changed

+38
-28
lines changed

11 files changed

+38
-28
lines changed

‎api/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,11 @@
9797
<execution>
9898
<goals>
9999
<goal>set-spec-properties</goal>
100-
<goal>check-module</goal>
100+
<!-- TODO:
101+
glassfish-spec-version-maven-plugin needs to be updated
102+
in order to check 'jakarta.' prefixed values in manifest entries
103+
-->
104+
<!--<goal>check-module</goal>-->
101105
</goals>
102106
</execution>
103107
</executions>
@@ -121,6 +125,7 @@
121125
<Specification-Version>${spec.specification.version}</Specification-Version>
122126
<Export-Package>${packages.export}</Export-Package>
123127
<Bundle-Description>Java API for JSON Processing (JSON-P) ${spec_version}</Bundle-Description>
128+
<Specification-Vendor>Oracle</Specification-Vendor>
124129
</instructions>
125130
</configuration>
126131
</plugin>

‎bundles/ri/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dependency>
3737
<dependency>
3838
<groupId>org.glassfish</groupId>
39-
<artifactId>javax.json</artifactId>
39+
<artifactId>jakarta.json</artifactId>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.glassfish</groupId>
@@ -84,7 +84,7 @@
8484
<dependencies>
8585
<dependency>
8686
<groupId>org.glassfish</groupId>
87-
<artifactId>javax.json</artifactId>
87+
<artifactId>jakarta.json</artifactId>
8888
<classifier>module</classifier>
8989
<version>${project.version}</version>
9090
</dependency>

‎bundles/ri/src/main/assembly/archive-jdk8.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
<useProjectArtifact>false</useProjectArtifact>
4545
<outputDirectory>standalone</outputDirectory>
4646
<includes>
47-
<include>org.glassfish:javax.json</include>
47+
<include>org.glassfish:jakarta.json</include>
4848
</includes>
4949
<excludes>
50-
<exclude>org.glassfish:javax.json:jar:module:*</exclude>
50+
<exclude>org.glassfish:jakarta.json:jar:module:*</exclude>
5151
</excludes>
5252
</dependencySet>
5353
<dependencySet>

‎bundles/ri/src/main/assembly/archive.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
<outputDirectory>mods</outputDirectory>
3939
<includes>
4040
<include>jakarta.json:jakarta.json-api:*</include>
41-
<include>org.glassfish:javax.json:jar:module:*</include>
41+
<include>org.glassfish:jakarta.json:jar:module:*</include>
4242
</includes>
4343
</dependencySet>
4444
<dependencySet>
4545
<useProjectArtifact>false</useProjectArtifact>
4646
<outputDirectory>standalone</outputDirectory>
4747
<includes>
48-
<include>org.glassfish:javax.json</include>
48+
<include>org.glassfish:jakarta.json</include>
4949
</includes>
5050
<excludes>
51-
<exclude>org.glassfish:javax.json:jar:module:*</exclude>
51+
<exclude>org.glassfish:jakarta.json:jar:module:*</exclude>
5252
</excludes>
5353
</dependencySet>
5454
<dependencySet>

‎bundles/ri/src/main/resources/README.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
* standalone/javax.json-${project.version}.jar contains both "JSR 374 : Java API for JSON Processing 1.1" API
1+
* standalone/jakarta.json-${project.version}.jar contains both "JSR 374 : Java API for JSON Processing 1.1" API
22
and its default provider implementation. Keep it in classpath for both compiling and running your application.
33
Automatic module name is: 'java.json'
44

55
For running on JPMS, following modules are provided:
66
* mods/jakarta.json-api-${project.version}.jar - 'java.json' module containing only API classes
7-
* mods/javax.json-${project.version}-module.jar - 'org.glassfish.java.json' module containing implementation
7+
* mods/jakarta.json-${project.version}-module.jar - 'org.glassfish.java.json' module containing implementation
88

99
Integration with JAX-RS: Java API for RESTful Web Services (JAX-RS) is provided through
1010
* jaxrs/jsonp-jaxrs-${project.version}.jar
@@ -18,7 +18,7 @@ IMPORTANT NOTE: module names are not yet final and may change in the future rele
1818
for standalone reference implementation which includes APIs and implementation classes:
1919
<dependency>
2020
<groupId>org.glassfish</groupId>
21-
<artifactId>javax.json</artifactId>
21+
<artifactId>jakarta.json</artifactId>
2222
<version>${project.version}</version>
2323
</dependency>
2424

@@ -32,7 +32,7 @@ for APIs:
3232
for implementation only:
3333
<dependency>
3434
<groupId>org.glassfish</groupId>
35-
<artifactId>javax.json</artifactId>
35+
<artifactId>jakarta.json</artifactId>
3636
<classifier>module</classifier>
3737
<version>${project.version}</version>
3838
</dependency>

‎demos/facebook/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</dependency>
4343
<dependency>
4444
<groupId>org.glassfish</groupId>
45-
<artifactId>javax.json</artifactId>
45+
<artifactId>jakarta.json</artifactId>
4646
<scope>runtime</scope>
4747
</dependency>
4848
</dependencies>
@@ -80,7 +80,7 @@
8080
</dependency>
8181
<dependency>
8282
<groupId>org.glassfish</groupId>
83-
<artifactId>javax.json</artifactId>
83+
<artifactId>jakarta.json</artifactId>
8484
<classifier>module</classifier>
8585
<scope>compile</scope>
8686
</dependency>
@@ -105,7 +105,7 @@
105105
<goal>copy-dependencies</goal>
106106
</goals>
107107
<configuration>
108-
<includeArtifactIds>javax.json</includeArtifactIds>
108+
<includeArtifactIds>jakarta.json</includeArtifactIds>
109109
</configuration>
110110
</execution>
111111
<execution>

‎demos/jsonpointer/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</dependency>
4343
<dependency>
4444
<groupId>org.glassfish</groupId>
45-
<artifactId>javax.json</artifactId>
45+
<artifactId>jakarta.json</artifactId>
4646
<scope>runtime</scope>
4747
</dependency>
4848
</dependencies>
@@ -80,7 +80,7 @@
8080
</dependency>
8181
<dependency>
8282
<groupId>org.glassfish</groupId>
83-
<artifactId>javax.json</artifactId>
83+
<artifactId>jakarta.json</artifactId>
8484
<classifier>module</classifier>
8585
<scope>compile</scope>
8686
</dependency>
@@ -105,7 +105,7 @@
105105
<goal>copy-dependencies</goal>
106106
</goals>
107107
<configuration>
108-
<includeArtifactIds>javax.json</includeArtifactIds>
108+
<includeArtifactIds>jakarta.json</includeArtifactIds>
109109
</configuration>
110110
</execution>
111111
<execution>

‎demos/twitter/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</dependency>
6969
<dependency>
7070
<groupId>org.glassfish</groupId>
71-
<artifactId>javax.json</artifactId>
71+
<artifactId>jakarta.json</artifactId>
7272
<classifier>module</classifier>
7373
<scope>compile</scope>
7474
</dependency>
@@ -108,7 +108,7 @@
108108
<goal>copy-dependencies</goal>
109109
</goals>
110110
<configuration>
111-
<includeArtifactIds>javax.json</includeArtifactIds>
111+
<includeArtifactIds>jakarta.json</includeArtifactIds>
112112
</configuration>
113113
</execution>
114114
<execution>

‎impl/pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</parent>
2929

3030
<groupId>org.glassfish</groupId>
31-
<artifactId>javax.json</artifactId>
31+
<artifactId>jakarta.json</artifactId>
3232
<packaging>bundle</packaging>
3333
<version>1.2-SNAPSHOT</version>
3434
<name>JSR 374 (JSON Processing) Default Provider</name>
@@ -62,7 +62,11 @@
6262
<execution>
6363
<goals>
6464
<goal>set-spec-properties</goal>
65-
<goal>check-module</goal>
65+
<!-- TODO:
66+
glassfish-spec-version-maven-plugin needs to be updated
67+
in order to check 'jakarta.' prefixed values in manifest entries
68+
-->
69+
<!--<goal>check-module</goal>-->
6670
</goals>
6771
</execution>
6872
</executions>
@@ -182,6 +186,7 @@
182186
<Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
183187
<Extension-Name>${spec.extension.name}</Extension-Name>
184188
<Implementation-Version>${spec.implementation.version}</Implementation-Version>
189+
<Specification-Vendor>Oracle</Specification-Vendor>
185190
<Specification-Version>${spec.specification.version}</Specification-Version>
186191
<Export-Package>${packages.export}</Export-Package>
187192
<Private-Package>${packages.private}</Private-Package>

‎pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
</developers>
7171

7272
<properties>
73-
<api_package>javax.json</api_package>
73+
<api_package>jakarta.json</api_package>
7474
<impl_namespace>org.glassfish</impl_namespace>
7575
<spec_version>1.1</spec_version>
7676
<new_spec_version>1.2</new_spec_version>
77-
<new_spec_impl_version>1.1.3</new_spec_impl_version>
77+
<new_spec_impl_version>1.2</new_spec_impl_version>
7878
<impl_version>1.1.3</impl_version>
79-
<new_impl_version>1.2</new_impl_version>
79+
<new_impl_version>1.2.0</new_impl_version>
8080
<non.final>false</non.final>
8181
<legal.doc.source>${maven.multiModuleProjectDirectory}</legal.doc.source>
8282
</properties>
@@ -302,12 +302,12 @@
302302
</dependency>
303303
<dependency>
304304
<groupId>org.glassfish</groupId>
305-
<artifactId>javax.json</artifactId>
305+
<artifactId>jakarta.json</artifactId>
306306
<version>${project.version}</version>
307307
</dependency>
308308
<dependency>
309309
<groupId>org.glassfish</groupId>
310-
<artifactId>javax.json</artifactId>
310+
<artifactId>jakarta.json</artifactId>
311311
<classifier>module</classifier>
312312
<version>${project.version}</version>
313313
</dependency>

0 commit comments

Comments
 (0)