Author: dkulp
Date: Fri Apr 6 14:30:04 2012
New Revision: 1310347
URL: http://svn.apache.org/viewvc?rev=1310347&view=rev
Log:
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.5.x-fixes/parent/pom.xml
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=1310347&r1=1310346&r2=1310347&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/parent/pom.xml Fri Apr 6 14:30:04 2012
@@ -127,7 +127,7 @@
<cxf.fastinfoset.bundle.version>1.2.7_4</cxf.fastinfoset.bundle.version>
<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>
