Uptake Jakarta dependencies, Part I. (#4001)
Uptake new Jakarta dependencies: API & HK2, Yasson, JAXB impl, moxy, JSONP, Grizzly, EL
diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml
index da26f10..b3c1ebd 100644
--- a/bundles/jaxrs-ri/pom.xml
+++ b/bundles/jaxrs-ri/pom.xml
@@ -166,12 +166,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -180,14 +180,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml
index b0d60f6..76d8d9f 100644
--- a/containers/glassfish/jersey-gf-ejb/pom.xml
+++ b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -40,20 +40,20 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<version>${ejb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.interceptor</groupId>
- <artifactId>javax.interceptor-api</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<version>${javax.interceptor.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml
index 49e75e5..67a6cd4 100644
--- a/containers/grizzly2-http/pom.xml
+++ b/containers/grizzly2-http/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml
index caee668..fd2dc6e 100644
--- a/containers/grizzly2-servlet/pom.xml
+++ b/containers/grizzly2-servlet/pom.xml
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet4.version}</version>
</dependency>
diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml
index 4bc5700..2cc2f48 100644
--- a/containers/jersey-servlet-core/pom.xml
+++ b/containers/jersey-servlet-core/pom.xml
@@ -34,18 +34,18 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
</dependencies>
diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml
index a9a6634..31f63d1 100644
--- a/containers/jersey-servlet/pom.xml
+++ b/containers/jersey-servlet/pom.xml
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
@@ -49,6 +49,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml
index eb3d0b8..58d9ce2 100644
--- a/containers/jetty-http/pom.xml
+++ b/containers/jetty-http/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
diff --git a/containers/netty-http/pom.xml b/containers/netty-http/pom.xml
index beb0545..0faf9d2 100644
--- a/containers/netty-http/pom.xml
+++ b/containers/netty-http/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
diff --git a/containers/simple-http/pom.xml b/containers/simple-http/pom.xml
index e3bfb38..5642f10 100644
--- a/containers/simple-http/pom.xml
+++ b/containers/simple-http/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.simpleframework</groupId>
diff --git a/core-client/pom.xml b/core-client/pom.xml
index 798231e..e8eb805 100644
--- a/core-client/pom.xml
+++ b/core-client/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 5796421..ea7c997 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -171,8 +171,8 @@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -181,7 +181,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff --git a/core-server/pom.xml b/core-server/pom.xml
index 4d6dae0..c8feb73 100644
--- a/core-server/pom.xml
+++ b/core-server/pom.xml
@@ -111,8 +111,8 @@
<artifactId>maven-jaxb-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
@@ -178,13 +178,13 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
diff --git a/examples/bookmark-em/pom.xml b/examples/bookmark-em/pom.xml
index e800535..41cc6c1 100644
--- a/examples/bookmark-em/pom.xml
+++ b/examples/bookmark-em/pom.xml
@@ -34,8 +34,8 @@
<artifactId>jersey-media-json-jettison</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
@@ -43,19 +43,19 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<version>${ejb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>${jta.api.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/bookmark/pom.xml b/examples/bookmark/pom.xml
index 4ebd371..306c465 100644
--- a/examples/bookmark/pom.xml
+++ b/examples/bookmark/pom.xml
@@ -34,16 +34,16 @@
<artifactId>jersey-media-json-jettison</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>${jta.api.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/bookstore-webapp/pom.xml b/examples/bookstore-webapp/pom.xml
index 10b81ff..cf1a1f9 100644
--- a/examples/bookstore-webapp/pom.xml
+++ b/examples/bookstore-webapp/pom.xml
@@ -54,13 +54,13 @@
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${jstl.version}</version>
</dependency>
</dependencies>
diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml
index ff1d17a..0b2149e 100644
--- a/examples/cdi-webapp/pom.xml
+++ b/examples/cdi-webapp/pom.xml
@@ -40,8 +40,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -146,7 +146,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/declarative-linking/pom.xml b/examples/declarative-linking/pom.xml
index 692ce52..43c1837 100644
--- a/examples/declarative-linking/pom.xml
+++ b/examples/declarative-linking/pom.xml
@@ -45,13 +45,13 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
+ <artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
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 76b4292..0ac7009 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
@@ -94,10 +94,10 @@
public static Option[] configuration() {
List<Option> options = Arrays.asList(options(
// systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("FINEST"),
- systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
+ systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"),
// javax.annotation must go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
junitBundles(),
@@ -108,7 +108,7 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
@@ -126,7 +126,7 @@
.versionAsInProject(),
//JAXB-API
- mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
//SUN JAXB IMPL OSGI
mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
systemPackage("com.sun.source.tree"),
diff --git a/examples/helloworld-webapp/pom.xml b/examples/helloworld-webapp/pom.xml
index ad575de..6823c63 100644
--- a/examples/helloworld-webapp/pom.xml
+++ b/examples/helloworld-webapp/pom.xml
@@ -30,8 +30,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet4.version}</version>
</dependency>
diff --git a/examples/https-clientserver-grizzly/pom.xml b/examples/https-clientserver-grizzly/pom.xml
index fb060b0..e5c002e 100644
--- a/examples/https-clientserver-grizzly/pom.xml
+++ b/examples/https-clientserver-grizzly/pom.xml
@@ -29,8 +29,8 @@
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
diff --git a/examples/jersey-ejb/pom.xml b/examples/jersey-ejb/pom.xml
index 2a62817..752f841 100644
--- a/examples/jersey-ejb/pom.xml
+++ b/examples/jersey-ejb/pom.xml
@@ -33,8 +33,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/managed-beans-webapp/pom.xml b/examples/managed-beans-webapp/pom.xml
index e6c2964..801590b 100644
--- a/examples/managed-beans-webapp/pom.xml
+++ b/examples/managed-beans-webapp/pom.xml
@@ -40,8 +40,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -50,8 +50,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>
diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml
index 005897b..9e026c8 100644
--- a/examples/osgi-helloworld-webapp/functional-test/pom.xml
+++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -66,8 +66,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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 c36dd81..dd89740 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
@@ -113,7 +113,7 @@
systemProperty(org.osgi.framework.Constants.FRAMEWORK_SECURITY)
.value(org.osgi.framework.Constants.FRAMEWORK_SECURITY_OSGI),
systemProperty("org.osgi.service.http.port").value(String.valueOf(port)),
- systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
+ systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"),
systemProperty("jersey.config.test.container.port").value(String.valueOf(port)),
// systemProperty(BundleLocationProperty).value(bundleLocation),
@@ -130,7 +130,7 @@
// mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.4"),
// javax.annotation must go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
// pax exam dependencies
mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
junitBundles(), // adds junit classes to the OSGi context
@@ -140,11 +140,11 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
//JAXB-API
- mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
//SUN JAXB IMPL OSGI
mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
systemPackage("com.sun.source.tree"),
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml
index 2f04451..b29b39a 100644
--- a/examples/osgi-http-service/functional-test/pom.xml
+++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -41,8 +41,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</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 a6a20fd..e070b0a 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
@@ -83,7 +83,7 @@
systemProperty("org.osgi.service.http.port").value(String.valueOf(port)),
systemProperty(BundleLocationProperty).value(bundleLocation),
systemProperty("jersey.config.test.container.port").value(String.valueOf(port)),
- systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
+ systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"),
// do not remove the following line
// systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("FINEST"),
@@ -93,7 +93,7 @@
// mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.4"),
// javax.annotation has to go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
junitBundles(),
@@ -103,12 +103,12 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
//JAXB-API
- mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
//SUN JAXB IMPL OSGI
mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
systemPackage("com.sun.source.tree"),
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
index 36d3c18..78b8c69 100644
--- a/ext/bean-validation/pom.xml
+++ b/ext/bean-validation/pom.xml
@@ -65,7 +65,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@ -89,13 +89,13 @@
<!-- java-el related dependencies are in scope "provided" in hibernate-validator -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
+ <artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
diff --git a/ext/cdi/jersey-cdi1x-servlet/pom.xml b/ext/cdi/jersey-cdi1x-servlet/pom.xml
index e09cfe5..86fc968 100644
--- a/ext/cdi/jersey-cdi1x-servlet/pom.xml
+++ b/ext/cdi/jersey-cdi1x-servlet/pom.xml
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml
index b5e0b1b..4669947 100644
--- a/ext/cdi/jersey-cdi1x-validation/pom.xml
+++ b/ext/cdi/jersey-cdi1x-validation/pom.xml
@@ -57,6 +57,10 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/ext/mvc-bean-validation/pom.xml b/ext/mvc-bean-validation/pom.xml
index b8c210f..0c23dff 100644
--- a/ext/mvc-bean-validation/pom.xml
+++ b/ext/mvc-bean-validation/pom.xml
@@ -59,9 +59,17 @@
<artifactId>javax.el-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/ext/mvc-jsp/pom.xml b/ext/mvc-jsp/pom.xml
index 718d2d0..8388357 100644
--- a/ext/mvc-jsp/pom.xml
+++ b/ext/mvc-jsp/pom.xml
@@ -53,7 +53,8 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.jsp.*;version="${range;[==,+);${jsp.version}}",
+ javax.servlet.jsp.*;version="[2.0,3.0)",
+ javax.servlet.*;version="!",
*
</Import-Package>
<Export-Package>org.glassfish.jersey.server.mvc.jsp.*;version=${project.version}</Export-Package>
@@ -67,7 +68,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
@@ -81,14 +82,14 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<version>${jsp.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/ext/servlet-portability/pom.xml b/ext/servlet-portability/pom.xml
index 200fa4b..64939bd 100644
--- a/ext/servlet-portability/pom.xml
+++ b/ext/servlet-portability/pom.xml
@@ -68,9 +68,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.xml
index 7808a58..4c1909e 100644
--- a/ext/spring4/pom.xml
+++ b/ext/spring4/pom.xml
@@ -122,9 +122,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml
index d2560bc..837a1e9 100644
--- a/incubator/declarative-linking/pom.xml
+++ b/incubator/declarative-linking/pom.xml
@@ -49,13 +49,13 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
+ <artifactId>jakarta.el</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/incubator/html-json/pom.xml b/incubator/html-json/pom.xml
index e2e2437..df44488 100644
--- a/incubator/html-json/pom.xml
+++ b/incubator/html-json/pom.xml
@@ -72,8 +72,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
diff --git a/media/jaxb/pom.xml b/media/jaxb/pom.xml
index 47a1813..9a7ea84 100644
--- a/media/jaxb/pom.xml
+++ b/media/jaxb/pom.xml
@@ -121,12 +121,12 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml
index b8fe8d6..a458bb3 100644
--- a/media/json-binding/pom.xml
+++ b/media/json-binding/pom.xml
@@ -70,7 +70,8 @@
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
+ <version>${jsonp.ri.version}</version>
</dependency>
<!-- TODO - remove snapshot dependencies (will need yasson & API release, as there only is 2 month old M1 version -->
@@ -83,12 +84,31 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.json.bind</groupId>
+ <artifactId>javax.json.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
+ <version>${jsonb.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>${jsonp.ri.version}</version>
</dependency>
<dependency>
diff --git a/media/json-processing/pom.xml b/media/json-processing/pom.xml
index 60022e9..ac3de80 100644
--- a/media/json-processing/pom.xml
+++ b/media/json-processing/pom.xml
@@ -77,7 +77,7 @@
<!-- JSON-P API + RI + JAX-RS Providers -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml
index afbb8f3..92153b4 100644
--- a/media/moxy/pom.xml
+++ b/media/moxy/pom.xml
@@ -92,8 +92,30 @@
</dependency>
<dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>${jsonp.ri.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <version>${jsonp.ri.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/media/sse/pom.xml b/media/sse/pom.xml
index be75d26..16f9426 100644
--- a/media/sse/pom.xml
+++ b/media/sse/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/pom.xml b/pom.xml
index b9550a6..235aecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
- <version>1.0.5</version>
+ <version>1.0.5</version>
</parent>
<groupId>org.glassfish.jersey</groupId>
@@ -1365,8 +1365,8 @@
<version>${jaxrs.api.impl.version}</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
@@ -1377,8 +1377,8 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>${jta.api.version}</version>
</dependency>
@@ -1418,7 +1418,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<version>${hk2.version}</version>
<exclusions>
<exclusion>
@@ -1533,8 +1533,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
@@ -1556,15 +1556,15 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<version>${javax.persistence.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<version>${ejb.version}</version>
<scope>provided</scope>
</dependency>
@@ -1672,19 +1672,19 @@
<version>${fasterxml.classmate.version}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<version>${javax.el.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
+ <artifactId>jakarta.el</artifactId>
<version>${javax.el.impl.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
<version>${jsonp.ri.version}</version>
</dependency>
<dependency>
@@ -1880,8 +1880,8 @@
</dependency>
<dependency>
- <groupId>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
<version>${jsonb.api.version}</version>
</dependency>
@@ -1944,7 +1944,7 @@
<checkstyle.mvn.plugin.version>2.16</checkstyle.mvn.plugin.version>
<checkstyle.version>6.8.1</checkstyle.version>
<easymock.version>3.3</easymock.version>
- <ejb.version>3.2.2</ejb.version>
+ <ejb.version>3.2.3</ejb.version>
<gf.impl.version>5.0</gf.impl.version>
<fasterxml.classmate.version>1.3.3</fasterxml.classmate.version>
<findbugs.glassfish.version>1.7</findbugs.glassfish.version>
@@ -1953,26 +1953,26 @@
<gae.version>1.9.59</gae.version>
<gpg.mvn.plugin.version>1.6</gpg.mvn.plugin.version>
<grizzly.client.version>1.13</grizzly.client.version>
- <grizzly2.version>2.4.0</grizzly2.version>
+ <grizzly2.version>2.4.4</grizzly2.version>
<guava.version>18.0</guava.version>
<hamcrest.version>1.3</hamcrest.version>
<xmlunit.version>1.6</xmlunit.version>
- <hk2.version>2.5.0-b62</hk2.version>
- <hk2.config.version>2.5.0-b56</hk2.config.version>
+ <hk2.version>2.5.0</hk2.version>
+ <hk2.config.version>5.1.0</hk2.config.version>
<httpclient.version>4.5</httpclient.version> <!-- TODO: 4.5.2 doesn't work; apache client connector tests -->
<jackson.version>2.9.6</jackson.version>
<jackson1.version>1.9.13</jackson1.version>
<javassist.version>3.22.0-GA</javassist.version>
- <javax.annotation.version>1.3.2</javax.annotation.version>
+ <javax.annotation.version>1.3.4</javax.annotation.version>
<javax.annotation.bundle.version>1.3.2</javax.annotation.bundle.version>
- <javax.el.version>3.0.1-b06</javax.el.version>
- <javax.el.impl.version>3.0.1-b09</javax.el.impl.version>
- <javax.interceptor.version>1.2.2</javax.interceptor.version>
- <javax.persistence.version>1.0.2</javax.persistence.version>
+ <javax.el.version>3.0.2</javax.el.version>
+ <javax.el.impl.version>3.0.2</javax.el.impl.version>
+ <javax.interceptor.version>1.2.3</javax.interceptor.version>
+ <javax.persistence.version>2.2.2</javax.persistence.version>
<javax.validation.api.version>2.0.1.Final</javax.validation.api.version>
- <jaxb.api.version>2.3.1</jaxb.api.version>
- <jaxb.ri.version>2.3.1</jaxb.ri.version>
- <jsonb.api.version>1.0</jsonb.api.version>
+ <jaxb.api.version>2.3.2</jaxb.api.version>
+ <jaxb.ri.version>2.3.2</jaxb.ri.version>
+ <jsonb.api.version>1.0.1</jsonb.api.version>
<jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
<jaxrs.api.impl.version>2.1.3</jaxrs.api.impl.version>
<jboss.logging.version>3.3.0.Final</jboss.logging.version>
@@ -1984,15 +1984,15 @@
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
<jmh.version>1.10.2</jmh.version>
<jmockit.version>1.41</jmockit.version>
- <jsonp.ri.version>1.1</jsonp.ri.version>
- <jsonp.jaxrs.version>1.1.2</jsonp.jaxrs.version>
- <jsp.version>2.3.3</jsp.version>
- <jstl.version>1.2</jstl.version>
- <jta.api.version>1.3</jta.api.version>
+ <jsonp.ri.version>1.1.5</jsonp.ri.version>
+ <jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version>
+ <jsp.version>2.3.4</jsp.version>
+ <jstl.version>1.2.3</jstl.version>
+ <jta.api.version>1.3.1</jta.api.version>
<kryo.version>4.0.1</kryo.version>
<mimepull.version>1.9.7</mimepull.version>
<mockito.version>1.10.19</mockito.version>
- <moxy.version>2.6.4</moxy.version>
+ <moxy.version>2.7.3</moxy.version>
<mustache.version>0.8.17</mustache.version>
<netty.version>4.1.5.Final</netty.version>
<nexus-staging.mvn.plugin.version>1.6.7</nexus-staging.mvn.plugin.version>
@@ -2005,7 +2005,7 @@
<rxjava2.version>2.0.4</rxjava2.version>
<servlet2.version>2.4</servlet2.version>
<servlet3.version>3.0.1</servlet3.version>
- <servlet4.version>4.0.1</servlet4.version>
+ <servlet4.version>4.0.2</servlet4.version>
<simple.version>6.0.1</simple.version>
<slf4j.version>1.7.21</slf4j.version>
<spring4.version>4.3.8.RELEASE</spring4.version>
@@ -2013,7 +2013,7 @@
<weld.version>2.2.14.Final</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
<weld3.version>3.0.0.Final</weld3.version>
<xerces.version>2.11.0</xerces.version>
- <yasson.version>1.0.1</yasson.version>
+ <yasson.version>1.0.3</yasson.version>
<skip.e2e>false</skip.e2e>
</properties>
</project>
diff --git a/test-framework/core/pom.xml b/test-framework/core/pom.xml
index b86a91f..2667a59 100644
--- a/test-framework/core/pom.xml
+++ b/test-framework/core/pom.xml
@@ -44,9 +44,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/test-framework/providers/grizzly2/pom.xml b/test-framework/providers/grizzly2/pom.xml
index 9be48a0..e8ee3b3 100644
--- a/test-framework/providers/grizzly2/pom.xml
+++ b/test-framework/providers/grizzly2/pom.xml
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet4.version}</version>
</dependency>
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml
index 7414465..b3b178d 100644
--- a/tests/e2e-client/pom.xml
+++ b/tests/e2e-client/pom.xml
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/e2e-entity/pom.xml b/tests/e2e-entity/pom.xml
index 335d5f5..a02ef83 100644
--- a/tests/e2e-entity/pom.xml
+++ b/tests/e2e-entity/pom.xml
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml
index 00fe51c..14b6e0f 100644
--- a/tests/e2e-server/pom.xml
+++ b/tests/e2e-server/pom.xml
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml
index 223c51f..250adba 100644
--- a/tests/e2e/pom.xml
+++ b/tests/e2e/pom.xml
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml
index da8cd9b..e144c60 100644
--- a/tests/integration/async-jersey-filter/pom.xml
+++ b/tests/integration/async-jersey-filter/pom.xml
@@ -47,9 +47,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/cdi-beanvalidation-webapp/pom.xml b/tests/integration/cdi-beanvalidation-webapp/pom.xml
index 6f7defe..bb00e3f 100644
--- a/tests/integration/cdi-beanvalidation-webapp/pom.xml
+++ b/tests/integration/cdi-beanvalidation-webapp/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-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 85dc5a7..bf62d47 100644
--- a/tests/integration/cdi-ejb-test-webapp/pom.xml
+++ b/tests/integration/cdi-ejb-test-webapp/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-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 21d5a1e..8b291f1 100644
--- a/tests/integration/cdi-multimodule/lib/pom.xml
+++ b/tests/integration/cdi-multimodule/lib/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/cdi-multimodule/war1/pom.xml b/tests/integration/cdi-multimodule/war1/pom.xml
index 4d1fd7b..697adc6 100644
--- a/tests/integration/cdi-multimodule/war1/pom.xml
+++ b/tests/integration/cdi-multimodule/war1/pom.xml
@@ -38,9 +38,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-multipart-webapp/pom.xml b/tests/integration/cdi-multipart-webapp/pom.xml
index 55985be..0255db1 100644
--- a/tests/integration/cdi-multipart-webapp/pom.xml
+++ b/tests/integration/cdi-multipart-webapp/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-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 fc592e8..3b36bf3 100644
--- a/tests/integration/cdi-test-webapp/pom.xml
+++ b/tests/integration/cdi-test-webapp/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml
index a491ec4..cc04744 100644
--- a/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml
+++ b/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml
@@ -52,13 +52,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-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 92c426e..16a2ff9 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
@@ -45,8 +45,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -70,8 +70,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-with-jersey-injection-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-webapp/pom.xml
index d0e0c42..c22f140 100644
--- a/tests/integration/cdi-with-jersey-injection-webapp/pom.xml
+++ b/tests/integration/cdi-with-jersey-injection-webapp/pom.xml
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/client-connector-provider/pom.xml b/tests/integration/client-connector-provider/pom.xml
index d68560c..20776e3 100644
--- a/tests/integration/client-connector-provider/pom.xml
+++ b/tests/integration/client-connector-provider/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-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 7810fc2..40a5632 100644
--- a/tests/integration/ejb-multimodule-reload/lib/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/lib/pom.xml
@@ -43,13 +43,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/ejb-multimodule-reload/war1/pom.xml b/tests/integration/ejb-multimodule-reload/war1/pom.xml
index 1ece937..34aae10 100644
--- a/tests/integration/ejb-multimodule-reload/war1/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/war1/pom.xml
@@ -49,12 +49,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
diff --git a/tests/integration/ejb-multimodule-reload/war2/pom.xml b/tests/integration/ejb-multimodule-reload/war2/pom.xml
index d94fa5e..f6828a0 100644
--- a/tests/integration/ejb-multimodule-reload/war2/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/war2/pom.xml
@@ -44,8 +44,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/ejb-multimodule/lib/pom.xml b/tests/integration/ejb-multimodule/lib/pom.xml
index bf06701..f60c201 100644
--- a/tests/integration/ejb-multimodule/lib/pom.xml
+++ b/tests/integration/ejb-multimodule/lib/pom.xml
@@ -38,13 +38,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/ejb-multimodule/war/pom.xml b/tests/integration/ejb-multimodule/war/pom.xml
index 794c38f..b8bc406 100644
--- a/tests/integration/ejb-multimodule/war/pom.xml
+++ b/tests/integration/ejb-multimodule/war/pom.xml
@@ -44,8 +44,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/ejb-test-webapp/pom.xml b/tests/integration/ejb-test-webapp/pom.xml
index a691de6..dedb681 100644
--- a/tests/integration/ejb-test-webapp/pom.xml
+++ b/tests/integration/ejb-test-webapp/pom.xml
@@ -38,19 +38,19 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1-b07</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml
index 710e2e4..26ce6ec 100644
--- a/tests/integration/j-376/pom.xml
+++ b/tests/integration/j-376/pom.xml
@@ -50,8 +50,8 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
diff --git a/tests/integration/j-59/lib/pom.xml b/tests/integration/j-59/lib/pom.xml
index ffc43a6..04e6fce 100644
--- a/tests/integration/j-59/lib/pom.xml
+++ b/tests/integration/j-59/lib/pom.xml
@@ -38,13 +38,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/jersey-2137/pom.xml b/tests/integration/jersey-2137/pom.xml
index 0114c5a..183fb9f 100644
--- a/tests/integration/jersey-2137/pom.xml
+++ b/tests/integration/jersey-2137/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,13 +48,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/jersey-2154/pom.xml b/tests/integration/jersey-2154/pom.xml
index faf5e55..090d1b3 100644
--- a/tests/integration/jersey-2154/pom.xml
+++ b/tests/integration/jersey-2154/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/servlet-request-wrapper-binding-2/pom.xml b/tests/integration/servlet-request-wrapper-binding-2/pom.xml
index b47561b..bc53aaf 100644
--- a/tests/integration/servlet-request-wrapper-binding-2/pom.xml
+++ b/tests/integration/servlet-request-wrapper-binding-2/pom.xml
@@ -42,9 +42,9 @@
<artifactId>jersey-servlet-portability</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java
index db50a72..e2afcf1 100644
--- a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java
+++ b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java
@@ -31,6 +31,7 @@
import java.util.Set;
import java.util.function.Supplier;
+import javax.servlet.http.HttpUpgradeHandler;
import javax.ws.rs.core.GenericType;
import javax.inject.Inject;
@@ -402,6 +403,11 @@
}
@Override
+ public void setContentLengthLong(long length) {
+ getHttpServletResponse().setContentLengthLong(length);
+ }
+
+ @Override
public void setContentType(String s) {
getHttpServletResponse().setContentType(s);
}
@@ -825,6 +831,21 @@
public void login(String u, String p) throws ServletException {
getHttpServletRequest().login(u, p);
}
+
+ @Override
+ public String changeSessionId() {
+ return getHttpServletRequest().changeSessionId();
+ }
+
+ @Override
+ public long getContentLengthLong() {
+ return getHttpServletRequest().getContentLengthLong();
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
+ return getHttpServletRequest().upgrade(aClass);
+ }
}
private static ServiceLocator getServiceLocator(InjectionManager injectionManager) {
diff --git a/tests/integration/servlet-request-wrapper-binding/pom.xml b/tests/integration/servlet-request-wrapper-binding/pom.xml
index 8e869c4..722a2de 100644
--- a/tests/integration/servlet-request-wrapper-binding/pom.xml
+++ b/tests/integration/servlet-request-wrapper-binding/pom.xml
@@ -42,9 +42,9 @@
<artifactId>jersey-servlet-portability</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tests/integration/spring4/pom.xml b/tests/integration/spring4/pom.xml
index 9333385..668a299 100644
--- a/tests/integration/spring4/pom.xml
+++ b/tests/integration/spring4/pom.xml
@@ -39,9 +39,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml
index f6f924b..bbc277b 100644
--- a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml
+++ b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml
@@ -123,9 +123,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml
index 79188df..10bd0df 100644
--- a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml
+++ b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml
@@ -104,9 +104,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml
index 370de6d..6aeb7c2 100644
--- a/tests/osgi/functional/pom.xml
+++ b/tests/osgi/functional/pom.xml
@@ -96,8 +96,8 @@
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -290,12 +290,12 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
+ <artifactId>jakarta.el</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -372,8 +372,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
<scope>test</scope>
</dependency>
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java
index 4f299ae..b054698 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java
@@ -71,7 +71,7 @@
mavenBundle().groupId("org.hibernate.validator").artifactId("hibernate-validator").versionAsInProject(),
mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").versionAsInProject(),
mavenBundle().groupId("com.fasterxml").artifactId("classmate").versionAsInProject(),
- mavenBundle().groupId("org.glassfish").artifactId("javax.el").versionAsInProject()
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.el").versionAsInProject()
));
options = Helper.addPaxExamMavenLocalRepositoryProperty(options);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java
index 2f1a340..c0bf924 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java
@@ -57,13 +57,13 @@
mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.moxy").versionAsInProject(),
mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.core").versionAsInProject(),
mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.asm").versionAsInProject(),
- mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(),
// validation
mavenBundle().groupId("org.hibernate.validator").artifactId("hibernate-validator").versionAsInProject(),
mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").versionAsInProject(),
mavenBundle().groupId("com.fasterxml").artifactId("classmate").versionAsInProject(),
- mavenBundle().groupId("org.glassfish").artifactId("javax.el").versionAsInProject()
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.el").versionAsInProject()
));
return Helper.asArray(options);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java
index 6ab4c56..5369d8b 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java
@@ -69,7 +69,7 @@
// JSON processing.
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-processing")
.versionAsInProject(),
- mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(),
mavenBundle().groupId("org.glassfish").artifactId("jsonp-jaxrs").versionAsInProject()
));
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java
index 48480b2..dbc299c 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java
@@ -67,7 +67,7 @@
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-sse").versionAsInProject(),
- mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.servlet").artifactId("jakarta.servlet-api").versionAsInProject(),
mavenBundle().groupId("org.glassfish.grizzly").artifactId("grizzly-http-servlet").versionAsInProject(),
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
.versionAsInProject(),
@@ -75,7 +75,7 @@
.versionAsInProject(),
// MBR/MBW for JSON-P is on the classpath.
- mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject()
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject()
));
options = Helper.addPaxExamMavenLocalRepositoryProperty(options);
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 067fa8b..f377ae7 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
@@ -129,7 +129,7 @@
systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
// javax.annotation has to go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
junitBundles(),
@@ -138,7 +138,7 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
@@ -170,7 +170,8 @@
// Jersey Injection provider
mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
// Jaxb - api
- mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject().versionAsInProject()
+ mavenBundle().groupId("com.sun.activation").artifactId("jakarta.activation").versionAsInProject(),
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject()
));
}
diff --git a/travis.sh b/travis.sh
index 7cbecfd..ead82d5 100644
--- a/travis.sh
+++ b/travis.sh
@@ -25,7 +25,7 @@
bash -c "while true; do tail -5 $BUILD_OUTPUT; sleep $PING_SLEEP; done" &
PING_LOOP_PID=$!
-mvn -e -U -B clean install -Pstaging $1 >> $BUILD_OUTPUT 2>&1
+mvn -e -U -B -Pstaging clean install $1 >> $BUILD_OUTPUT 2>&1
# The build finished without returning an error so dump a tail of the output
dump_output
