[camel-karaf] branch main updated: Upgrade stax2-api to 4.2.1 / Version 3.1.4 conflicting with cxf (#208)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new 52d6e129 Upgrade stax2-api to 4.2.1 / Version 3.1.4 conflicting with 
cxf (#208)
52d6e129 is described below

commit 52d6e1297dbdbbc5f4173ef6bc89def64eb90418
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Nov 25 09:08:15 2022 +0100

    Upgrade stax2-api to 4.2.1 / Version 3.1.4 conflicting with cxf (#208)
---
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 37762387..b74ae32b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1668,6 +1668,7 @@
     <bundle 
dependency='true'>wrap:mvn:org.apache.olingo/odata-server-api/${olingo4-version}$overwrite=merge&amp;Export-Package=org.apache.olingo.server.api;version=${olingo4-version},org.apache.olingo.server.api.uri;version=${olingo4-version},org.apache.olingo.server.api.processor;version=${olingo4-version},org.apache.olingo.server.api.batch;version=${olingo4-version},org.apache.olingo.server.api.debug;version=${olingo4-version},org.apache.olingo.server.api.deserializer;version=${olingo
 [...]
     <bundle 
dependency='true'>wrap:mvn:org.apache.olingo/odata-server-core/${olingo4-version}$overwrite=merge&amp;Export-Package=org.apache.olingo.server.core;version=${olingo4-version},org.apache.olingo.server.core.uri.parser;version=${olingo4-version}</bundle>
     <bundle 
dependency='true'>wrap:mvn:org.apache.olingo/odata-client-core/${olingo4-version}$overwrite=merge&amp;Export-Package=org.apache.olingo.client.core;version=${olingo4-version},org.apache.olingo.client.core.domain;version=${olingo4-version},org.apache.olingo.client.core.http;version=${olingo4-version},org.apache.olingo.client.core.communication.request.batch;version=${olingo4-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.codehaus.woodstox/stax2-api/3.1.4</bundle>
     <bundle 
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>