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 2013/08/20 16:49:01 UTC
svn commit: r1515836 - in /cxf/trunk:
osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Author: dkulp
Date: Tue Aug 20 14:49:01 2013
New Revision: 1515836
URL: http://svn.apache.org/r1515836
Log:
Fix the features.xml file for the latest wss4j requirements
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=1515836&r1=1515835&r2=1515836&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Tue Aug 20 14:49:01 2013
@@ -60,7 +60,9 @@
<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>
+ <!--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: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>
@@ -70,7 +72,7 @@
<bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
<bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
<bundle start-level='30' dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
-
+ <bundle start-level='30' dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${cxf.jasypt.bundle.version}</bundle>
<bundle start-level='30'>mvn:org.apache.wss4j/wss4j-bindings-wsu10/${cxf.wss4j.version}</bundle>
<bundle start-level='30'>mvn:org.apache.wss4j/wss4j-bindings-wss10/${cxf.wss4j.version}</bundle>
<bundle start-level='30'>mvn:org.apache.wss4j/wss4j-bindings-wss11/${cxf.wss4j.version}</bundle>
@@ -234,7 +236,7 @@
<feature name="cxf-databinding-jibx" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-tools</feature>
- <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version2}</bundle>
+ <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
<bundle start-level='40' dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${cxf.xpp3.bundle.version}</bundle>
<bundle start-level='40' dependency='true'>mvn:org.jibx/jibx-run/${cxf.jibx.version}</bundle>
<bundle start-level='40' dependency='true'>mvn:org.jibx/jibx-bind/${cxf.jibx.version}</bundle>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1515836&r1=1515835&r2=1515836&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Aug 20 14:49:01 2013
@@ -106,6 +106,7 @@
<cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
<cxf.geronimo.servlet25.version>1.1.2</cxf.geronimo.servlet25.version>
<cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
+ <cxf.jasypt.bundle.version>1.9.0_1</cxf.jasypt.bundle.version>
<cxf.javax.ws.rs.version>2.0</cxf.javax.ws.rs.version>
<cxf.jaxb21.version>2.1</cxf.jaxb21.version>
<cxf.jaxb21.impl.version>2.1.13</cxf.jaxb21.impl.version>
@@ -117,8 +118,7 @@
<cxf.jaxb.version>${cxf.jaxb21.version}</cxf.jaxb.version>
<cxf.jaxb.impl.version>${cxf.jaxb21.impl.version}</cxf.jaxb.impl.version>
<cxf.jaxb.xjc.version>${cxf.jaxb21.xjc.version}</cxf.jaxb.xjc.version>
- <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
- <cxf.joda.time.version2>2.1</cxf.joda.time.version2>
+ <cxf.joda.time.version>2.2</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.3.4</cxf.jettison.version>
<cxf.jetty.version>8.1.12.v20130726</cxf.jetty.version>