cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1509126 - /cxf/branches/2.6.x-fixes/services/sts/sts-core/pom.xml
Date Thu, 01 Aug 2013 08:53:42 GMT
Author: coheigea
Date: Thu Aug  1 08:53:42 2013
New Revision: 1509126

URL: http://svn.apache.org/r1509126
Log:
Merged revisions 1509116 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1509116 | coheigea | 2013-08-01 09:40:47 +0100 (Thu, 01 Aug 2013) | 10 lines

  Merged revisions 1509115 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1509115 | coheigea | 2013-08-01 09:35:24 +0100 (Thu, 01 Aug 2013) | 2 lines

    Correcting ehcache version thing

  ........

........

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=1509126&r1=1509125&r2=1509126&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:53:42 2013
@@ -30,11 +30,6 @@
         <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>
@@ -112,6 +107,7 @@
                             org.apache.cxf.*;version=${project.version},
                             javax.xml.ws*;version="[0.0,3)",
                             org.springframework.ldap*;resolution:=optional,
+                            net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
                             *
                         </Import-Package>
                         <Bundle-SymbolicName>org.apache.cxf.services.sts.core</Bundle-SymbolicName>



Mime
View raw message