This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch juneau-8.1.4-branch
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/juneau-8.1.4-branch by this
push:
new 272107bfa Upgrade to jakarta.servlet
272107bfa is described below
commit 272107bfae268f5a5d420fc04b516d1b6e3119c9
Author: James Bognar <[email protected]>
AuthorDate: Wed Oct 16 12:17:00 2024 -0400
Upgrade to jakarta.servlet
---
juneau-examples/juneau-examples-rest/pom.xml | 4 ++--
juneau-microservice/juneau-microservice-core/pom.xml | 4 ++--
juneau-microservice/juneau-microservice-ftest/pom.xml | 4 ++--
juneau-microservice/juneau-microservice-jetty/pom.xml | 4 ++--
juneau-rest/juneau-rest-client-utest/pom.xml | 4 ++--
juneau-rest/juneau-rest-mock-utest/pom.xml | 4 ++--
juneau-rest/juneau-rest-mock/pom.xml | 4 ++--
juneau-rest/juneau-rest-server-jaxrs/pom.xml | 4 ++--
juneau-rest/juneau-rest-server-rdf/pom.xml | 4 ++--
juneau-rest/juneau-rest-server-utest/pom.xml | 4 ++--
juneau-rest/juneau-rest-server/pom.xml | 4 ++--
pom.xml | 6 +++---
12 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/juneau-examples/juneau-examples-rest/pom.xml
b/juneau-examples/juneau-examples-rest/pom.xml
index 57fb99162..8a3dab353 100644
--- a/juneau-examples/juneau-examples-rest/pom.xml
+++ b/juneau-examples/juneau-examples-rest/pom.xml
@@ -76,8 +76,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/juneau-microservice/juneau-microservice-core/pom.xml
b/juneau-microservice/juneau-microservice-core/pom.xml
index 116ec3b5d..d1572dce6 100644
--- a/juneau-microservice/juneau-microservice-core/pom.xml
+++ b/juneau-microservice/juneau-microservice-core/pom.xml
@@ -48,8 +48,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-microservice/juneau-microservice-ftest/pom.xml
b/juneau-microservice/juneau-microservice-ftest/pom.xml
index 24350357f..7ac2322da 100644
--- a/juneau-microservice/juneau-microservice-ftest/pom.xml
+++ b/juneau-microservice/juneau-microservice-ftest/pom.xml
@@ -71,8 +71,8 @@
<artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
diff --git a/juneau-microservice/juneau-microservice-jetty/pom.xml
b/juneau-microservice/juneau-microservice-jetty/pom.xml
index af2c234a5..1ff7abfcb 100644
--- a/juneau-microservice/juneau-microservice-jetty/pom.xml
+++ b/juneau-microservice/juneau-microservice-jetty/pom.xml
@@ -63,8 +63,8 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-rest/juneau-rest-client-utest/pom.xml
b/juneau-rest/juneau-rest-client-utest/pom.xml
index a9e2906c5..0ff6452d6 100644
--- a/juneau-rest/juneau-rest-client-utest/pom.xml
+++ b/juneau-rest/juneau-rest-client-utest/pom.xml
@@ -67,8 +67,8 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-rest/juneau-rest-mock-utest/pom.xml
b/juneau-rest/juneau-rest-mock-utest/pom.xml
index 5eb18d266..63ff0fe4f 100644
--- a/juneau-rest/juneau-rest-mock-utest/pom.xml
+++ b/juneau-rest/juneau-rest-mock-utest/pom.xml
@@ -39,8 +39,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.juneau</groupId>
diff --git a/juneau-rest/juneau-rest-mock/pom.xml
b/juneau-rest/juneau-rest-mock/pom.xml
index b4a544910..5f1b9dccd 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -52,8 +52,8 @@
<artifactId>jakarta.activation</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
index ca4196cfc..1429eed2e 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
+++ b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
@@ -50,8 +50,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-rest/juneau-rest-server-rdf/pom.xml
b/juneau-rest/juneau-rest-server-rdf/pom.xml
index 282acee49..eb30a46b3 100644
--- a/juneau-rest/juneau-rest-server-rdf/pom.xml
+++ b/juneau-rest/juneau-rest-server-rdf/pom.xml
@@ -40,8 +40,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-rest/juneau-rest-server-utest/pom.xml
b/juneau-rest/juneau-rest-server-utest/pom.xml
index 646b3156b..3aa1e16cb 100644
--- a/juneau-rest/juneau-rest-server-utest/pom.xml
+++ b/juneau-rest/juneau-rest-server-utest/pom.xml
@@ -35,8 +35,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
diff --git a/juneau-rest/juneau-rest-server/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index bc4040e12..5d84d0f1e 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -45,8 +45,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
diff --git a/pom.xml b/pom.xml
index 1fa7949db..8c4656df6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<jena.version>3.10.0</jena.version>
<junit.version>4.11</junit.version>
<jaxrs.version>1.1.1</jaxrs.version>
- <servlet.version>3.1.0</servlet.version>
+ <servlet.version>4.0.2</servlet.version>
<httpclient.version>4.5.6</httpclient.version>
<jetty.version>9.4.13.v20181111</jetty.version>
<juneau.compare.version>8.0.0</juneau.compare.version>
@@ -72,8 +72,8 @@
<version>${jaxrs.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
