This is an automated email from the ASF dual-hosted git repository.
acosentino 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 37ff8df CAMEL-13660 - Camel-Olingo4 Karaf feature cannot work with
Stax-api > 4
37ff8df is described below
commit 37ff8df64d24c9b4d2cbba5ce719a55a7cd76f9f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Jun 19 15:11:57 2019 +0200
CAMEL-13660 - Camel-Olingo4 Karaf feature cannot work with Stax-api > 4
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 75cd144..8aa1120 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -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/${stax2v4-api-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2-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>
