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/02/14 21:26:07 UTC
[08/10] cxf git commit: Use updated abdera-parser bundle
Use updated abdera-parser bundle
# 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/1875a1c2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1875a1c2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1875a1c2
Branch: refs/heads/3.1.x-fixes
Commit: 1875a1c2f8c3290e5f3d92d9eab266bb106d6cea
Parents: f092b80
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 14 09:24:20 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 14 09:55:10 2017 -0500
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1875a1c2/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 a70a9a7..87f611a 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/1875a1c2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0e26050..7ddab8f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -66,7 +66,8 @@
<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.activemq.version>5.12.2</cxf.activemq.version>
+ <cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
+ <cxf.activemq.version>5.14.2</cxf.activemq.version>
<cxf.ahc.version>1.9.8</cxf.ahc.version>
<cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
<cxf.atmosphere.version>2.3.7</cxf.atmosphere.version>