You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/11/05 12:03:21 UTC
svn commit: r1405745 - in /cxf/trunk:
osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Author: sergeyb
Date: Mon Nov 5 11:03:21 2012
New Revision: 1405745
URL: http://svn.apache.org/viewvc?rev=1405745&view=rev
Log:
Updating cxf-abdera feature to reference SMX abdera-parser bundle
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=1405745&r1=1405744&r2=1405745&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Mon Nov 5 11:03:21 2012
@@ -47,18 +47,13 @@
<feature name='cxf-abdera' version='${project.version}' resolver='(obr)'>
<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' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera-parser/${cxf.abdera-parser.bundle.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-->
+ <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>-->
</feature>
<feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1405745&r1=1405744&r2=1405745&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Nov 5 11:03:21 2012
@@ -82,6 +82,7 @@
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1.2</cxf.abdera.version>
+ <cxf.abdera-parser.bundle.version>1.1.2_1</cxf.abdera-parser.bundle.version>
<cxf.activemq.version>5.7.0</cxf.activemq.version>
<cxf.derby.version>10.2.2.0</cxf.derby.version>