Author: dkulp Date: Mon Aug 8 16:31:20 2011 New Revision: 1155008 URL: http://svn.apache.org/viewvc?rev=1155008&view=rev Log: Merged revisions 1153225 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1153225 | dkulp | 2011-08-02 13:58:53 -0400 (Tue, 02 Aug 2011) | 9 lines Merged revisions 1153222 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1153222 | dkulp | 2011-08-02 13:52:57 -0400 (Tue, 02 Aug 2011) | 1 line [CXF-3694] Update jetty version ........ ................ 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' removed) 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=1155008&r1=1155007&r2=1155008&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.3.x-fixes/parent/pom.xml Mon Aug 8 16:31:20 2011 @@ -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.4.4.v20110707</cxf.jetty.version> + <cxf.jetty.version>7.4.5.v20110725</cxf.jetty.version> <cxf.msv.version>2010.2</cxf.msv.version> <cxf.rhino.version>1.7R2</cxf.rhino.version> <cxf.saaj.version>1.3</cxf.saaj.version>
