Author: ningjiang
Date: Thu Dec 6 08:42:37 2012
New Revision: 1417773
URL: http://svn.apache.org/viewvc?rev=1417773&view=rev
Log:
CXF-4681 fixed the cxf karaf feature issues
Modified:
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
cxf/branches/2.6.x-fixes/parent/pom.xml
Modified:
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1417773&r1=1417772&r2=1417773&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Thu Dec 6 08:42:37 2012
@@ -74,6 +74,8 @@
<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
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${cxf.dom4j.bundle.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>-->
Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1417773&r1=1417772&r2=1417773&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Thu Dec 6 08:42:37 2012
@@ -180,6 +180,7 @@
<cxf.bcel.bundle.version>5.2_4</cxf.bcel.bundle.version>
<cxf.xalan.bundle.version>2.7.1_5</cxf.xalan.bundle.version>
<cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
+ <cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version>
<cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
