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/04/06 18:43:18 UTC
svn commit: r1310468 - in /cxf/branches/2.4.x-fixes: ./ parent/pom.xml
Author: dkulp
Date: Fri Apr 6 16:43:17 2012
New Revision: 1310468
URL: http://svn.apache.org/viewvc?rev=1310468&view=rev
Log:
Merged revisions 1310347 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1310347 | dkulp | 2012-04-06 10:30:04 -0400 (Fri, 06 Apr 2012) | 9 lines
Merged revisions 1310317 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1310317 | dkulp | 2012-04-06 09:33:56 -0400 (Fri, 06 Apr 2012) | 2 lines
Use released bundle for ehcache
........
........
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=1310468&r1=1310467&r2=1310468&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Fri Apr 6 16:43:17 2012
@@ -123,7 +123,7 @@
<cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
<cxf.ehcache.version>2.5.1</cxf.ehcache.version>
- <cxf.ehcache.bundle.version>2.5.1_1-SNAPSHOT</cxf.ehcache.bundle.version>
+ <cxf.ehcache.bundle.version>2.5.1_1</cxf.ehcache.bundle.version>
<!-- various OSGi related versions -->
<cxf.aries.version>0.3.1</cxf.aries.version>