Author: dkulp
Date: Wed Jun 13 15:50:59 2012
New Revision: 1349926
URL: http://svn.apache.org/viewvc?rev=1349926&view=rev
Log:
[CXF-3799] Dropping Java5 allows updating to Jetty 8.x
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/transports/http-jetty/pom.xml
cxf/trunk/systests/jaxrs/pom.xml
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1349926&r1=1349925&r2=1349926&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Jun 13 15:50:59 2012
@@ -102,7 +102,7 @@
<cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
- <cxf.jetty.version>7.5.4.v20111024</cxf.jetty.version>
+ <cxf.jetty.version>8.1.4.v20120524</cxf.jetty.version>
<cxf.jetty.osgi.version>[7.2,8.2)</cxf.jetty.osgi.version>
<cxf.maven.core.version>2.2.1</cxf.maven.core.version>
<cxf.msv.version>2011.1</cxf.msv.version>
@@ -757,6 +757,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1349926&r1=1349925&r2=1349926&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Wed Jun 13 15:50:59 2012
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api-2.5.artifact}</artifactId>
+ <artifactId>${cxf.servlet-api.artifact}</artifactId>
</dependency>
<dependency>
Modified: cxf/trunk/systests/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1349926&r1=1349925&r2=1349926&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Wed Jun 13 15:50:59 2012
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp-2.1</artifactId>
+ <artifactId>jetty-jsp</artifactId>
<version>${cxf.jetty.version}</version>
</dependency>
<dependency>
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml?rev=1349926&r1=1349925&r2=1349926&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
Wed Jun 13 15:50:59 2012
@@ -45,7 +45,7 @@ http://www.springframework.org/schema/be
<property name="config"
value="src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties"
/>
</bean>
- <bean id="securityConstraint"
class="org.eclipse.jetty.http.security.Constraint">
+ <bean id="securityConstraint"
class="org.eclipse.jetty.util.security.Constraint">
<property name="name" value="BASIC" />
<property name="roles" value="admin" />
<property name="authenticate" value="true" />
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml?rev=1349926&r1=1349925&r2=1349926&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jettyDigestServer.xml
Wed Jun 13 15:50:59 2012
@@ -46,7 +46,7 @@ http://www.springframework.org/schema/be
<property name="config"
value="src/test/java/org/apache/cxf/systest/http_jetty/jetty-realm.properties"
/>
</bean>
- <bean id="securityConstraint"
class="org.eclipse.jetty.http.security.Constraint">
+ <bean id="securityConstraint"
class="org.eclipse.jetty.util.security.Constraint">
<property name="name" value="DIGEST" />
<property name="roles" value="admin" />
<property name="authenticate" value="true" />
