Author: ningjiang
Date: Thu Dec 9 12:00:48 2010
New Revision: 1043917
URL: http://svn.apache.org/viewvc?rev=1043917&view=rev
Log:
Merged revisions 1043902 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1043902 | ningjiang | 2010-12-09 19:43:56 +0800 (Thu, 09 Dec 2010) | 1 line
CXF-3176 Update to latest Jetty version 7.2.1 from 7.2.0
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 12:00:48 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1043917&r1=1043916&r2=1043917&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Thu Dec 9 12:00:48 2010
@@ -67,7 +67,7 @@
<cxf.specs.jaxws.api.version>1.0</cxf.specs.jaxws.api.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
- <cxf.jetty.version>7.2.0.v20101020</cxf.jetty.version>
+ <cxf.jetty.version>7.2.1.v20101111</cxf.jetty.version>
<cxf.msv.version>2010.1</cxf.msv.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.saaj.version>1.3</cxf.saaj.version>
