JAX-RS 2.1.3 (Jakarta Maven Coordinates and OSGi fixes) [EE4J_8] (#3994) Signed-off-by: Markus KARG <markus@headcrashing.eu>
diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml index 7fe3a16..da26f10 100644 --- a/bundles/jaxrs-ri/pom.xml +++ b/bundles/jaxrs-ri/pom.xml
@@ -44,11 +44,11 @@ <dependencies> <!-- JAX-RS API Sources--> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <version>${jaxrs.api.impl.version}</version> <classifier>sources</classifier> - <optional>true</optional> + <scope>provided</scope> </dependency> <!-- JAX-RS RI Binaries --> @@ -251,7 +251,7 @@ <goal>unpack-dependencies</goal> </goals> <configuration> - <includeGroupIds>javax.ws.rs,org.glassfish.jersey.core,org.glassfish.jersey.containers,org.glassfish.jersey.jaxb,org.glassfish.jersey.inject</includeGroupIds> + <includeGroupIds>jakarta.ws.rs,org.glassfish.jersey.core,org.glassfish.jersey.containers,org.glassfish.jersey.jaxb,org.glassfish.jersey.inject</includeGroupIds> <includeClassifiers>sources</includeClassifiers> <outputDirectory>${generated.src.dir}</outputDirectory> <excludes>**/NOTICE.md</excludes>
diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml index 6eced85..6f2c1e9 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 @@ <directoryMode>0755</directoryMode> <fileMode>0644</fileMode> <includes> - <include>javax.ws.rs:*</include> + <include>jakarta.ws.rs:*</include> </includes> <excludes> - <exclude>javax.ws.rs:*:*:sources:*</exclude> + <exclude>jakarta.ws.rs:*:*:sources:*</exclude> </excludes> </dependencySet> <!-- JAX-RS RI Binaries-->
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 635b53c..a7ec56e 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 @@ </excludes> </unpackOptions> <includes> - <include>javax.ws.rs:*:*:sources:*</include> + <include>jakarta.ws.rs:*:*:sources:*</include> <include>org.glassfish.jersey.*:*:*:sources:*</include> </includes> </dependencySet>
diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml index 1cd0035..a951e5b 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 @@ </excludes> </unpackOptions> <includes> - <include>javax.ws.rs:*:*:sources:*</include> + <include>jakarta.ws.rs:*:*:sources:*</include> <include>org.glassfish.jersey.*:*:*:sources:*</include> </includes> </dependencySet>
diff --git a/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml b/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml index 9dd7855..2c92564 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 @@ <directoryMode>0755</directoryMode> <fileMode>0644</fileMode> <excludes> - <exclude>javax.ws.rs:*</exclude> + <exclude>jakarta.ws.rs:*</exclude> <exclude>org.glassfish.jersey.*:*</exclude> <!-- CDI API dependencies come from yasson, cdi is optional there --> <exclude>javax.enterprise:cdi-api:jar:*</exclude>
diff --git a/connectors/pom.xml b/connectors/pom.xml index f48fcb7..23156f6 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml
@@ -54,8 +54,8 @@ </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency>
diff --git a/containers/pom.xml b/containers/pom.xml index 2246a14..de0bde1 100644 --- a/containers/pom.xml +++ b/containers/pom.xml
@@ -59,8 +59,8 @@ </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency>
diff --git a/core-client/pom.xml b/core-client/pom.xml index 8db5eab..798231e 100644 --- a/core-client/pom.xml +++ b/core-client/pom.xml
@@ -94,8 +94,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency>
diff --git a/core-common/pom.xml b/core-common/pom.xml index 37de72a..5796421 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml
@@ -167,8 +167,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> <groupId>javax.annotation</groupId>
diff --git a/core-server/pom.xml b/core-server/pom.xml index 56294c5..4d6dae0 100644 --- a/core-server/pom.xml +++ b/core-server/pom.xml
@@ -167,8 +167,8 @@ </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency>
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 8bf25f8..8994d11 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 @@ 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 42bd43a..29b18c0 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 @@ 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 6780e34..2c50cd7 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 @@ 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 5d60d3f..83ef88b 100644 --- a/docs/src/main/docbook/dependencies.xml +++ b/docs/src/main/docbook/dependencies.xml
@@ -93,8 +93,8 @@ </para> <programlisting language="xml"><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></programlisting>
diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml index 63ed946..ff1d17a 100644 --- a/examples/cdi-webapp/pom.xml +++ b/examples/cdi-webapp/pom.xml
@@ -35,8 +35,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -135,8 +135,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>compile</scope> </dependency> <dependency>
diff --git a/examples/etc/gf-project-src-pom.xsl b/examples/etc/gf-project-src-pom.xsl index 50df08f..bcd0b5c 100644 --- a/examples/etc/gf-project-src-pom.xsl +++ b/examples/etc/gf-project-src-pom.xsl
@@ -73,8 +73,8 @@ <artifactId>jersey-mvc</artifactId> </exclusion> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion> </exclusions> </xsl:copy> @@ -87,8 +87,8 @@ <xsl:apply-templates /> <exclusions> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion>
diff --git a/examples/etc/wls-project-src-pom.xsl b/examples/etc/wls-project-src-pom.xsl index 6116b5b..350753b 100644 --- a/examples/etc/wls-project-src-pom.xsl +++ b/examples/etc/wls-project-src-pom.xsl
@@ -74,8 +74,8 @@ <artifactId>javax.inject</artifactId> </exclusion> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion> </exclusions> </xsl:template> @@ -101,8 +101,8 @@ <artifactId>javax.inject</artifactId> </exclusion> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion> </exclusions> </xsl:if>
diff --git a/examples/etc/wls1213-project-src-pom.xsl b/examples/etc/wls1213-project-src-pom.xsl index 40b63b5..b06099b 100644 --- a/examples/etc/wls1213-project-src-pom.xsl +++ b/examples/etc/wls1213-project-src-pom.xsl
@@ -73,8 +73,8 @@ <artifactId>javax.inject</artifactId> </exclusion> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion> </exclusions> </xsl:template> @@ -101,8 +101,8 @@ <artifactId>javax.inject</artifactId> </exclusion> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion> </exclusions> </xsl:if>
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 7c58b85..76b4292 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 @@ 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 6703aa6..e6c2964 100644 --- a/examples/managed-beans-webapp/pom.xml +++ b/examples/managed-beans-webapp/pom.xml
@@ -35,8 +35,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/examples/osgi-helloworld-webapp/additional-bundle/pom.xml b/examples/osgi-helloworld-webapp/additional-bundle/pom.xml index 3e0fa05..3c5347e 100644 --- a/examples/osgi-helloworld-webapp/additional-bundle/pom.xml +++ b/examples/osgi-helloworld-webapp/additional-bundle/pom.xml
@@ -29,8 +29,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> </dependencies>
diff --git a/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml b/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml index d958fdc..46ff40b 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 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> </dependencies>
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 1307e87..c36dd81 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 @@ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").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(), // Those two bundles have different (unique) maven coordinates, but represent the same OSGi bundle in two // different versions.
diff --git a/examples/osgi-helloworld-webapp/lib-bundle/pom.xml b/examples/osgi-helloworld-webapp/lib-bundle/pom.xml index 18586bf..951e2573 100644 --- a/examples/osgi-helloworld-webapp/lib-bundle/pom.xml +++ b/examples/osgi-helloworld-webapp/lib-bundle/pom.xml
@@ -29,8 +29,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> </dependencies>
diff --git a/examples/osgi-helloworld-webapp/war-bundle/pom.xml b/examples/osgi-helloworld-webapp/war-bundle/pom.xml index 5bf8b16..c183a93 100644 --- a/examples/osgi-helloworld-webapp/war-bundle/pom.xml +++ b/examples/osgi-helloworld-webapp/war-bundle/pom.xml
@@ -50,8 +50,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
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 e6a823f..a6a20fd 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 @@ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").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() ));
diff --git a/examples/server-async-standalone/client/pom.xml b/examples/server-async-standalone/client/pom.xml index 06f779b..c6c8b59 100644 --- a/examples/server-async-standalone/client/pom.xml +++ b/examples/server-async-standalone/client/pom.xml
@@ -28,8 +28,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId>
diff --git a/ext/pom.xml b/ext/pom.xml index 0e56abf..1116825 100644 --- a/ext/pom.xml +++ b/ext/pom.xml
@@ -58,8 +58,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency>
diff --git a/ext/servlet-portability/pom.xml b/ext/servlet-portability/pom.xml index 6e0fada..200fa4b 100644 --- a/ext/servlet-portability/pom.xml +++ b/ext/servlet-portability/pom.xml
@@ -51,8 +51,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/incubator/html-json/pom.xml b/incubator/html-json/pom.xml index 1ae64ca..e2e2437 100644 --- a/incubator/html-json/pom.xml +++ b/incubator/html-json/pom.xml
@@ -52,8 +52,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.netbeans.html</groupId>
diff --git a/incubator/kryo/pom.xml b/incubator/kryo/pom.xml index a6a7757..3c8cc9d 100644 --- a/incubator/kryo/pom.xml +++ b/incubator/kryo/pom.xml
@@ -36,8 +36,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/pom.xml b/pom.xml index 7e3a16e..b9550a6 100644 --- a/pom.xml +++ b/pom.xml
@@ -23,7 +23,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.2</version> + <version>1.0.5</version> </parent> <groupId>org.glassfish.jersey</groupId> @@ -1360,8 +1360,8 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <version>${jaxrs.api.impl.version}</version> </dependency> <dependency> @@ -1974,7 +1974,7 @@ <jaxb.ri.version>2.3.1</jaxb.ri.version> <jsonb.api.version>1.0</jsonb.api.version> <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version> - <jaxrs.api.impl.version>2.1.1</jaxrs.api.impl.version> + <jaxrs.api.impl.version>2.1.3</jaxrs.api.impl.version> <jboss.logging.version>3.3.0.Final</jboss.logging.version> <jersey1.version>1.19.3</jersey1.version> <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
diff --git a/security/oauth1-client/pom.xml b/security/oauth1-client/pom.xml index 56732a2..6314d3a 100644 --- a/security/oauth1-client/pom.xml +++ b/security/oauth1-client/pom.xml
@@ -62,8 +62,8 @@ </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency>
diff --git a/security/oauth2-client/pom.xml b/security/oauth2-client/pom.xml index 7a83a0d..279a43d 100644 --- a/security/oauth2-client/pom.xml +++ b/security/oauth2-client/pom.xml
@@ -60,8 +60,8 @@ </dependency> <!--<dependency>--> - <!--<groupId>javax.ws.rs</groupId>--> - <!--<artifactId>javax.ws.rs-api</artifactId>--> + <!--<groupId>jakarta.ws.rs</groupId>--> + <!--<artifactId>jakarta.ws.rs-api</artifactId>--> <!--</dependency>--> </dependencies>
diff --git a/tests/integration/cdi-beanvalidation-webapp/pom.xml b/tests/integration/cdi-beanvalidation-webapp/pom.xml index 272afe6..6f7defe 100644 --- a/tests/integration/cdi-beanvalidation-webapp/pom.xml +++ b/tests/integration/cdi-beanvalidation-webapp/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-ejb-test-webapp/pom.xml b/tests/integration/cdi-ejb-test-webapp/pom.xml index 39b0521..85dc5a7 100644 --- a/tests/integration/cdi-ejb-test-webapp/pom.xml +++ b/tests/integration/cdi-ejb-test-webapp/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml b/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml index d0cf29f..119a817 100644 --- a/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml +++ b/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-multimodule/lib/pom.xml b/tests/integration/cdi-multimodule/lib/pom.xml index 4e38c98..21d5a1e 100644 --- a/tests/integration/cdi-multimodule/lib/pom.xml +++ b/tests/integration/cdi-multimodule/lib/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-multimodule/war1/pom.xml b/tests/integration/cdi-multimodule/war1/pom.xml index 6c9cea8..4d1fd7b 100644 --- a/tests/integration/cdi-multimodule/war1/pom.xml +++ b/tests/integration/cdi-multimodule/war1/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-multimodule/war2/pom.xml b/tests/integration/cdi-multimodule/war2/pom.xml index 0c4352b..0fb5ed1 100644 --- a/tests/integration/cdi-multimodule/war2/pom.xml +++ b/tests/integration/cdi-multimodule/war2/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-multipart-webapp/pom.xml b/tests/integration/cdi-multipart-webapp/pom.xml index 79f0bf4..55985be 100644 --- a/tests/integration/cdi-multipart-webapp/pom.xml +++ b/tests/integration/cdi-multipart-webapp/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-test-webapp/pom.xml b/tests/integration/cdi-test-webapp/pom.xml index bfddb0f..fc592e8 100644 --- a/tests/integration/cdi-test-webapp/pom.xml +++ b/tests/integration/cdi-test-webapp/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml index 5980238..92c426e 100644 --- a/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml +++ b/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml
@@ -59,8 +59,8 @@ <artifactId>jersey-common</artifactId> </exclusion> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion> </exclusions> </dependency>
diff --git a/tests/integration/client-connector-provider/pom.xml b/tests/integration/client-connector-provider/pom.xml index 465f8e6..d68560c 100644 --- a/tests/integration/client-connector-provider/pom.xml +++ b/tests/integration/client-connector-provider/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/ejb-multimodule-reload/lib/pom.xml b/tests/integration/ejb-multimodule-reload/lib/pom.xml index 730d296..7810fc2 100644 --- a/tests/integration/ejb-multimodule-reload/lib/pom.xml +++ b/tests/integration/ejb-multimodule-reload/lib/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/ejb-multimodule-reload/war1/pom.xml b/tests/integration/ejb-multimodule-reload/war1/pom.xml index f90e657..1ece937 100644 --- a/tests/integration/ejb-multimodule-reload/war1/pom.xml +++ b/tests/integration/ejb-multimodule-reload/war1/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/ejb-multimodule-reload/war2/pom.xml b/tests/integration/ejb-multimodule-reload/war2/pom.xml index 1a3bf25..d94fa5e 100644 --- a/tests/integration/ejb-multimodule-reload/war2/pom.xml +++ b/tests/integration/ejb-multimodule-reload/war2/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/ejb-multimodule/lib/pom.xml b/tests/integration/ejb-multimodule/lib/pom.xml index 916ead4..bf06701 100644 --- a/tests/integration/ejb-multimodule/lib/pom.xml +++ b/tests/integration/ejb-multimodule/lib/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/ejb-multimodule/war/pom.xml b/tests/integration/ejb-multimodule/war/pom.xml index 8c40b68..794c38f 100644 --- a/tests/integration/ejb-multimodule/war/pom.xml +++ b/tests/integration/ejb-multimodule/war/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/ejb-test-webapp/pom.xml b/tests/integration/ejb-test-webapp/pom.xml index 6ca69fa..a691de6 100644 --- a/tests/integration/ejb-test-webapp/pom.xml +++ b/tests/integration/ejb-test-webapp/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml index 4908e7c..710e2e4 100644 --- a/tests/integration/j-376/pom.xml +++ b/tests/integration/j-376/pom.xml
@@ -34,8 +34,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/j-59/lib/pom.xml b/tests/integration/j-59/lib/pom.xml index e90e520..ffc43a6 100644 --- a/tests/integration/j-59/lib/pom.xml +++ b/tests/integration/j-59/lib/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/j-59/war/pom.xml b/tests/integration/j-59/war/pom.xml index 1783544..7e634bc 100644 --- a/tests/integration/j-59/war/pom.xml +++ b/tests/integration/j-59/war/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/jersey-2137/pom.xml b/tests/integration/jersey-2137/pom.xml index d5b48c5..0114c5a 100644 --- a/tests/integration/jersey-2137/pom.xml +++ b/tests/integration/jersey-2137/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/jersey-2154/pom.xml b/tests/integration/jersey-2154/pom.xml index 6dc290f..faf5e55 100644 --- a/tests/integration/jersey-2154/pom.xml +++ b/tests/integration/jersey-2154/pom.xml
@@ -33,8 +33,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/spring4/pom.xml b/tests/integration/spring4/pom.xml index c5e93ab..9333385 100644 --- a/tests/integration/spring4/pom.xml +++ b/tests/integration/spring4/pom.xml
@@ -46,8 +46,8 @@ </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>compile</scope> </dependency>
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java index 5de0537..067fa8b 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
@@ -159,7 +159,7 @@ if (includeJerseyJaxRsLibs) { options.addAll(expandedList( // 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/tests/performance/test-cases/filter-dynamic/pom.xml b/tests/performance/test-cases/filter-dynamic/pom.xml index 43208e4..04f8cea 100644 --- a/tests/performance/test-cases/filter-dynamic/pom.xml +++ b/tests/performance/test-cases/filter-dynamic/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/filter-global/pom.xml b/tests/performance/test-cases/filter-global/pom.xml index 21c00ea..1c141bb 100644 --- a/tests/performance/test-cases/filter-global/pom.xml +++ b/tests/performance/test-cases/filter-global/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/filter-name/pom.xml b/tests/performance/test-cases/filter-name/pom.xml index 227739a..674f789 100644 --- a/tests/performance/test-cases/filter-name/pom.xml +++ b/tests/performance/test-cases/filter-name/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/interceptor-dynamic/pom.xml b/tests/performance/test-cases/interceptor-dynamic/pom.xml index e962e03..af74210 100644 --- a/tests/performance/test-cases/interceptor-dynamic/pom.xml +++ b/tests/performance/test-cases/interceptor-dynamic/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/interceptor-global/pom.xml b/tests/performance/test-cases/interceptor-global/pom.xml index 264dd02..a5a0e1b 100644 --- a/tests/performance/test-cases/interceptor-global/pom.xml +++ b/tests/performance/test-cases/interceptor-global/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/interceptor-name/pom.xml b/tests/performance/test-cases/interceptor-name/pom.xml index b08fecf..d061b9c 100644 --- a/tests/performance/test-cases/interceptor-name/pom.xml +++ b/tests/performance/test-cases/interceptor-name/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/mbw-custom-provider/pom.xml b/tests/performance/test-cases/mbw-custom-provider/pom.xml index 2077e42..25f05ae 100644 --- a/tests/performance/test-cases/mbw-custom-provider/pom.xml +++ b/tests/performance/test-cases/mbw-custom-provider/pom.xml
@@ -37,8 +37,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/mbw-json-jackson/pom.xml b/tests/performance/test-cases/mbw-json-jackson/pom.xml index 9121b28..493347e 100644 --- a/tests/performance/test-cases/mbw-json-jackson/pom.xml +++ b/tests/performance/test-cases/mbw-json-jackson/pom.xml
@@ -37,8 +37,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/mbw-text-plain/pom.xml b/tests/performance/test-cases/mbw-text-plain/pom.xml index e97d4c7..2edbd0f 100644 --- a/tests/performance/test-cases/mbw-text-plain/pom.xml +++ b/tests/performance/test-cases/mbw-text-plain/pom.xml
@@ -37,8 +37,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/mbw-xml-jaxb/pom.xml b/tests/performance/test-cases/mbw-xml-jaxb/pom.xml index 9644471..5db86de 100644 --- a/tests/performance/test-cases/mbw-xml-jaxb/pom.xml +++ b/tests/performance/test-cases/mbw-xml-jaxb/pom.xml
@@ -37,8 +37,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/param-srl/pom.xml b/tests/performance/test-cases/param-srl/pom.xml index 2baddfd..be12c05 100644 --- a/tests/performance/test-cases/param-srl/pom.xml +++ b/tests/performance/test-cases/param-srl/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/tests/performance/test-cases/proxy-injection/pom.xml b/tests/performance/test-cases/proxy-injection/pom.xml index 2a64052..62bd5e5 100644 --- a/tests/performance/test-cases/proxy-injection/pom.xml +++ b/tests/performance/test-cases/proxy-injection/pom.xml
@@ -38,8 +38,8 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency>
diff --git a/travis.sh b/travis.sh index 66f7319..7cbecfd 100644 --- a/travis.sh +++ b/travis.sh
@@ -25,10 +25,10 @@ bash -c "while true; do tail -5 $BUILD_OUTPUT; sleep $PING_SLEEP; done" & PING_LOOP_PID=$! -mvn -e -U -B clean install $1 >> $BUILD_OUTPUT 2>&1 +mvn -e -U -B clean install -Pstaging $1 >> $BUILD_OUTPUT 2>&1 # The build finished without returning an error so dump a tail of the output dump_output # nicely terminate the ping output loop -kill $PING_LOOP_PID \ No newline at end of file +kill $PING_LOOP_PID