From f7ead75b1a3262fc318cd0d38f3a9cd5352d9ea1 Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Mon, 8 Oct 2018 22:59:07 +0200 Subject: [PATCH 1/6] JAX-RS 2.1.2 (Jakarta Maven Coordinates) Signed-off-by: Markus KARG --- bundles/jaxrs-ri/pom.xml | 4 ++-- bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml | 4 ++-- .../jaxrs-ri/src/main/assembly/assembly-src-licensee.xml | 2 +- bundles/jaxrs-ri/src/main/assembly/assembly-src.xml | 2 +- .../jaxrs-ri/src/main/assembly/common-dependencies.xml | 2 +- connectors/pom.xml | 4 ++-- containers/pom.xml | 4 ++-- core-client/pom.xml | 4 ++-- core-common/pom.xml | 4 ++-- core-server/pom.xml | 4 ++-- .../server/internal/scanning/JarFileScannerTest.java | 4 ++-- .../server/internal/scanning/PackageNamesScannerTest.java | 4 ++-- .../internal/scanning/VFSSchemeResourceFinderTest.java | 4 ++-- docs/src/main/docbook/dependencies.xml | 4 ++-- examples/cdi-webapp/pom.xml | 8 ++++---- examples/etc/gf-project-src-pom.xsl | 8 ++++---- examples/etc/wls-project-src-pom.xsl | 8 ++++---- examples/etc/wls1213-project-src-pom.xsl | 8 ++++---- .../examples/extendedwadl/ExtendedWadlWebappOsgiTest.java | 2 +- examples/managed-beans-webapp/pom.xml | 4 ++-- examples/osgi-helloworld-webapp/additional-bundle/pom.xml | 4 ++-- .../alternate-version-bundle/pom.xml | 4 ++-- .../examples/helloworld/test/AbstractWebAppTest.java | 2 +- examples/osgi-helloworld-webapp/lib-bundle/pom.xml | 4 ++-- examples/osgi-helloworld-webapp/war-bundle/pom.xml | 4 ++-- .../osgihttpservice/test/AbstractHttpServiceTest.java | 2 +- examples/server-async-standalone/client/pom.xml | 4 ++-- ext/pom.xml | 4 ++-- ext/servlet-portability/pom.xml | 4 ++-- incubator/html-json/pom.xml | 4 ++-- incubator/kryo/pom.xml | 4 ++-- pom.xml | 6 +++--- security/oauth1-client/pom.xml | 4 ++-- security/oauth2-client/pom.xml | 4 ++-- tests/integration/cdi-beanvalidation-webapp/pom.xml | 4 ++-- tests/integration/cdi-ejb-test-webapp/pom.xml | 4 ++-- .../cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml | 4 ++-- tests/integration/cdi-multimodule/lib/pom.xml | 4 ++-- tests/integration/cdi-multimodule/war1/pom.xml | 4 ++-- tests/integration/cdi-multimodule/war2/pom.xml | 4 ++-- tests/integration/cdi-multipart-webapp/pom.xml | 4 ++-- tests/integration/cdi-test-webapp/pom.xml | 4 ++-- .../pom.xml | 4 ++-- tests/integration/client-connector-provider/pom.xml | 4 ++-- tests/integration/ejb-multimodule-reload/lib/pom.xml | 4 ++-- tests/integration/ejb-multimodule-reload/war1/pom.xml | 4 ++-- tests/integration/ejb-multimodule-reload/war2/pom.xml | 4 ++-- tests/integration/ejb-multimodule/lib/pom.xml | 4 ++-- tests/integration/ejb-multimodule/war/pom.xml | 4 ++-- tests/integration/ejb-test-webapp/pom.xml | 4 ++-- tests/integration/j-376/pom.xml | 4 ++-- tests/integration/j-59/lib/pom.xml | 4 ++-- tests/integration/j-59/war/pom.xml | 4 ++-- tests/integration/jersey-2137/pom.xml | 4 ++-- tests/integration/jersey-2154/pom.xml | 4 ++-- tests/integration/spring4/pom.xml | 4 ++-- .../java/org/glassfish/jersey/osgi/test/util/Helper.java | 2 +- tests/performance/test-cases/filter-dynamic/pom.xml | 4 ++-- tests/performance/test-cases/filter-global/pom.xml | 4 ++-- tests/performance/test-cases/filter-name/pom.xml | 4 ++-- tests/performance/test-cases/interceptor-dynamic/pom.xml | 4 ++-- tests/performance/test-cases/interceptor-global/pom.xml | 4 ++-- tests/performance/test-cases/interceptor-name/pom.xml | 4 ++-- tests/performance/test-cases/mbw-custom-provider/pom.xml | 4 ++-- tests/performance/test-cases/mbw-json-jackson/pom.xml | 4 ++-- tests/performance/test-cases/mbw-text-plain/pom.xml | 4 ++-- tests/performance/test-cases/mbw-xml-jaxb/pom.xml | 4 ++-- tests/performance/test-cases/param-srl/pom.xml | 4 ++-- tests/performance/test-cases/proxy-injection/pom.xml | 4 ++-- 69 files changed, 140 insertions(+), 140 deletions(-) diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml index 7fe3a16914..b63ef4d640 100644 --- a/bundles/jaxrs-ri/pom.xml +++ b/bundles/jaxrs-ri/pom.xml @@ -44,8 +44,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api ${jaxrs.api.impl.version} sources true diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml index 6eced85403..6f2c1e9375 100644 --- a/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml +++ b/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml @@ -41,10 +41,10 @@ 0755 0644 - javax.ws.rs:* + jakarta.ws.rs:* - javax.ws.rs:*:*:sources:* + jakarta.ws.rs:*:*:sources:* diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml index 635b53c582..a7ec56e553 100644 --- a/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml +++ b/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml @@ -48,7 +48,7 @@ - javax.ws.rs:*:*:sources:* + jakarta.ws.rs:*:*:sources:* org.glassfish.jersey.*:*:*:sources:* diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml index 1cd0035f48..a951e5b104 100644 --- a/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml +++ b/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml @@ -48,7 +48,7 @@ - javax.ws.rs:*:*:sources:* + jakarta.ws.rs:*:*:sources:* org.glassfish.jersey.*:*:*:sources:* diff --git a/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml b/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml index 9dd785534d..2c925641fd 100644 --- a/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml +++ b/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml @@ -27,7 +27,7 @@ 0755 0644 - javax.ws.rs:* + jakarta.ws.rs:* org.glassfish.jersey.*:* javax.enterprise:cdi-api:jar:* diff --git a/connectors/pom.xml b/connectors/pom.xml index f48fcb70ff..23156f68f3 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -54,8 +54,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/containers/pom.xml b/containers/pom.xml index 2246a145a8..de0bde1bb8 100644 --- a/containers/pom.xml +++ b/containers/pom.xml @@ -59,8 +59,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/core-client/pom.xml b/core-client/pom.xml index 8db5eab342..798231eba6 100644 --- a/core-client/pom.xml +++ b/core-client/pom.xml @@ -94,8 +94,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/core-common/pom.xml b/core-common/pom.xml index 37de72af06..5796421e94 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -167,8 +167,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api javax.annotation diff --git a/core-server/pom.xml b/core-server/pom.xml index 56294c5a5a..4d6dae03f7 100644 --- a/core-server/pom.xml +++ b/core-server/pom.xml @@ -167,8 +167,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java index 8bf25f8c78..8994d11978 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java @@ -54,14 +54,14 @@ public void setUp() throws Exception { final String[] entries = classPath.split(System.getProperty("path.separator")); for (final String entry : entries) { - if (entry.contains("javax.ws.rs-api")) { + if (entry.contains("jakarta.ws.rs-api")) { jaxRsApiPath = entry; break; } } if (jaxRsApiPath == null) { - fail("Could not find javax.ws.rs-api."); + fail("Could not find jakarta.ws.rs-api."); } } diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java index 42bd43a1d1..29b18c0f25 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java @@ -59,14 +59,14 @@ public void setUp() throws Exception { final String[] entries = classPath.split(System.getProperty("path.separator")); for (final String entry : entries) { - if (entry.contains("javax.ws.rs-api")) { + if (entry.contains("jakarta.ws.rs-api")) { jaxRsApiPath = entry; break; } } if (jaxRsApiPath == null) { - fail("Could not find javax.ws.rs-api."); + fail("Could not find jakarta.ws.rs-api."); } } diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java index 6780e34a2f..2c50cd7381 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java @@ -50,14 +50,14 @@ public void setUp() throws Exception { final String[] entries = classPath.split(System.getProperty("path.separator")); for (final String entry : entries) { - if (entry.contains("javax.ws.rs-api")) { + if (entry.contains("jakarta.ws.rs-api")) { jaxRsApiPath = entry; break; } } if (jaxRsApiPath == null) { - fail("Could not find javax.ws.rs-api."); + fail("Could not find jakarta.ws.rs-api."); } } diff --git a/docs/src/main/docbook/dependencies.xml b/docs/src/main/docbook/dependencies.xml index 5d60d3fe07..83ef88bf68 100644 --- a/docs/src/main/docbook/dependencies.xml +++ b/docs/src/main/docbook/dependencies.xml @@ -93,8 +93,8 @@ <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <version>&jax-rs-api-jar.version;</version> <scope>provided</scope> </dependency> diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml index 63ed946729..ff1d17a675 100644 --- a/examples/cdi-webapp/pom.xml +++ b/examples/cdi-webapp/pom.xml @@ -35,8 +35,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided @@ -135,8 +135,8 @@ compile - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api compile diff --git a/examples/etc/gf-project-src-pom.xsl b/examples/etc/gf-project-src-pom.xsl index 50df08f70e..bcd0b5cecc 100644 --- a/examples/etc/gf-project-src-pom.xsl +++ b/examples/etc/gf-project-src-pom.xsl @@ -73,8 +73,8 @@ jersey-mvc - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -87,8 +87,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/examples/etc/wls-project-src-pom.xsl b/examples/etc/wls-project-src-pom.xsl index 6116b5b181..350753bb42 100644 --- a/examples/etc/wls-project-src-pom.xsl +++ b/examples/etc/wls-project-src-pom.xsl @@ -74,8 +74,8 @@ javax.inject - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -101,8 +101,8 @@ javax.inject - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/examples/etc/wls1213-project-src-pom.xsl b/examples/etc/wls1213-project-src-pom.xsl index 40b63b5444..b06099bebc 100644 --- a/examples/etc/wls1213-project-src-pom.xsl +++ b/examples/etc/wls1213-project-src-pom.xsl @@ -73,8 +73,8 @@ javax.inject - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -101,8 +101,8 @@ javax.inject - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java index 7c58b8538f..76b42926de 100644 --- a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java +++ b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java @@ -138,7 +138,7 @@ public static Option[] configuration() { mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject(), // JAX-RS API - mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(), + mavenBundle().groupId("jakarta.ws.rs").artifactId("jakarta.ws.rs-api").versionAsInProject(), // Jersey bundles mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(), diff --git a/examples/managed-beans-webapp/pom.xml b/examples/managed-beans-webapp/pom.xml index 6703aa68e0..e6c2964ebe 100644 --- a/examples/managed-beans-webapp/pom.xml +++ b/examples/managed-beans-webapp/pom.xml @@ -35,8 +35,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/examples/osgi-helloworld-webapp/additional-bundle/pom.xml b/examples/osgi-helloworld-webapp/additional-bundle/pom.xml index 3e0fa05630..3c5347e793 100644 --- a/examples/osgi-helloworld-webapp/additional-bundle/pom.xml +++ b/examples/osgi-helloworld-webapp/additional-bundle/pom.xml @@ -29,8 +29,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml b/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml index d958fdcbda..46ff40b918 100644 --- a/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml +++ b/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml @@ -29,8 +29,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java index 1307e87cf2..c36dd819ec 100644 --- a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java +++ b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java @@ -161,7 +161,7 @@ public List - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided diff --git a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java index e6a823f914..a6a20fd223 100644 --- a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java +++ b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java @@ -126,7 +126,7 @@ public List