From 45e368daa7d7f0a4b11db4b88a8c9795d2256434 Mon Sep 17 00:00:00 2001
From: Andreas Mattes <andreasmattes@fastmail.de>
Date: Wed, 15 May 2024 13:16:10 +0200
Subject: [PATCH] TPRUN-7908 Ensure jackson dataformat-yaml resolution.

---
 .../features/src/main/resources/features.xml  | 243 +++++++++---------
 pom.xml                                       |   4 +-
 2 files changed, 125 insertions(+), 122 deletions(-)

diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 2c9e9b7ecf7..7694f022f2a 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -39,15 +39,15 @@
         <bundle start-level="20">mvn:com.sun.istack/istack-commons-runtime/${cxf.istack.bundle.version}</bundle>
     </feature>
     <feature name="cxf-jaxb" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-specs</feature>
-        <feature version="${upstream.version}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-specs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
         <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${cxf.jaxb.bundle-runtime.tesb.version}</bundle>
         <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle-xjc.tesb.version}</bundle>
         <bundle start-level="20">mvn:com.sun.istack/istack-commons-runtime/${cxf.istack.bundle.version}</bundle>
     </feature>
     <!-- Current the abdera bundle is not working as we expect -->
     <feature name="cxf-abdera" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-specs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-specs</feature>
         <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
         <bundle start-level="35">mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
         <bundle start-level="35">mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
@@ -65,7 +65,7 @@
         <bundle start-level="25">mvn:com.sun.xml.messaging.saaj/saaj-impl/${cxf.saaj-impl.version}</bundle>
     </feature>
     <feature name="wss4j" version="${cxf.wss4j.version}">
-        <feature version="${upstream.version}">cxf-specs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-specs</feature>
         <feature version="${cxf.saaj-impl.version}">saaj-impl</feature>
         <bundle start-level="25" dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.tesb.version}</bundle>
         <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
@@ -88,7 +88,7 @@
         <bundle start-level="30">mvn:org.apache.wss4j/wss4j-ws-security-policy-stax/${cxf.wss4j.version}</bundle>
     </feature>
     <feature name="cxf-core" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-specs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-specs</feature>
         <bundle start-level="30" dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
         <bundle start-level="25" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
@@ -97,72 +97,72 @@
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-management/${upstream.version}</bundle>
         <conditional>
             <condition>shell</condition>
-            <feature version="${upstream.version}">cxf-commands</feature>
+            <feature version="${cxf.tesb.version-range}">cxf-commands</feature>
         </conditional>
     </feature>
     <feature name="cxf-commands" version="${upstream.version}">
         <feature>shell</feature>
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:org.apache.cxf.karaf/cxf-karaf-commands/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-wsdl" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-wsdl/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-ws-policy" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
         <bundle start-level="30" dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-policy/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-ws-addr" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-ws-policy</feature>
-        <feature version="${upstream.version}">cxf-bindings-soap</feature>
-        <feature version="${upstream.version}">cxf-databinding-jaxb</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-policy</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-soap</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-databinding-jaxb</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-addr/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-ws-rm" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-ws-policy</feature>
-        <feature version="${upstream.version}">cxf-ws-addr</feature>
-        <feature version="${upstream.version}">cxf-ws-security</feature>
-        <feature version="${upstream.version}">cxf-databinding-jaxb</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-policy</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-addr</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-security</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-databinding-jaxb</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-rm/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-ws-mex" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-ws-policy</feature>
-        <feature version="${upstream.version}">cxf-ws-addr</feature>
-        <feature version="${upstream.version}">cxf-jaxws</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-policy</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-addr</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxws</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-mex/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-ws-security" version="${upstream.version}">
         <feature prerequisite="true">wrap</feature>
         <feature version="${cxf.wss4j.version}">wss4j</feature>
-        <feature version="${upstream.version}">cxf-rt-security-saml</feature>
-        <feature version="${upstream.version}">cxf-ws-policy</feature>
-        <feature version="${upstream.version}">cxf-ws-addr</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-rt-security-saml</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-policy</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-addr</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
         <bundle start-level="40" dependency="true">mvn:org.ehcache/ehcache/${cxf.ehcache3.tesb.version}</bundle>
         <!-- <bundle start-level="40" dependency="true">wrap:mvn:org.ehcache/ehcache/${cxf.ehcache3.tesb.version}$overwrite=merge&amp;Import-Package=javax.xml.bind*,*;resolution:=optional</bundle> -->
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-security/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rt-security" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-security/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rt-security-saml" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-rt-security</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-rt-security</feature>
         <feature version="${cxf.wss4j.version}">wss4j</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-security-saml/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-http-client" version="${upstream.version}">
         <!-- Can be used instead cxf-http for a smaller footprint -->
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http/${upstream.version}</bundle>
     </feature>
 
     <feature name="cxf-http" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <feature>http</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http/${upstream.version}</bundle>
     </feature>
