This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 528b351 [CXF-8193]upgrade to jetty 9.4.25.v20191220
528b351 is described below
commit 528b35178ec31860cf5ad2095d6f3cc3c951d914
Author: Freeman Fang
AuthorDate: Wed Jan 15 09:40:22 2020 -0500
[CXF-8193]upgrade to jetty 9.4.25.v20191220
---
parent/pom.xml | 2 +-
.../resources/jaxrs_dispatch/WEB-INF/beans.xml | 4 ++--
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 26 ++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 66222ec..7adccab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
1.4.0
[9.2,10)
${cxf.jetty9.version}
-9.4.24.v20191120
+9.4.25.v20191220
3.1
2.9.4
1.1.13
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
index 3a510a9..a1e344d 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
@@ -48,7 +48,7 @@
-
+
@@ -92,4 +92,4 @@
-
\ No newline at end of file
+
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
index b9fe1c8..3795f7c 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
@@ -59,6 +59,32 @@
/the/*
+RedirectIncludeCXFServlet
+Redirect CXF Servlet
+
+org.apache.cxf.transport.servlet.CXFServlet
+
+
+redirects-list
+
+ /(\w)+.html
+
+
+
+redirect-with-include
+true
+
+
+redirect-servlet-path
+/static
+
+1
+
+
+RedirectIncludeCXFServlet
+/book_include.html
+
+
RedirectCXFServlet
Redirect CXF Servlet
