cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1534638 - in /cxf/trunk: osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Date Tue, 22 Oct 2013 14:04:09 GMT
Author: cschneider
Date: Tue Oct 22 14:04:09 2013
New Revision: 1534638

URL: http://svn.apache.org/r1534638
Log:
CXF-5321 Use only joda time 2.x

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1534638&r1=1534637&r2=1534638&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Tue Oct 22 14:04:09 2013
@@ -60,9 +60,7 @@
 
     <feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-specs</feature>
-        <!--bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle-->
-        <!-- temporary until we get an opensaml 2.6.0 bundle that can use the 2.x version
of joda-time -->
-        <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/1.6.2</bundle>
+        <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
         <bundle start-level='25' dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
         <bundle start-level='25' dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
         <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1534638&r1=1534637&r2=1534638&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Oct 22 14:04:09 2013
@@ -131,8 +131,8 @@
         <cxf.netty.version>4.0.7.Final</cxf.netty.version>
         <cxf.netty.version.range>[4,5)</cxf.netty.version.range>
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
-        <cxf.opensaml.version>2.5.3</cxf.opensaml.version>
-        <cxf.opensaml.osgi.version>2.5.3_1</cxf.opensaml.osgi.version>
+        <cxf.opensaml.version>2.6.0</cxf.opensaml.version>
+        <cxf.opensaml.osgi.version>2.6.0_2</cxf.opensaml.osgi.version>
         <cxf.opensaml.xmltooling.version>1.3.4-1</cxf.opensaml.xmltooling.version>
         <cxf.opensamlws.version>1.4.4-1</cxf.opensamlws.version>
         <cxf.rhino.version>1.7R2</cxf.rhino.version>



Mime
View raw message