You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2019/06/19 10:35:17 UTC
[camel] branch master updated: "CAMEL-13660:xml-specs - Can we
upgrade stax2-api from 3.x to 4.x"
This is an automated email from the ASF dual-hosted git repository.
ramu12 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new bde544e "CAMEL-13660:xml-specs - Can we upgrade stax2-api from 3.x to 4.x"
bde544e is described below
commit bde544e07856fa24cb313b259896e045f0e3f4c1
Author: Kodanda Ramu Kakarla <kk...@kkakarla.pnq.csb>
AuthorDate: Wed Jun 19 16:00:07 2019 +0530
"CAMEL-13660:xml-specs - Can we upgrade stax2-api from 3.x to 4.x"
---
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index a7b1ea2..75cd144 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -31,7 +31,7 @@
<bundle dependency="true">mvn:jakarta.xml.bind/jakarta.xml.bind-api/${jakarta-jaxb-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
+ <bundle>mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}</bundle>
<bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${jaxb-bundle-version}</bundle>
</feature>
@@ -1909,7 +1909,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml/aalto-xml/0.9.10</bundle>
<bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
@@ -2085,7 +2085,7 @@
</feature>
<feature name='camel-restlet-jackson' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-restlet</feature>
- <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${restlet-woodstox-version}</bundle>
<bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>