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 2012/08/22 15:43:38 UTC
svn commit: r1376043 - in /cxf/branches/2.5.5-features-fix: pom.xml
src/main/resources/features.xml
Author: dkulp
Date: Wed Aug 22 13:43:38 2012
New Revision: 1376043
URL: http://svn.apache.org/viewvc?rev=1376043&view=rev
Log:
Create a features file that will work for 2.5.5
Modified:
cxf/branches/2.5.5-features-fix/pom.xml
cxf/branches/2.5.5-features-fix/src/main/resources/features.xml
Modified: cxf/branches/2.5.5-features-fix/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.5-features-fix/pom.xml?rev=1376043&r1=1376042&r2=1376043&view=diff
==============================================================================
--- cxf/branches/2.5.5-features-fix/pom.xml (original)
+++ cxf/branches/2.5.5-features-fix/pom.xml Wed Aug 22 13:43:38 2012
@@ -31,6 +31,7 @@
<artifactId>apache-cxf</artifactId>
<packaging>pom</packaging>
<name>Apache CXF Karaf Features</name>
+ <version>2.5.5.1</version>
<description>Apache CXF Karaf Features</description>
<!-- The validate plugin will export these provided dependencies bundles' export packages first -->
Modified: cxf/branches/2.5.5-features-fix/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.5-features-fix/src/main/resources/features.xml?rev=1376043&r1=1376042&r2=1376043&view=diff
==============================================================================
--- cxf/branches/2.5.5-features-fix/src/main/resources/features.xml (original)
+++ cxf/branches/2.5.5-features-fix/src/main/resources/features.xml Wed Aug 22 13:43:38 2012
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="cxf-${project.version}">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="cxf-2.5.5">
<feature name="activemq" version="5.4.2">
@@ -42,7 +42,7 @@
</feature>
- <feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
+ <feature name="cxf-specs" version="2.5.5" resolver='(obr)'>
<bundle start-level='9'>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
<bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
@@ -55,172 +55,17 @@
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${cxf.servicemix.specs.version}</bundle>
</feature>
- <feature name='cxf-jaxb' version='${project.version}' resolver='(obr)'>
- <feature version="${project.version}">cxf-specs</feature>
+ <feature name='cxf-jaxb' version='2.5.5' resolver='(obr)'>
+ <feature version="2.5.5">cxf-specs</feature>
<bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
<bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
</feature>
<!-- Current the abdera bundle is not working as we expect -->
- <feature name='cxf-abdera' version='${project.version}' resolver='(obr)'>
-<<<<<<< HEAD
+ <feature name='cxf-abdera' version='2.5.5' resolver='(obr)'>
+ <feature version='2.5.5'>cxf-specs</feature>
<bundle dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${cxf.axiom.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${cxf.axiom.version}</bundle>
-=======
- <feature version='${project.version}'>cxf-specs</feature>
- <bundle start-level='35' dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.ws.commons.axiom/axiom-impl/${cxf.axiom.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.ws.commons.axiom/axiom-api/${cxf.axiom.version}</bundle>
-
- <bundle start-level='35'>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle>
-
- <!--bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.abdera/abdera-client/${cxf.abdera.version}</bundle>
- <bundle start-level='35'>mvn:org.apache.abdera/abdera-server/${cxf.abdera.version}</bundle-->
- </feature>
-
- <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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
- <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
- <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
- <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
- <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.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
- <bundle start-level='30'>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
- </feature>
-
- <feature name="cxf-core" version="${project.version}" resolver='(obr)'>
- <feature version='${project.version}'>cxf-specs</feature>
-
- <bundle start-level='30' dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
- <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
- <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
- <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
-
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-api/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-core/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-management/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>
- </feature>
- <feature name="cxf-ws-policy" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-core</feature>
- <bundle start-level='30' dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-policy/${project.version}</bundle>
- </feature>
- <feature name="cxf-ws-addr" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-ws-policy</feature>
- <feature version="${project.version}">cxf-bindings-soap</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle>
- </feature>
- <feature name="cxf-ws-rm" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-ws-policy</feature>
- <feature version="${project.version}">cxf-ws-addr</feature>
- <feature version="${project.version}">cxf-databinding-jaxb</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-rm/${project.version}</bundle>
- </feature>
- <feature name="cxf-ws-mex" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-ws-policy</feature>
- <feature version="${project.version}">cxf-ws-addr</feature>
- <feature version="${project.version}">cxf-jaxws</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-mex/${project.version}</bundle>
- </feature>
- <feature name="cxf-ws-security" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-ws-policy</feature>
- <feature version="${cxf.wss4j.version}">wss4j</feature>
- <feature version="${project.version}">cxf-ws-addr</feature>
- <bundle start-level='40' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
- </feature>
- <feature name="cxf-http" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-core</feature>
- <feature version="[2,4)">http-whiteboard</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
- </feature>
- <feature name="cxf-http-jetty" version="${project.version}" resolver='(obr)'>
- <feature version="[2,3)">cxf-http</feature>
- <feature version="[7,8)">jetty</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle>
- </feature>
- <feature name="cxf-bindings-soap" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-core</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-soap/${project.version}</bundle>
- </feature>
- <feature name="cxf-jaxws" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-core</feature>
- <feature version="${project.version}">cxf-databinding-jaxb</feature>
- <feature version="${project.version}">cxf-bindings-soap</feature>
- <feature version="${project.version}">cxf-http</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-simple/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxws/${project.version}</bundle>
- </feature>
-
- <feature name="cxf-jaxrs" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-core</feature>
- <feature version="${project.version}">cxf-http</feature>
-
- <bundle start-level="30" dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
-
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
- </feature>
-
- <feature name="cxf-rs-security-xml" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-jaxrs</feature>
- <feature version="${cxf.wss4j.version}">wss4j</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
- </feature>
-
- <feature name="cxf-rs-security-cors" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-jaxrs</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-cors/${project.version}</bundle>
- </feature>
-
-
- <feature name="cxf-rs-security-oauth" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-jaxrs</feature>
- <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauth-provider/${cxf.oauth.bundle.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-oauth/${project.version}</bundle>
- </feature>
-
-
- <feature name="cxf-rs-security-oauth2" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-jaxrs</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}</bundle>
- </feature>
-
- <feature name="cxf-databinding-aegis" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-core</feature>
- <feature version="${project.version}">cxf-bindings-soap</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-aegis/${project.version}</bundle>
- </feature>
- <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='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>
- <bundle start-level='40' dependency='true'>mvn:org.jibx/jibx-schema/${cxf.jibx.version}</bundle>
- <bundle start-level='40' dependency='true'>mvn:org.jibx/jibx-tools/${cxf.jibx.version}</bundle>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-jibx/${project.version}</bundle>
- </feature>
-
- <feature name="cxf-databinding-jaxb" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-core</feature>
- <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-jaxb/${project.version}</bundle>
- </feature>
->>>>>>> a3c4878... Merged revisions 1363939 via git cherry-pick from
-
<bundle>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
@@ -230,7 +75,7 @@
<bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-client/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-server/${cxf.abdera.version}</bundle-->
- <feature version='${project.version}'>cxf-jaxb</feature>
+ <feature version='2.5.5'>cxf-jaxb</feature>
</feature>
<feature name="opensaml" version="${cxf.opensaml.osgi.version}" resolver='(obr)'>
<bundle>mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
@@ -242,13 +87,13 @@
<bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
</feature>
- <feature name="cxf-saaj-impl" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-specs</feature>
+ <feature name="cxf-saaj-impl" version="2.5.5" resolver='(obr)'>
+ <feature version="2.5.5">cxf-specs</feature>
<bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
</feature>
- <feature name="cxf" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-specs</feature>
+ <feature name="cxf" version="2.5.5" resolver='(obr)'>
+ <feature version="2.5.5">cxf-specs</feature>
<bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
@@ -257,15 +102,15 @@
<bundle start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
<bundle start-level='20' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
- <feature version='${project.version}'>cxf-jaxb</feature>
+ <feature version='2.5.5'>cxf-jaxb</feature>
<feature version="[2,3)">http-whiteboard</feature>
<feature version="[3,4)">spring</feature>
<feature version="[1.2,2)">spring-dm</feature>
<feature version="[3,4)">spring-jms</feature>
<feature version="${cxf.wss4j.version}">wss4j</feature>
<feature version="[7.2,8)">jetty</feature>
- <feature version='${project.version}'>cxf-abdera</feature>
- <feature version="${project.version}">cxf-saaj-impl</feature>
+ <feature version='2.5.5'>cxf-abdera</feature>
+ <feature version="2.5.5">cxf-saaj-impl</feature>
<bundle dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
@@ -283,25 +128,25 @@
<bundle dependency="true">mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
- <bundle start-level='30'>mvn:org.apache.cxf/cxf-bundle/${project.version}</bundle>
- <bundle>mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>
+ <bundle start-level='30'>mvn:org.apache.cxf/cxf-bundle/2.5.5</bundle>
+ <bundle>mvn:org.apache.cxf.karaf/cxf-karaf-commands/2.5.5</bundle>
</feature>
- <feature name="cxf-sts" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf</feature>
+ <feature name="cxf-sts" version="2.5.5" resolver='(obr)'>
+ <feature version="2.5.5">cxf</feature>
<bundle dependency="true">mvn:com.hazelcast/hazelcast/${cxf.hazelcast.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
- <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle>
+ <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/2.5.5</bundle>
</feature>
- <feature name="cxf-wsn-api" version="${project.version}" resolver="(obr)">
- <feature version="${project.version}">cxf</feature>
- <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-api/${project.version}</bundle>
+ <feature name="cxf-wsn-api" version="2.5.5" resolver="(obr)">
+ <feature version="2.5.5">cxf</feature>
+ <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-api/2.5.5</bundle>
</feature>
- <feature name="cxf-wsn" version="${project.version}" resolver="(obr)">
+ <feature name="cxf-wsn" version="2.5.5" resolver="(obr)">
<config name="org.apache.cxf.wsn">
cxf.wsn.activemq = vm:localhost
@@ -310,8 +155,8 @@
</config>
<feature version="[5.4,6)">activemq</feature>
- <feature version="${project.version}">cxf-wsn-api</feature>
+ <feature version="2.5.5">cxf-wsn-api</feature>
- <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version}</bundle>
+ <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/2.5.5</bundle>
</feature>
</features>