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 <[email protected]> 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); + } }