@@ -179,7 +179,7 @@
         </requirement>
     </feature>
     <feature name="cxf-http-jetty" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <feature version="[9,11)">jetty</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${upstream.version}</bundle>
         <capability>
@@ -187,14 +187,14 @@
         </capability>
     </feature>
     <feature name="cxf-http-async" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <bundle start-level="40">mvn:org.apache.httpcomponents/httpcore-osgi/${cxf.httpcomponents.core.tesb.version}</bundle>
         <bundle start-level="40">mvn:org.apache.httpcomponents/httpclient-osgi/${cxf.httpcomponents.client.tesb.version}</bundle>
         <bundle start-level="40">mvn:org.apache.httpcomponents/httpasyncclient-osgi/${cxf.httpcomponents.asyncclient.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-hc/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-http-netty-client" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <bundle dependency="true" start-level="40">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle>
         <bundle start-level="40">mvn:org.bouncycastle/bcprov-jdk18on/${cxf.bcprov.tesb.version}</bundle>
         <bundle start-level="40">mvn:org.bouncycastle/bcutil-jdk18on/${cxf.bcprov.tesb.version}</bundle>
@@ -212,7 +212,7 @@
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-netty-client/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-http-netty-server" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <bundle start-level="40">mvn:org.bouncycastle/bcprov-jdk18on/${cxf.bcprov.tesb.version}</bundle>
         <bundle start-level="40">mvn:org.bouncycastle/bcutil-jdk18on/${cxf.bcprov.tesb.version}</bundle>
         <bundle start-level="40">mvn:org.bouncycastle/bctls-jdk18on/${cxf.bcprov.tesb.version}</bundle>
@@ -231,7 +231,7 @@
         </capability>
     </feature>
     <feature name="cxf-http-undertow" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <feature>pax-web-http-undertow</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-undertow/${upstream.version}</bundle>
         <capability>
@@ -239,24 +239,24 @@
         </capability>
     </feature>
     <feature name="cxf-bindings-soap" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
         <feature version="${cxf.saaj-impl.version}">saaj-impl</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-xml/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-soap/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-jaxws" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-wsdl</feature>
-        <feature version="${upstream.version}">cxf-databinding-jaxb</feature>
-        <feature version="${upstream.version}">cxf-bindings-soap</feature>
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-databinding-jaxb</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-soap</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-simple/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-jaxws/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-jaxrs" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-http</feature>
-        <feature version="${upstream.version}">cxf-jackson</feature>
-        <feature version="${upstream.version}">cxf-rt-security</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jackson</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-rt-security</feature>
         <bundle start-level="30" dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-extension-search/${upstream.version}</bundle>
@@ -266,27 +266,27 @@
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-client/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rs-security-xml" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
-        <feature version="${upstream.version}">cxf-rt-security-saml</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-rt-security-saml</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-xml/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rs-security-sso-saml" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-rs-security-xml</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-rs-security-xml</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-sso-saml/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rs-security-cors" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rs-security-jose" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
-        <feature version="${upstream.version}">cxf-rt-security</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-rt-security</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-json-basic/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-jose/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-jose-jaxrs/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rs-security-oauth2" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-rs-security-jose</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-rs-security-jose</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-jackson" version="${upstream.version}">
@@ -297,7 +297,8 @@
         <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.tesb.version}</bundle>
         <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.tesb.version}</bundle>
         <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.databind.tesb.version}</bundle>
-        <bundle start-level="35">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.dataformat.yaml.tesb.version}</bundle>
+        <!-- <bundle start-level="35">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.dataformat.yaml.tesb.version}</bundle> -->
+        <bundle start-level="35">wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.dataformat.yaml.tesb.version}$Bundle-SymbolicName=com.fasterxml.jackson.dataformat.jackson-dataformat-yaml&amp;Bundle-Version=${cxf.jackson.dataformat.yaml.tesb.version}.99&amp;overwrite=merge&amp;Export-Package=com.fasterxml.jackson.dataformat.yaml;version=${cxf.jackson.tesb.version},com.fasterxml.jackson.dataformat.yaml.*;version=${cxf.jackson.tesb.version}&amp;Import-Package=com.fasterxml.jackson.*;version="[${cxf.jackson.tesb.version},3.0)",*</bundle>
         <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.tesb.version}</bundle>
         <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.tesb.version}</bundle>
     </feature>
