You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/01/11 01:11:53 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1705] Update
javax.servlet to jakarta.servlet (#1510)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new af7d398 [SCB-1705] Update javax.servlet to jakarta.servlet (#1510)
af7d398 is described below
commit af7d39840a112ef24dd1c620b22708c53c8d6a15
Author: Ang Li <31...@users.noreply.github.com>
AuthorDate: Sat Jan 11 09:11:43 2020 +0800
[SCB-1705] Update javax.servlet to jakarta.servlet (#1510)
---
demo/demo-schema/pom.xml | 4 ++--
foundations/foundation-common/pom.xml | 6 ++++--
integration-tests/pom.xml | 4 ++--
java-chassis-dependencies/default/pom.xml | 14 +++++++-------
java-chassis-distribution/src/release/LICENSE | 4 ++--
.../java-chassis-spring-boot-starter-servlet/pom.xml | 6 +++---
swagger/swagger-generator/generator-core/pom.xml | 4 ++--
transports/transport-rest/transport-rest-servlet/pom.xml | 4 ++--
8 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/demo/demo-schema/pom.xml b/demo/demo-schema/pom.xml
index 8030ccb..999757e 100644
--- a/demo/demo-schema/pom.xml
+++ b/demo/demo-schema/pom.xml
@@ -49,8 +49,8 @@
<artifactId>transport-rest-servlet</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/foundations/foundation-common/pom.xml b/foundations/foundation-common/pom.xml
index d877b83..75bbc34 100644
--- a/foundations/foundation-common/pom.xml
+++ b/foundations/foundation-common/pom.xml
@@ -67,10 +67,12 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</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.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 393abb9..7617afe 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -116,8 +116,8 @@
<artifactId>handler-loadbalance</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.servicecomb</groupId>
diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml
index b93c3eb..ce9da32 100644
--- a/java-chassis-dependencies/default/pom.xml
+++ b/java-chassis-dependencies/default/pom.xml
@@ -68,7 +68,6 @@
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-inject.version>1</javax-inject.version>
<javax-resource.version>1.5</javax-resource.version>
- <javax-servlet.version>4.0.1</javax-servlet.version>
<javax-transaction.version>1.2</javax-transaction.version>
<javax-validation.version>2.0.1.Final</javax-validation.version>
<javax-ws-rs.version>2.1</javax-ws-rs.version>
@@ -97,6 +96,7 @@
<rxnetty.version>0.4.9</rxnetty.version>
<seanyinx.version>1.0.0</seanyinx.version>
<servo.version>0.12.25</servo.version>
+ <servlet-api.version>4.0.3</servlet-api.version>
<slf4j.version>1.7.26</slf4j.version>
<snakeyaml.version>1.24</snakeyaml.version>
<spectator.version>0.83.0</spectator.version>
@@ -661,6 +661,12 @@
</dependency>
<dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation.version}</version>
@@ -679,12 +685,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet.version}</version>
- </dependency>
-
- <dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>${javax-transaction.version}</version>
diff --git a/java-chassis-distribution/src/release/LICENSE b/java-chassis-distribution/src/release/LICENSE
index 40a22be..8c3fe1d 100755
--- a/java-chassis-distribution/src/release/LICENSE
+++ b/java-chassis-distribution/src/release/LICENSE
@@ -276,7 +276,7 @@ You can find a copy of the License at licenses/LICENSE-cddl
* JavaMail API jar (javax.mail:mailapi:1.4.3 - http://java.sun.com/projects/javamail/mailapi)
* Expression Language 3.0 (org.glassfish:javax.el:3.0.0 - http://el-spec.java.net)
-* Java Servlet API (javax.servlet:javax.servlet-api:4.0.1 - http://servlet-spec.java.net)
+* Jakarta Servlet API (jakarta.servlet:jakarta.servlet-api:4.0.3 - https://projects.eclipse.org/projects/ee4j.servlet)
* javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:2.1 - http://jax-rs-spec.java.net)
* Jersey Apache HTTP Client 4.x (com.sun.jersey.contribs:jersey-apache-client4:2.27 - https://jersey.java.net/jersey-contribs/jersey-apache-client4/)
* jersey-client (com.sun.jersey:jersey-client:2.27 - https://jersey.java.net/jersey-client/)
@@ -638,4 +638,4 @@ For details, see their respective project links.
* vertx-auth-common (io.vertx:vertx-auth-common:3.8.3 - https://github.com/vert-x3/vertx-auth)
* vertx-web-common (io.vertx:vertx-web-common:3.8.3 - https://github.com/vert-x3/vertx-web)
* vertx-web (io.vertx:vertx-web:3.8.3 - https://github.com/vert-x3/vertx-web)
-* nacos-client (com.alibaba.nacos:1.1.4 - https://github.com/alibaba/nacos)
\ No newline at end of file
+* nacos-client (com.alibaba.nacos:1.1.4 - https://github.com/alibaba/nacos)
diff --git a/java-chassis-spring-boot/java-chassis-spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml b/java-chassis-spring-boot/java-chassis-spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml
index 450b7fa..0e1203c 100644
--- a/java-chassis-spring-boot/java-chassis-spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml
+++ b/java-chassis-spring-boot/java-chassis-spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml
@@ -43,8 +43,8 @@
<artifactId>transport-rest-servlet</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
@@ -53,4 +53,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/swagger/swagger-generator/generator-core/pom.xml b/swagger/swagger-generator/generator-core/pom.xml
index 8214d62..3b5b774 100644
--- a/swagger/swagger-generator/generator-core/pom.xml
+++ b/swagger/swagger-generator/generator-core/pom.xml
@@ -36,8 +36,8 @@
<artifactId>foundation-config</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
diff --git a/transports/transport-rest/transport-rest-servlet/pom.xml b/transports/transport-rest/transport-rest-servlet/pom.xml
index b82266d..23cc5ef 100644
--- a/transports/transport-rest/transport-rest-servlet/pom.xml
+++ b/transports/transport-rest/transport-rest-servlet/pom.xml
@@ -29,8 +29,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>