From e04455dc934c3c6aaa36e7f66cf700b0cede83e6 Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stefan.tataru@qlik.com>
Date: Tue, 19 May 2026 10:54:13 +0200
Subject: [PATCH 1/6] fix(DPE-2868): remove HTTP 2 dependencies from the
 `jetty` feature

---
 features/src/main/feature/camel-features.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index e339a379a..aa6b45fd4 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -134,20 +134,15 @@
 
     <feature name="jetty" version="${jetty11.tesb.version}">
         <feature version="[5,6)">jakarta-servlet</feature>
-        <bundle dependency="true">mvn:org.eclipse.jetty/jetty-alpn-server/${jetty11.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-http/${jetty11.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-io/${jetty11.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-server/${jetty11.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-util/${jetty11.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-security/${jetty11.tesb.version}</bundle>
-        <bundle dependency="true">mvn:org.eclipse.jetty.http2/http2-hpack/${jetty11.tesb.version}</bundle>
-        <bundle dependency="true">mvn:org.eclipse.jetty.http2/http2-common/${jetty11.tesb.version}</bundle>
-        <bundle dependency="true">mvn:org.eclipse.jetty.http2/http2-server/${jetty11.tesb.version}</bundle>
     </feature>
 
     <feature name="jetty" version="${jetty12.tesb.version}">
         <feature version="[6,7)">jakarta-servlet</feature>
-        <bundle dependency="true">mvn:org.eclipse.jetty/jetty-alpn-server/${jetty12.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-http/${jetty12.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-io/${jetty12.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-server/${jetty12.tesb.version}</bundle>
@@ -155,9 +150,6 @@
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-jmx/${jetty12.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-util/${jetty12.tesb.version}</bundle>
         <bundle dependency="true">mvn:org.eclipse.jetty/jetty-security/${jetty12.tesb.version}</bundle>
-        <bundle dependency="true">mvn:org.eclipse.jetty.http2/jetty-http2-hpack/${jetty12.tesb.version}</bundle>
-        <bundle dependency="true">mvn:org.eclipse.jetty.http2/jetty-http2-common/${jetty12.tesb.version}</bundle>
-        <bundle dependency="true">mvn:org.eclipse.jetty.http2/jetty-http2-server/${jetty12.tesb.version}</bundle>
     </feature>
 
     <feature name="http-client" version="${httpclient4-version}">

From 8d9d6080ae1093caa3394e830f50621471c63eb0 Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stefan.tataru@qlik.com>
Date: Wed, 20 May 2026 14:15:13 +0200
Subject: [PATCH 2/6] fix(DPE-2868): change camel-docker to avoid guava version
 conflict

---
 features/src/main/feature/camel-features.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index aa6b45fd4..403b9f4fb 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1227,7 +1227,7 @@
     </feature>
     <feature name='camel-docker' version='${upstream.version}' start-level='50'>
         <feature version='${camel-osgi-version-range}'>camel-core</feature>
-        <feature version='[32,33)'>guava</feature>
+        <feature version='[33,34)'>guava</feature>
         <feature version='${camel-osgi-jackson2-version}'>jackson</feature>
         <feature version='[4.1,5)'>netty</feature>
         <!-- both 'docker-java' and 'docker-java-core' export 'com.github.dockerjava.core',

From 04cc6f846679eb118680649c772dfb38af44a97a Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stefan.tataru@qlik.com>
Date: Wed, 20 May 2026 18:26:41 +0200
Subject: [PATCH 3/6] fix(DPE-2868): temporary change

---
 features/src/main/feature/camel-features.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 403b9f4fb..86679ff28 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -3733,7 +3733,7 @@ Chain 2:
         <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper.tesb.version}$Bundle-SymbolicName=org.apache.zookeeper-jute&amp;Bundle-Version=${zookeeper.tesb.version}&amp;Fragment-Host=org.apache.zookeeper&amp;Export-Package=org.apache.jute;version=${zookeeper.tesb.version},org.apache.zookeeper.*;version=${zookeeper.tesb.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.curator/curator-client/${curator.tesb.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.curator/curator-framework/${curator.tesb.version}</bundle>
-        <bundle dependency='true'>mvn:org.apache.curator/curator-recipes/${curator.tesb.version}</bundle>
+        <bundle dependency='true'>wrap:mvn:org.apache.curator/curator-recipes/${curator.tesb.version}$overwrite=merge&amp;Import-Package=!javax.annotation,!org.apache.curator.shaded.com.google*,com.google*;version="[33,34)",org.apache.curator*;version="[5.9,6)",*</bundle>
         <bundle dependency='true'>mvn:org.apache.curator/curator-x-discovery/${curator.tesb.version}</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-zookeeper/${upstream.version}</bundle>
     </feature>
@@ -3745,7 +3745,7 @@ Chain 2:
         <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper.tesb.version}$Bundle-SymbolicName=org.apache.zookeeper-jute&amp;Bundle-Version=${zookeeper.tesb.version}&amp;Fragment-Host=org.apache.zookeeper&amp;Export-Package=org.apache.jute;version=${zookeeper.tesb.version},org.apache.zookeeper.*;version=${zookeeper.tesb.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.curator/curator-client/${curator.tesb.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.curator/curator-framework/${curator.tesb.version}</bundle>
-        <bundle dependency='true'>mvn:org.apache.curator/curator-recipes/${curator.tesb.version}</bundle>
+        <bundle dependency='true'>wrap:mvn:org.apache.curator/curator-recipes/${curator.tesb.version}$overwrite=merge&amp;Import-Package=!javax.annotation,!org.apache.curator.shaded.com.google*,com.google*;version="[33,34)",org.apache.curator*;version="[5.9,6)",*</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-zookeeper-master/${upstream.version}</bundle>
     </feature>
 </features>

From d1432eee403a2d4b9f8e45b392490e0310cd2340 Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stefan.tataru@qlik.com>
Date: Tue, 2 Jun 2026 12:53:49 +0200
Subject: [PATCH 4/6] fix(DPE-2868): align hazelcast version

---
 features/src/main/feature/camel-features.xml | 2 +-
 pom.xml                                      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 86679ff28..83fe6f1dc 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1736,7 +1736,7 @@
     </feature>
     <feature name='camel-hazelcast' version='${upstream.version}' start-level='50'>
         <feature version='${camel-osgi-version-range}'>camel-core</feature>
-        <bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
+        <bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast.tesb.version}</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-hazelcast/${upstream.version}</bundle>
     </feature>
     <feature name='camel-headersmap' version='${upstream.version}' start-level='50'>
diff --git a/pom.xml b/pom.xml
index fbd8dc62d..3f8905833 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,7 @@
         <opensaml.bundle.tesb.version>5.1.4_1.tesb2</opensaml.bundle.tesb.version>
         <shibboleth.tesb.version>9.1.6</shibboleth.tesb.version>
 
+        <hazelcast.tesb.version>5.5.0.tesb1</hazelcast.tesb.version>
         <jetty11.tesb.version>11.0.21</jetty11.tesb.version>
         <jetty12.tesb.version>12.1.6</jetty12.tesb.version>
         <jetty.tesb.version>${jetty12.tesb.version}</jetty.tesb.version>
@@ -830,6 +831,7 @@
                             <curator.tesb.version>${curator.tesb.version}</curator.tesb.version>
                             <zookeeper.tesb.version>${zookeeper.tesb.version}</zookeeper.tesb.version>
                             <zookeeper-server.tesb.version>${zookeeper-server.tesb.version}</zookeeper-server.tesb.version>
+                            <hazelcast.tesb.version>${hazelcast.tesb.version}</hazelcast.tesb.version>
                             <jetty11.tesb.version>${jetty11.tesb.version}</jetty11.tesb.version>
                             <jetty12.tesb.version>${jetty12.tesb.version}</jetty12.tesb.version>
                             <jetty.tesb.version>${jetty.tesb.version}</jetty.tesb.version>

From f79adcf8053a205c202e4b59fc5de93afb9755ba Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stefan.tataru@qlik.com>
Date: Tue, 2 Jun 2026 13:22:09 +0200
Subject: [PATCH 5/6] fix(DPE-2868): align avro version

---
 features/src/main/feature/camel-features.xml | 3 +--
 pom.xml                                      | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 83fe6f1dc..40d36f5aa 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -3091,7 +3091,7 @@
         <bundle dependency='true'>wrap:mvn:io.grpc/grpc-core/${grpc-version}</bundle>
         <bundle dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle>
         <bundle dependency='true'>mvn:org.apache.avro/avro/${avro-version}</bundle>
-        <bundle dependency='true'>wrap:mvn:tech.allegro.schema.json2avro/converter/${auto-detect-version}$Fragment-Host=avro;bundle-version="${avro-version}"&amp;Bundle-SymbolicName=tech.allegro.schema.json2avro.converter.fragment&amp;Bundle-Version=${auto-detect-version}</bundle>
+        <bundle dependency='true'>wrap:mvn:tech.allegro.schema.json2avro/converter/${json2avro.tesb.version}$Fragment-Host=avro;bundle-version="${avro-version}"&amp;Bundle-SymbolicName=tech.allegro.schema.json2avro.converter.fragment&amp;Bundle-Version=${json2avro.tesb.version}</bundle>
         <bundle dependency='true'>wrap:mvn:io.perfmark/perfmark-api/${auto-detect-version}</bundle>
         <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
         <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
@@ -3104,7 +3104,6 @@
         <bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle>
         <bundle dependency='true'>mvn:org.eclipse.jetty/jetty-alpn-client/${jetty-version}</bundle>
         <bundle dependency='true'>wrap:mvn:org.eclipse.jetty/jetty-client/${jetty-version}$overwrite=merge&amp;Export-Package=org*;version=${jetty-version}</bundle>
-        <bundle dependency='true'>wrap:mvn:tech.allegro.schema.json2avro/converter/${auto-detect-version}</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-salesforce/${upstream.version}</bundle>
     </feature>
     <feature name='camel-sap-netweaver' version='${upstream.version}' start-level='50'>
diff --git a/pom.xml b/pom.xml
index 3f8905833..2a0004dfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,6 @@
         <zookeeper-server.tesb.version>3.9.5.jetty12.1</zookeeper-server.tesb.version>
         <opensaml.bundle.tesb.version>5.1.4_1.tesb2</opensaml.bundle.tesb.version>
         <shibboleth.tesb.version>9.1.6</shibboleth.tesb.version>
-
         <hazelcast.tesb.version>5.5.0.tesb1</hazelcast.tesb.version>
         <jetty11.tesb.version>11.0.21</jetty11.tesb.version>
         <jetty12.tesb.version>12.1.6</jetty12.tesb.version>
@@ -117,6 +116,7 @@
         <jaxb-fastinfoset.tesb.version>2.1.1</jaxb-fastinfoset.tesb.version>
         <jaxb-staxex.tesb.version>2.1.0</jaxb-staxex.tesb.version>
         <jaxb-dtd-parser.tesb.version>1.5.1</jaxb-dtd-parser.tesb.version>
+        <json2avro.tesb.version>0.3.0</json2avro.tesb.version>
 
         <javaVersion>17</javaVersion>
         <project.build.outputTimestamp>1779203564</project.build.outputTimestamp>
@@ -846,6 +846,7 @@
                             <jaxb-fastinfoset.tesb.version>${jaxb-fastinfoset.tesb.version}</jaxb-fastinfoset.tesb.version>
                             <jaxb-staxex.tesb.version>${jaxb-staxex.tesb.version}</jaxb-staxex.tesb.version>
                             <jaxb-dtd-parser.tesb.version>${jaxb-dtd-parser.tesb.version}</jaxb-dtd-parser.tesb.version>
+                            <json2avro.tesb.version>${json2avro.tesb.version}</json2avro.tesb.version>
                         </properties>
                     </configuration>
                     <executions>

From d5b41875a677544cd82d042d1db41899928cff04 Mon Sep 17 00:00:00 2001
From: Stefan Tataru <stefan.tataru@qlik.com>
Date: Tue, 2 Jun 2026 17:04:50 +0200
Subject: [PATCH 6/6] fix(DPE-2868): align jna version

---
 features/src/main/feature/camel-features.xml | 2 +-
 pom.xml                                      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 40d36f5aa..02a20bec7 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -225,7 +225,7 @@
         <bundle dependency='true'>wrap:mvn:com.azure/azure-core/${azure-core-version}$${spi-consumer}&amp;Import-Package=*;resolution:=optional,com.fasterxml.jackson.dataformat.xml.deser;resolution:=optional,com.fasterxml.jackson.dataformat.xml.ser;resolution:=optional</bundle>
         <bundle dependency='true'>wrap:mvn:com.azure/azure-identity/${azure-identity-version}$Import-Package=com.sun.jna,*;resolution:=optional</bundle>
         <bundle dependency='true'>wrap:mvn:io.projectreactor/reactor-core/${reactor-version}$overwrite=merge&amp;Import-Package=jdk.internal*;resolution:=optional,io.micrometer*;resolution:=optional,javax.annotation*;resolution:=optional,org.jspecify*;resolution:=optional,kotlin*;resolution:=optional,reactor.blockhound*;resolution:=optional,*</bundle>
-        <bundle dependency='true'>mvn:net.java.dev.jna/jna/${auto-detect-version}</bundle>
+        <bundle dependency='true'>mvn:net.java.dev.jna/jna/${jna.tesb.version}</bundle>
         <bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
         <bundle dependency='true'>wrap:mvn:com.azure/azure-xml/${azure-xml-version}</bundle>
         <bundle dependency='true'>wrap:mvn:com.azure/azure-json/${azure-json-version}</bundle>
diff --git a/pom.xml b/pom.xml
index 2a0004dfb..dd960679d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,7 @@
         <jaxb-fastinfoset.tesb.version>2.1.1</jaxb-fastinfoset.tesb.version>
         <jaxb-staxex.tesb.version>2.1.0</jaxb-staxex.tesb.version>
         <jaxb-dtd-parser.tesb.version>1.5.1</jaxb-dtd-parser.tesb.version>
+        <jna.tesb.version>5.18.0</jna.tesb.version>
         <json2avro.tesb.version>0.3.0</json2avro.tesb.version>
 
         <javaVersion>17</javaVersion>
@@ -846,6 +847,7 @@
                             <jaxb-fastinfoset.tesb.version>${jaxb-fastinfoset.tesb.version}</jaxb-fastinfoset.tesb.version>
                             <jaxb-staxex.tesb.version>${jaxb-staxex.tesb.version}</jaxb-staxex.tesb.version>
                             <jaxb-dtd-parser.tesb.version>${jaxb-dtd-parser.tesb.version}</jaxb-dtd-parser.tesb.version>
+                            <jna.tesb.version>${jna.tesb.version}</jna.tesb.version>
                             <json2avro.tesb.version>${json2avro.tesb.version}</json2avro.tesb.version>
                         </properties>
                     </configuration>