Author: coheigea Date: Thu Aug 1 08:23:28 2013 New Revision: 1509107 URL: http://svn.apache.org/r1509107 Log: Merged revisions 1509105 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1509105 | coheigea | 2013-08-01 09:20:59 +0100 (Thu, 01 Aug 2013) | 10 lines Merged revisions 1509104 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1509104 | coheigea | 2013-08-01 09:18:12 +0100 (Thu, 01 Aug 2013) | 2 lines Add OSGi properties for Ehcache for the sts ........ ........ Modified: cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml Modified: cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml?rev=1509107&r1=1509106&r2=1509107&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml (original) +++ cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml Thu Aug 1 08:23:28 2013 @@ -30,6 +30,11 @@ <version>2.6.10-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> + <properties> + <cxf.osgi.import> + net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)", + </cxf.osgi.import> + </properties> <dependencies> <dependency>
