Uptake Jakarta dependencies, Part I. (#4001)
Uptake new Jakarta dependencies: API & HK2, Yasson, JAXB impl, moxy, JSONP, Grizzly, EL
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>
