You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2020/01/19 17:06:05 UTC
[cxf] branch CXF-7949_jakarta-servlet created (now 2ef4c7a)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git.
at 2ef4c7a [CXF-7949] Upgrade to Tomcat 9.0.30
This branch includes the following new commits:
new 2669521 [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3
new d4ee432 [CXF-7949] Remove cxf.servlet-api-2.5.* properties
new 2ef4c7a [CXF-7949] Upgrade to Tomcat 9.0.30
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[cxf] 02/03: [CXF-7949] Remove cxf.servlet-api-2.5.* properties
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d4ee4328c4a7fc60ed77af2fccf09ce0e725b436
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Jan 19 18:03:55 2020 +0100
[CXF-7949] Remove cxf.servlet-api-2.5.* properties
---
parent/pom.xml | 7 -------
rt/transports/http-netty/netty-server/pom.xml | 1 +
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index af49137..2f0c415 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,8 +184,6 @@
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
<cxf.rxjava2.version>2.2.11</cxf.rxjava2.version>
- <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
- <cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>4.0.3</cxf.servlet-api.version>
@@ -2147,11 +2145,6 @@
<version>${cxf.servlet-api.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>${cxf.servlet-api-2.5.artifact}</artifactId>
- <version>${cxf.servlet-api-2.5.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<version>1.8.4</version>
diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml
index 99f3867..e0d57b3 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -65,6 +65,7 @@
<!-- we don't implement the servlet 3.0 specification here -->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
[cxf] 01/03: [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 26695210956b099932d241869a1232791b159529
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Jan 19 18:01:29 2020 +0100
[CXF-7949] Upgrade to Jakarta Servlet API 4.0.3
---
.../src/main/release/samples/oauth/client/pom.xml | 4 ++--
.../src/main/release/samples/ws_eventing/pom.xml | 6 ++---
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 2 +-
parent/pom.xml | 6 ++---
rt/frontend/jaxrs/pom.xml | 4 ++--
.../jaxrs/impl/tl/ThreadLocalServletContext.java | 28 ++++++++++++++++++++++
6 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/distribution/src/main/release/samples/oauth/client/pom.xml b/distribution/src/main/release/samples/oauth/client/pom.xml
index cf4cafd..4c78932 100644
--- a/distribution/src/main/release/samples/oauth/client/pom.xml
+++ b/distribution/src/main/release/samples/oauth/client/pom.xml
@@ -84,8 +84,8 @@
<version>20100527</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<artifactId>standard</artifactId>
diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml b/distribution/src/main/release/samples/ws_eventing/pom.xml
index 95b7aed..93461a0 100644
--- a/distribution/src/main/release/samples/ws_eventing/pom.xml
+++ b/distribution/src/main/release/samples/ws_eventing/pom.xml
@@ -62,9 +62,9 @@
<version>${project.version}</version>
</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>4.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index 57ba7fc..3e53b39 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -66,7 +66,7 @@ public class NoAriesBlueprintTest extends OSGiTestSupport {
mvnBundle("org.apache.cxf", "cxf-rt-bindings-xml"),
mvnBundle("org.apache.cxf", "cxf-rt-bindings-soap"),
mvnBundle("org.apache.cxf", "cxf-rt-frontend-simple"),
- mvnBundle("javax.servlet", "javax.servlet-api"),
+ mvnBundle("jakarta.servlet", "jakarta.servlet-api"),
mvnBundle("org.apache.cxf", "cxf-rt-transports-http"),
mvnBundle("org.apache.cxf", "cxf-rt-frontend-jaxws"),
junitBundles()
diff --git a/parent/pom.xml b/parent/pom.xml
index 4109cda..af49137 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,9 +186,9 @@
<cxf.rxjava2.version>2.2.11</cxf.rxjava2.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
- <cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>
- <cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group>
- <cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
+ <cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
+ <cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
+ <cxf.servlet-api.version>4.0.3</cxf.servlet-api.version>
<cxf.slf4j.version>1.7.29</cxf.slf4j.version>
<cxf.snakeyaml.version>1.25</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 2ef4789..5c16df0 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -120,8 +120,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>
<version>${cxf.servlet-api.version}</version>
<scope>provided</scope>
<optional>true</optional>
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
index 687a729..48c6196 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
@@ -269,4 +269,32 @@ public class ThreadLocalServletContext extends AbstractThreadLocalProxy<ServletC
return get().getVirtualServerName();
}
+ //Servlet 4.0
+ public Dynamic addJspFile(String servletName, String jspFile) {
+ return get().addJspFile(servletName, jspFile);
+ }
+
+ public int getSessionTimeout() {
+ return get().getSessionTimeout();
+ }
+
+ public void setSessionTimeout(int sessionTimeout) {
+ get().setSessionTimeout(sessionTimeout);
+ }
+
+ public String getRequestCharacterEncoding() {
+ return get().getRequestCharacterEncoding();
+ }
+
+ public void setRequestCharacterEncoding(String encoding) {
+ get().setRequestCharacterEncoding(encoding);
+ }
+
+ public String getResponseCharacterEncoding() {
+ return get().getResponseCharacterEncoding();
+ }
+
+ public void setResponseCharacterEncoding(String encoding) {
+ get().setResponseCharacterEncoding(encoding);
+ }
}
[cxf] 03/03: [CXF-7949] Upgrade to Tomcat 9.0.30
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2ef4c7ab1578989f94461867f5c17ef15960c167
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Jan 19 18:05:16 2020 +0100
[CXF-7949] Upgrade to Tomcat 9.0.30
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2f0c415..3eca0a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -202,7 +202,7 @@
<cxf.swagger2.version>1.6.0</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
<cxf.tika.version>1.23</cxf.tika.version>
- <cxf.tomcat.version>8.5.50</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.30</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
<cxf.undertow.version>2.0.28.Final</cxf.undertow.version>