This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 2cfb02f [CAMEL-14125] Upgrade to xstream 1.4.11.1 and use regular SMX
xstream bundle (#3307)
2cfb02f is described below
commit 2cfb02f5b2828c27de0ce47fc1897166ea8196e2
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Fri Nov 1 08:41:17 2019 +0100
[CAMEL-14125] Upgrade to xstream 1.4.11.1 and use regular SMX xstream
bundle (#3307)
---
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b9c7b4..ed0ff61 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -669,8 +669,8 @@
<xmlunit-version>2.6.3</xmlunit-version>
<xpp3-bundle-version>1.1.4c_7</xpp3-bundle-version>
<xpp3-version>1.1.4c</xpp3-version>
- <xstream-bundle-version>1.4.11_1</xstream-bundle-version>
- <xstream-version>1.4.11</xstream-version>
+ <xstream-bundle-version>1.4.11.1_1</xstream-bundle-version>
+ <xstream-version>1.4.11.1</xstream-version>
<zendesk-client-version>0.6.2</zendesk-client-version>
<zipkin-reporter-version>2.10.3</zipkin-reporter-version>
<zipkin-version>2.18.3</zipkin-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 46443da..6aeba8d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1491,7 +1491,7 @@
<bundle
dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-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.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>
@@ -2002,7 +2002,7 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
<bundle
dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
@@ -2187,7 +2187,7 @@
<bundle
dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle
dependency='true'>mvn:javax.validation/validation-api/${validation-1-api-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle
dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle
dependency='true'>mvn:org.cometd.java/cometd-java-client/${cometd-java-client-version}</bundle>
@@ -2706,7 +2706,7 @@
<bundle
dependency='true'>mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kxml2/${kxml2-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-xstream/${project.version}</bundle>
</feature>
<feature name='camel-yammer' version='${project.version}' start-level='50'>