@@ -307,7 +308,7 @@
         <bundle start-level="35">mvn:org.apache.johnzon/johnzon-core/${cxf.johnzon.version}</bundle>
     </feature>
     <feature name="cxf-tracing-brave" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="35">mvn:io.zipkin.zipkin2/zipkin/${cxf.brave.zipkin.version}</bundle>
         <bundle start-level="35">mvn:io.zipkin.reporter2/zipkin-reporter/${cxf.brave.reporter.version}</bundle>
         <bundle start-level="35">mvn:io.zipkin.reporter2/zipkin-reporter-brave/${cxf.brave.reporter.version}</bundle>
@@ -316,21 +317,21 @@
         <bundle start-level="40">mvn:org.apache.cxf/cxf-integration-tracing-brave/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-tracing-opentracing" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="35">wrap:mvn:io.opentracing/opentracing-api/${cxf.opentracing.version}</bundle>
         <bundle start-level="35">wrap:mvn:io.opentracing/opentracing-util/${cxf.opentracing.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-integration-tracing-opentracing/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-tracing-opentelemetry" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="35">wrap:mvn:io.opentelemetry/opentelemetry-api/${cxf.opentelemetry.version}</bundle>
         <bundle start-level="35">wrap:mvn:io.opentelemetry/opentelemetry-context/${cxf.opentelemetry.version}</bundle>
         <bundle start-level="35">wrap:mvn:io.opentelemetry/opentelemetry-semconv/${cxf.opentelemetry.semconv.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-integration-tracing-opentelemetry/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-rs-description-swagger2" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
-        <feature version="${upstream.version}">cxf-jackson</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jackson</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-common-openapi/${upstream.version}</bundle>
         <bundle start-level="35">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${upstream.version}</bundle>
@@ -347,8 +348,8 @@
         <bundle start-level="35" dependency="true">wrap:mvn:io.swagger/swagger-jaxrs/${cxf.swagger2.version}$overwrite=merge&amp;Import-Package=com.google.common.*;version="${cxf.guava.tesb.version-range}";resolution:=optional,*;resolution:=optional</bundle>
     </feature>
     <feature name="cxf-rs-description-openapi-v3" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
-        <feature version="${upstream.version}">cxf-jackson</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jackson</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-common-openapi/${upstream.version}</bundle>
         <bundle start-level="35">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-openapi-v3/${upstream.version}</bundle>
@@ -365,62 +366,62 @@
         <bundle start-level="35" dependency="true">mvn:io.swagger.core.v3/swagger-jaxrs2/${cxf.swagger.v3.version}</bundle>
     </feature>
     <feature name="cxf-databinding-aegis" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-wsdl</feature>
-        <feature version="${upstream.version}">cxf-bindings-soap</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-soap</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-databinding-aegis/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-databinding-jaxb" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-databinding-jaxb/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-features-clustering" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-clustering/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-features-logging" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-logging/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-features-throttling" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-throttling/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-features-metrics" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40" dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cxf.dropwizard4.version}</bundle>
         <bundle start-level="40" dependency='true'>mvn:io.dropwizard.metrics/metrics-jmx/${cxf.dropwizard4.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-metrics/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-bindings-corba" version="${upstream.version}">
         <feature prerequisite="true">wrap</feature>
-        <feature version="${upstream.version}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-corba/${upstream.version}</bundle>
         <bundle start-level="40" dependency="true">wrap:mvn:org.jacorb/jacorb-omgapi/3.7$Bundle-SymbolicName=jacorb-omgapi&amp;Bundle-Version=3.7.0</bundle>
     </feature>
     <feature name="cxf-bindings-coloc" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-coloc/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-transports-local" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-local/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-transports-jms" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-bindings-soap</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-soap</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
         <!-- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle> -->
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${cxf.geronimo.jms2.tesb.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-jms/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-transports-udp" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
         <bundle dependency="true">mvn:org.apache.mina/mina-core/${cxf.mina.tesb.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-udp/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-transports-websocket-client" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <bundle dependency='true'>mvn:org.asynchttpclient/async-http-client/${cxf.ahc.version}</bundle>
         <bundle dependency='true'>mvn:org.asynchttpclient/async-http-client-netty-utils/${cxf.ahc.version}</bundle>
         <bundle dependency='true'>mvn:io.netty/netty-common/${cxf.netty.tesb.version}</bundle>
@@ -440,7 +441,7 @@
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-websocket/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-transports-websocket-server" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <bundle dependency='true'>mvn:org.atmosphere/atmosphere-runtime/${cxf.atmosphere.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-websocket/${upstream.version}</bundle>
         <capability>
@@ -448,38 +449,38 @@
         </capability>
     </feature>
     <feature name="cxf-sse" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-http</feature>
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-sse/${upstream.version}</bundle>
         <capability>
             cxf.http.provider;name=sse
         </capability>
     </feature>
     <feature name="cxf-javascript" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-bindings-soap</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-soap</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-javascript/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-frontend-javascript" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-jaxws</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxws</feature>
         <bundle start-level="40" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${cxf.rhino.bundle.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-js/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-xjc-runtime" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-jaxb</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxb</feature>
         <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf.xjc-utils/cxf-xjc-runtime/${cxf.xjc-utils.version}</bundle>
     </feature>
     <feature name="cxf-tools" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-wsdl</feature>
-        <feature version="${upstream.version}">cxf-databinding-jaxb</feature>
-        <feature version="${upstream.version}">cxf-databinding-aegis</feature>
-        <feature version="${upstream.version}">cxf-bindings-soap</feature>
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
-        <feature version="${upstream.version}">cxf-jaxws</feature>
-        <feature version="${upstream.version}">cxf-javascript</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsdl</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-databinding-jaxb</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-databinding-aegis</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-soap</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxws</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-javascript</feature>
         <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle>
         <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-text/${cxf.commons-text.version}</bundle>
         <bundle dependency="true">mvn:org.apache.velocity/velocity-engine-core/${cxf.velocity.version}</bundle>
@@ -496,30 +497,30 @@
         <bundle>mvn:org.apache.cxf/cxf-tools-corba/${upstream.version}</bundle-->
     </feature>
     <feature name="cxf" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-jaxws</feature>
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
-        <feature version="${upstream.version}">cxf-databinding-jaxb</feature>
-        <feature version="${upstream.version}">cxf-databinding-aegis</feature>
-        <feature version="${upstream.version}">cxf-bindings-corba</feature>
-        <feature version="${upstream.version}">cxf-bindings-coloc</feature>
-        <feature version="${upstream.version}">cxf-http-provider</feature>
-        <feature version="${upstream.version}">cxf-transports-local</feature>
-        <feature version="${upstream.version}">cxf-transports-jms</feature>
-        <feature version="${upstream.version}">cxf-transports-udp</feature>
-        <feature version="${upstream.version}">cxf-xjc-runtime</feature>
-        <feature version="${upstream.version}">cxf-ws-security</feature>
-        <feature version="${upstream.version}">cxf-ws-rm</feature>
-        <feature version="${upstream.version}">cxf-ws-mex</feature>
-        <feature version="${upstream.version}">cxf-javascript</feature>
-        <feature version="${upstream.version}">cxf-frontend-javascript</feature>
-        <feature version="${upstream.version}">cxf-features-clustering</feature>
-        <feature version="${upstream.version}">cxf-features-metrics</feature>
-        <feature version="${upstream.version}">cxf-features-throttling</feature>
-        <feature version="${upstream.version}">cxf-features-logging</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxws</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-databinding-jaxb</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-databinding-aegis</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-corba</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bindings-coloc</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http-provider</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-transports-local</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-transports-jms</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-transports-udp</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-xjc-runtime</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-security</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-rm</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-mex</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-javascript</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-frontend-javascript</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-features-clustering</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-features-metrics</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-features-throttling</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-features-logging</feature>
 
         <!-- tools really aren't needed in OSGi by default
-        <feature version="${upstream.version}">cxf-tools</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-tools</feature>
         -->
         <!-- need msv
         <bundle>mvn:org.apache.cxf/cxf-wstx-msv-validation/${upstream.version}</bundle-->
@@ -531,14 +532,14 @@
         <!-- <bundle start-level="40" dependency="true">wrap:mvn:org.ehcache/ehcache/${cxf.ehcache3.tesb.version}$overwrite=merge&amp;Import-Package=javax.xml.bind*,*;resolution:=optional</bundle> -->
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-json-basic/${upstream.version}</bundle>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-jose/${upstream.version}</bundle>
-        <feature version="${upstream.version}">cxf-core</feature>
-        <feature version="${upstream.version}">cxf-ws-security</feature>
-        <feature version="${upstream.version}">cxf-http</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-security</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http</feature>
         <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-wsn-api" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-ws-addr</feature>
-        <feature version="${upstream.version}">cxf-jaxws</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-addr</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxws</feature>
         <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-api/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-wsn" version="${upstream.version}">
@@ -551,8 +552,8 @@
         </config>
         <feature>spring</feature>
         <feature>aries-blueprint</feature>
-        <feature version="${upstream.version}">cxf-wsn-api</feature>
-        <feature version="${upstream.version}">cxf-http-provider</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-wsn-api</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-http-provider</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.jta.version}</bundle>
         <!-- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle> -->
@@ -562,14 +563,14 @@
         <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${cxf-services-wsn-core.tesb.version}</bundle>
     </feature>
     <feature name="cxf-ws-discovery-api" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-transports-udp</feature>
-        <feature version="${upstream.version}">cxf-ws-addr</feature>
-        <feature version="${upstream.version}">cxf-jaxws</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-transports-udp</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-addr</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxws</feature>
         <feature>aries-blueprint</feature>
         <bundle>mvn:org.apache.cxf.services.ws-discovery/cxf-services-ws-discovery-api/${upstream.version}</bundle>
     </feature>
     <feature name="cxf-ws-discovery" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-ws-discovery-api</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-ws-discovery-api</feature>
         <bundle>mvn:org.apache.cxf.services.ws-discovery/cxf-services-ws-discovery-service/${upstream.version}</bundle>
     </feature>
 
@@ -595,13 +596,13 @@
     </feature>
 
     <feature name="cxf-bean-validation" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-bean-validation-core</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-bean-validation-core</feature>
         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javax-el-api-3.0.0/${cxf.servicemix.javax.el.version}</bundle> 
         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-el-impl/${cxf.servicemix.javax.el.version}</bundle>
     </feature>
 
     <feature name="cxf-jaxrs-cdi" version="${upstream.version}">
-        <feature version="${upstream.version}">cxf-jaxrs</feature>
+        <feature version="${cxf.tesb.version-range}">cxf-jaxrs</feature>
         <feature>pax-cdi</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-integration-cdi/${upstream.version}</bundle>
     </feature>
diff --git a/pom.xml b/pom.xml
index 554ffcba282..acf8fd1ced7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,13 +40,14 @@
     </issueManagement>
     <properties>
         <upstream.version>3.5.8</upstream.version>
-        <apache-cxf.features.tesb.version>3.5.8.20240425</apache-cxf.features.tesb.version>
+        <apache-cxf.features.tesb.version>3.5.8.20240515</apache-cxf.features.tesb.version>
         <cxf-services-xkms.features.tesb.version>${apache-cxf.features.tesb.version}</cxf-services-xkms.features.tesb.version>
         <cxf-core.tesb.version>3.5.8.20240425</cxf-core.tesb.version>
         <cxf-rt-frontend-jaxrs.tesb.version>3.5.8.20240425</cxf-rt-frontend-jaxrs.tesb.version>
         <cxf-services-wsn-core.tesb.version>3.5.8.20240425</cxf-services-wsn-core.tesb.version>
         <cxf-bundle-compatible.tesb.version>3.5.8.20240425</cxf-bundle-compatible.tesb.version>
         <cxf-rt-rs-service-description.tesb.version>3.5.8.20240425</cxf-rt-rs-service-description.tesb.version>
+        <cxf.tesb.version-range>[3.5,3.6)</cxf.tesb.version-range>
         <!-- <cxf.jakarta.mail.tesb.version>1.6.7</cxf.jakarta.mail.tesb.version> -->
         <cxf.activemq-osgi.tesb.version>5.17.6.20231031</cxf.activemq-osgi.tesb.version>
         <cxf.geronimo.jms2.tesb.version>1.0-alpha-2</cxf.geronimo.jms2.tesb.version>
@@ -487,6 +488,7 @@
                             <cxf-services-wsn-core.tesb.version>${cxf-services-wsn-core.tesb.version}</cxf-services-wsn-core.tesb.version>
                             <cxf-bundle-compatible.tesb.version>${cxf-bundle-compatible.tesb.version}</cxf-bundle-compatible.tesb.version>
                             <cxf-rt-rs-service-description.tesb.version>${cxf-rt-rs-service-description.tesb.version}</cxf-rt-rs-service-description.tesb.version>
+                            <cxf.tesb.version-range>${cxf.tesb.version-range}</cxf.tesb.version-range>
                             <!-- <cxf.jakarta.mail.tesb.version>${cxf.jakarta.mail.tesb.version}</cxf.jakarta.mail.tesb.version> -->
                             <cxf.activemq-osgi.tesb.version>${cxf.activemq-osgi.tesb.version}</cxf.activemq-osgi.tesb.version>
                             <cxf.geronimo.jms2.tesb.version>${cxf.geronimo.jms2.tesb.version}</cxf.geronimo.jms2.tesb.version>