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 2017/03/16 13:06:58 UTC
[10/12] cxf git commit: Use updated abdera-parser bundle
Use updated abdera-parser bundle
# Conflicts:
# parent/pom.xml
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f10b419e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f10b419e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f10b419e
Branch: refs/heads/3.0.x-fixes
Commit: f10b419e11792bff3048e4f7cf44a7bde96f1845
Parents: 691fb31
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 14 09:24:20 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Mar 15 14:55:34 2017 -0400
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f10b419e/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 6ec9afb..bcd1bc7 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -45,7 +45,7 @@
<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.james/apache-mime4j-core/${cxf.james.mim4j.version}</bundle>
- <bundle start-level="35">mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle>
+ <bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera-parser/${cxf.abdera.osgi.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'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f10b419e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index dc94e95..6f16dcb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -73,6 +73,7 @@
<cxf.osgi.javax.xml.ws.version>[0.0,3)</cxf.osgi.javax.xml.ws.version>
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1.3</cxf.abdera.version>
+ <cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
<cxf.activemq.version>5.9.1</cxf.activemq.version>
<cxf.ahc.version>1.8.5</cxf.ahc.version>
<cxf.apacheds.version>2.0.0-M19</cxf.apacheds.version>