You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/11/11 16:47:45 UTC
[4/4] cxf git commit: Update poms to use jettys apache-jsp module to
prepare for Jetty 9.3
Update poms to use jettys apache-jsp module to prepare for Jetty 9.3
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aad8b398
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aad8b398
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aad8b398
Branch: refs/heads/master
Commit: aad8b398eab1a4c85e45646af95ede8297178fe8
Parents: e554e21
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Nov 11 10:12:34 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 11 10:12:34 2015 -0500
----------------------------------------------------------------------
systests/cdi/pom.xml | 15 +++++++++++++--
systests/jaxrs/pom.xml | 2 +-
systests/jibx/jaxrs-jibx/pom.xml | 2 +-
systests/rs-http-sci/pom.xml | 2 +-
systests/tracing/pom.xml | 2 +-
5 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad8b398/systests/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index 784fe0f..385c053 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -35,7 +35,7 @@
<cxf.glassfish.el.version>3.0-b01</cxf.glassfish.el.version>
<cxf.surefire.fork.vmargs>-XX:MaxPermSize=192m</cxf.surefire.fork.vmargs>
<cxf.server.launcher.vmargs>-XX:MaxPermSize=192m</cxf.server.launcher.vmargs>
- <cxf.tomcat.version>7.0.52</cxf.tomcat.version>
+ <cxf.tomcat.version>8.0.28</cxf.tomcat.version>
</properties>
<dependencies>
<dependency>
@@ -89,8 +89,14 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${cxf.jetty.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jasper</groupId>
+ <artifactId>apache-jsp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -160,6 +166,11 @@
<version>${cxf.tomcat.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
<version>${cxf.ahc.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad8b398/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 33cd1ac..653db0a 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -169,7 +169,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${cxf.jetty.version}</version>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad8b398/systests/jibx/jaxrs-jibx/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jibx/jaxrs-jibx/pom.xml b/systests/jibx/jaxrs-jibx/pom.xml
index 08c5e3e..3d56496 100644
--- a/systests/jibx/jaxrs-jibx/pom.xml
+++ b/systests/jibx/jaxrs-jibx/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${cxf.jetty.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad8b398/systests/rs-http-sci/pom.xml
----------------------------------------------------------------------
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index d1b4bed..f2cc852 100644
--- a/systests/rs-http-sci/pom.xml
+++ b/systests/rs-http-sci/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${cxf.jetty.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad8b398/systests/tracing/pom.xml
----------------------------------------------------------------------
diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml
index d227207..ac66e9b 100644
--- a/systests/tracing/pom.xml
+++ b/systests/tracing/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${cxf.jetty.version}</version>
</dependency>
<dependency>