Author: dkulp Date: Tue Apr 10 18:05:12 2012 New Revision: 1311893 URL: http://svn.apache.org/viewvc?rev=1311893&view=rev Log: Merged revisions 1311423 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1311423 | dkulp | 2012-04-09 16:33:37 -0400 (Mon, 09 Apr 2012) | 9 lines Merged revisions 1311258 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1311258 | dkulp | 2012-04-09 10:31:34 -0400 (Mon, 09 Apr 2012) | 2 lines Update to new Karaf ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/parent/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1311893&r1=1311892&r2=1311893&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue Apr 10 18:05:12 2012 @@ -128,7 +128,7 @@ <!-- various OSGi related versions --> <cxf.aries.version>0.3.1</cxf.aries.version> <cxf.osgi.version>4.2.0</cxf.osgi.version> - <cxf.karaf.version>2.2.5</cxf.karaf.version> + <cxf.karaf.version>2.2.6</cxf.karaf.version> <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version> <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
