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