Author: ningjiang
Date: Tue Dec 28 09:48:58 2010
New Revision: 1053292
URL: http://svn.apache.org/viewvc?rev=1053292&view=rev
Log:
Merged revisions 1053290 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1053290 | ningjiang | 2010-12-28 17:44:38 +0800 (Tue, 28 Dec 2010) | 1 line
CXF-3187 upgrade Jetty version to 7.2.2
........
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 Tue Dec 28 09:48:58 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052990,1052993-1052994,1052996-1052997,1053114,1053119,1053123,1053239
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052990,1052993-1052994,1052996-1052997,1053114,1053119,1053123,1053239,1053290
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=1053292&r1=1053291&r2=1053292&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Tue Dec 28 09:48:58 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.1.v20101111</cxf.jetty.version>
+ <cxf.jetty.version>7.2.2.v20101205</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>
