Merge pull request #22943 from jbescos/jakarta_jsonp
Update jsonp version to use jakarta package
diff --git a/appserver/appclient/client/acc-standalone/pom.xml b/appserver/appclient/client/acc-standalone/pom.xml
index 0d091c2..1ffb356 100755
--- a/appserver/appclient/client/acc-standalone/pom.xml
+++ b/appserver/appclient/client/acc-standalone/pom.xml
@@ -109,7 +109,7 @@
<fileSeparator>/</fileSeparator>
<prefix>../modules</prefix>
<stripVersion>true</stripVersion>
- <excludeArtifactIds>javax.json</excludeArtifactIds>
+ <excludeArtifactIds>jakarta.json</excludeArtifactIds>
<excludeArtifactIds>javax.inject</excludeArtifactIds>
</configuration>
</execution>
diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index 41f32c0..f540319 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -140,7 +140,7 @@
javax.imageio.stream; \
javax.interceptor; \
javax.jms; \
-javax.json; \
+jakarta.json; \
javax.json.bind; \
javax.json.bind.adapter; \
javax.json.bind.annotation; \
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index 59611d4..0308e02 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -64,7 +64,7 @@
<fileSeparator>/</fileSeparator>
<prefix>../../modules</prefix>
<stripVersion>true</stripVersion>
- <excludeArtifactIds>jsftemplating, javax.json, jakarta.json-api</excludeArtifactIds>
+ <excludeArtifactIds>jsftemplating, jakarta.json, jakarta.json-api</excludeArtifactIds>
</configuration>
</execution>
</executions>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 4f984d0..cdefd80 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -94,8 +94,8 @@
<wsdl4j.version>1.5.0</wsdl4j.version>
<websocket-api.version>1.1.1</websocket-api.version>
<tyrus.version>1.15</tyrus.version>
- <jsonp-api.version>1.1.6</jsonp-api.version>
- <jsonp-ri.version>1.1.6</jsonp-ri.version>
+ <jsonp-api.version>2.0.0-RC2</jsonp-api.version>
+ <jsonp-ri.version>2.0.0-RC2</jsonp-ri.version>
<jsonp-jaxrs.version>1.1.6</jsonp-jaxrs.version>
<json.bind-api.version>1.0.2</json.bind-api.version>
@@ -191,7 +191,7 @@
<jarType>impl</jarType>
<specVersion>1.1</specVersion>
<implVersion>${jsonp-ri.version}</implVersion>
- <apiPackage>javax.json</apiPackage>
+ <apiPackage>jakarta.json</apiPackage>
<implNamespace>org.glassfish</implNamespace>
</spec>
<spec>
