Author: dkulp
Date: Wed Aug 14 18:04:13 2013
New Revision: 1513985
URL: http://svn.apache.org/r1513985
Log:
Merged revisions 1513977 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1513977 | dkulp | 2013-08-14 13:52:09 -0400 (Wed, 14 Aug 2013) | 2 lines
[CXF-5206] Update to latest Jetty
........
Modified:
cxf/branches/2.7.x-fixes/parent/pom.xml
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1513985&r1=1513984&r2=1513985&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Wed Aug 14 18:04:13 2013
@@ -127,7 +127,7 @@
<cxf.joda.time.version2>2.1</cxf.joda.time.version2>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.3.4</cxf.jettison.version>
- <cxf.jetty.version>8.1.7.v20120910</cxf.jetty.version>
+ <cxf.jetty.version>8.1.12.v20130726</cxf.jetty.version>
<cxf.jetty.osgi.version>[7.2,8.2)</cxf.jetty.osgi.version>
<cxf.jibx.version>1.2.4.5</cxf.jibx.version>
<cxf.junit.version>4.11</cxf.junit.version>
Modified:
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml?rev=1513985&r1=1513984&r2=1513985&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/resources/jaxrs_async/WEB-INF/web.xml
Wed Aug 14 18:04:13 2013
@@ -2,7 +2,7 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+ "http://java.sun.com/dtd/web-app_2_5.dtd";>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -42,6 +42,7 @@
org.apache.cxf.transport.servlet.CXFServlet
</servlet-class>
<load-on-startup>1</load-on-startup>
+ <async-supported>true</async-supported>
</servlet>
<servlet-mapping>
