Author: dkulp
Date: Mon Feb 6 21:26:25 2012
New Revision: 1241185
URL: http://svn.apache.org/viewvc?rev=1241185&view=rev
Log:
Merged revisions 1238818 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1238818 | dkulp | 2012-01-31 16:28:29 -0500 (Tue, 31 Jan 2012) | 1 line
Update karaf version we use
........
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/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1241185&r1=1241184&r2=1241185&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/parent/pom.xml Mon Feb 6 21:26:25 2012
@@ -130,7 +130,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.4</cxf.karaf.version>
+ <cxf.karaf.version>2.2.5</cxf.karaf.version>
<cxf.ehcache.bundle.version>2.4.3_1</cxf.ehcache.bundle.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
