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 2012/01/13 20:46:54 UTC
svn commit: r1231273 - in /cxf/branches/2.5.x-fixes: ./ parent/pom.xml
Author: dkulp
Date: Fri Jan 13 19:46:54 2012
New Revision: 1231273
URL: http://svn.apache.org/viewvc?rev=1231273&view=rev
Log:
Merged revisions 1231212 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1231212 | dkulp | 2012-01-13 13:03:32 -0500 (Fri, 13 Jan 2012) | 1 line
[CXF-4024] Update jetty version
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 13 19:46:54 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229348,1229476,1229663,1229965,1230218,1230222,1230787,1230800
+/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229348,1229476,1229663,1229965,1230218,1230222,1230787,1230800,1231212
Modified: cxf/branches/2.5.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1231273&r1=1231272&r2=1231273&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/parent/pom.xml Fri Jan 13 19:46:54 2012
@@ -76,7 +76,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.3.v20111011</cxf.jetty.version>
+ <cxf.jetty.version>7.5.4.v20111024</cxf.jetty.version>
<cxf.maven.core.version>2.2.1</cxf.maven.core.version>
<cxf.msv.version>2011.1</cxf.msv.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>