This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch essobedo/DPE-577/add-missing-runtime-deps in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 9226c6b695387f18ab9265506c50d6208253603f Author: Andreas Mattes <andreasmat...@fastmail.de> AuthorDate: Mon Jan 6 22:51:49 2025 +0100 DPE-585 Jackson alignment at version 2.18.2. --- features/src/main/feature/camel-features.xml | 210 +++++++++++++-------------- pom.xml | 15 +- 2 files changed, 116 insertions(+), 109 deletions(-) diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml index 0fbdf0ecc..881c95004 100644 --- a/features/src/main/feature/camel-features.xml +++ b/features/src/main/feature/camel-features.xml @@ -128,11 +128,11 @@ <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk18on/${bouncycastle-version}</bundle> </feature> - <feature name="jackson" version="${jackson2-version}"> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <feature name="jackson" version="${jackson2.tesb.version}"> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2.tesb.version}</bundle> <!-- wrap needed to add the missing SPI-Provider clause to the manifest --> - <bundle dependency='true'>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}$overwrite=merge</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson2.tesb.version}$overwrite=merge</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2.tesb.version}</bundle> </feature> <feature name="jackson" version="${jackson216-version}"> @@ -232,9 +232,9 @@ </feature> <feature name="azure" version="${azure-core-version}" start-level="50"> <feature version='[${azure-core-version},2)'>azure-msal4j</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2.tesb.version}</bundle> <bundle dependency='true'>wrap:mvn:com.azure/azure-core/${azure-core-version}$${spi-consumer}&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'>mvn:io.projectreactor/reactor-core/${auto-detect-version}</bundle> @@ -441,7 +441,7 @@ </feature> <feature name='camel-avro' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle> <bundle dependency='true'>mvn:org.apache.avro/avro/${avro-version}</bundle> @@ -449,7 +449,7 @@ </feature> <feature name='camel-avro-rpc' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[4.1,5)'>netty</feature> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${auto-detect-version}</bundle> @@ -495,7 +495,7 @@ <feature name='camel-aws-secrets-manager' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version="${aws-java-sdk2-version}">awssdk</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:software.amazon.awssdk/cloudtrail/${aws-java-sdk2-version}</bundle> <bundle dependency='true'>wrap:mvn:software.amazon.awssdk/sqs/${aws-java-sdk2-version}</bundle> <bundle dependency='true'>wrap:mvn:software.amazon.awssdk/secretsmanager/${aws-java-sdk2-version}</bundle> @@ -656,7 +656,7 @@ </feature> <feature name='camel-azure-cosmosdb' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[${azure-core-version},2)'>azure</feature> <bundle dependency='true'>wrap:mvn:com.azure/azure-cosmos/${auto-detect-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-azure-cosmosdb/${upstream.version}</bundle> @@ -675,7 +675,7 @@ </feature> <feature name='camel-azure-key-vault' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[${azure-core-version},2)'>azure-eventhubs</feature> <bundle dependency='true'>wrap:mvn:com.azure/azure-security-keyvault-secrets/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}</bundle> @@ -760,17 +760,17 @@ </feature> <feature name='camel-bonita' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[3,4)">jaxb-runtime</feature> <feature version="[4,5)">camel-cxf</feature> <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${auto-detect-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson2.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-bonita/${upstream.version}</bundle> </feature> <feature name='camel-box' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="${jetty12.tesb.version-range}">jetty</feature> <feature version='[${bouncycastle-version},2)'>bouncycastle</feature> <feature version='[5,6)'>http-client</feature> @@ -780,8 +780,8 @@ </feature> <feature name='camel-braintree' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.jr/jackson-jr-objects/${jackson2-version}</bundle> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jr/jackson-jr-objects/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-csv/${commons-csv-version}</bundle> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle dependency='true'>mvn:com.braintreepayments.gateway/braintree-java/${braintree-gateway-version}</bundle> @@ -794,7 +794,7 @@ </feature> <feature name='camel-cassandraql' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[4.1,5)'>netty</feature> <bundle dependency="true">mvn:com.datastax.oss/java-driver-core/${cassandra-driver-version}</bundle> <bundle dependency='true'>mvn:com.datastax.oss/java-driver-query-builder/${cassandra-driver-version}</bundle> @@ -807,13 +807,13 @@ </feature> <feature name='camel-cbor' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/${jackson2-version}</bundle> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/${jackson2.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-cbor/${upstream.version}</bundle> </feature> <feature name='camel-chatscript' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle>mvn:org.apache.camel.karaf/camel-chatscript/${upstream.version}</bundle> </feature> <feature name='camel-chunk' version='${upstream.version}' start-level='50'> @@ -861,7 +861,7 @@ </feature> <feature name='camel-consul' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[33,34)'>guava</feature> <bundle dependency='true'>wrap:mvn:org.kiwiproject/consul-client/${consul-client-version}</bundle> <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/${consul-okhttp3-version}</bundle> @@ -870,8 +870,8 @@ <bundle dependency='true'>wrap:mvn:com.squareup.retrofit2/converter-jackson/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:com.squareup.okio/okio/${consul-okio-version}</bundle> <bundle dependency='true'>wrap:mvn:com.squareup.okio/okio-jvm/${consul-okio-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-consul/${upstream.version}</bundle> </feature> @@ -961,8 +961,8 @@ </feature> <feature name='camel-debezium-common' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-afterburner/${jackson216-version}</bundle> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-afterburner/${jackson2.tesb.version}</bundle> <bundle dependency='true'>wrap:mvn:org.apache.kafka/kafka-clients/${kafka-version}</bundle> <!-- Api, runtime and transform have split packages so we merge all into api --> <bundle dependency='true'>wrap:mvn:org.apache.kafka/connect-runtime/${kafka-version}$Fragment-Host=org.apache.kafka.connect-api;bundle-version=${kafka-version}</bundle> @@ -1066,7 +1066,7 @@ <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='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[4.1,5)'>netty</feature> <!-- both 'docker-java' and 'docker-java-core' export 'com.github.dockerjava.core', the fragmented host option will enforce both bundles to share the same class loader, @@ -1083,7 +1083,7 @@ <feature name='camel-drill' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version='${camel-osgi-spring-version}'>spring-jdbc</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:com.typesafe/config/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:org.reflections/reflections/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle> @@ -1100,7 +1100,7 @@ <feature version="[6,7)">jakarta-servlet</feature> <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:com.dropbox.core/dropbox-core-sdk/${dropbox-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-dropbox/${upstream.version}</bundle> </feature> @@ -1119,7 +1119,7 @@ <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature prerequisite='true'>wrap</feature> <feature prerequisite="true">spifly</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[4,5)">http-client</feature> <bundle dependency="true">mvn:org.glassfish.hk2/osgi-resource-locator/${osgi-resource-locator-version}</bundle> <bundle dependency="true">mvn:org.eclipse.parsson/parsson/${parson-version}</bundle> @@ -1135,7 +1135,7 @@ <feature name='camel-elasticsearch-rest-client' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature prerequisite='true'>wrap</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[4,5)">http-client</feature> <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle> <bundle dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/${elasticsearch-java-client-version}</bundle> @@ -1151,7 +1151,7 @@ </feature> <feature name='camel-etcd3' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[4.1,5)'>netty</feature> <bundle dependency='true'>wrap:mvn:io.etcd/jetcd-common/${jetcd-version}</bundle> <bundle dependency='true'>wrap:mvn:io.etcd/jetcd-core/${jetcd-version}</bundle> @@ -1172,10 +1172,10 @@ </feature> <feature name='camel-fhir' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[4,5)">http-client</feature> <feature version='[33,34)'>guava</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-text/${commons-text-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> @@ -1245,7 +1245,7 @@ <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version='[33,34)'>guava</feature> <feature version='[4,5)'>http-client</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=merge&Import-Package=com.google.common*;version="[33,34)",*&Export-Package=com.google.api.client.auth*;version=${google-cloud-http-client-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-bigquery/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}</bundle> @@ -1379,7 +1379,7 @@ <feature name='camel-google-secret-manager' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version="[33,34)">guava</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:com.google.api/api-common/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.api/gax/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}</bundle> @@ -1413,7 +1413,7 @@ <feature version='${camel-osgi-version-range}'>camel-gson</feature> <feature version="[33,34)">guava</feature> <feature version='[4,5)'>http-client</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle> <bundle dependency='true'>mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}</bundle> <bundle dependency='true'>mvn:org.threeten/threetenbp/${auto-detect-version}</bundle> @@ -1516,7 +1516,7 @@ </feature> <feature name='camel-huaweicloud-common' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:com.huaweicloud.sdk/huaweicloud-sdk-core/${huaweicloud-sdk-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-huaweicloud-common/${upstream.version}</bundle> </feature> @@ -1662,7 +1662,7 @@ </feature> <feature name='camel-jackson' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle>mvn:org.apache.camel.karaf/camel-jackson/${upstream.version}</bundle> </feature> <feature name='camel-jackson-avro' version='${upstream.version}' start-level='50'> @@ -1671,15 +1671,15 @@ <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle> <bundle dependency='true'>mvn:org.apache.avro/avro/${avro-version}</bundle> - <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${auto-detect-version}</bundle> - <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${auto-detect-version}</bundle> - <bundle dependency="true">mvn:com.thoughtworks.paranamer/paranamer/${auto-detect-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-avro/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-asl.tesb.version}</bundle> + <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-asl.tesb.version}</bundle> + <bundle dependency="true">mvn:com.thoughtworks.paranamer/paranamer/${paranamer.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-avro/${jackson2.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-jackson-avro/${upstream.version}</bundle> </feature> <feature name='camel-jackson-protobuf' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-protobuf/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-protobuf/${jackson2.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-jackson-protobuf/${upstream.version}</bundle> </feature> <feature name='camel-jacksonxml' version='${upstream.version}' start-level='50'> @@ -1799,7 +1799,7 @@ </feature> <feature name="camel-jq" version="${upstream.version}" start-level="50"> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:net.thisptr/jackson-jq/${jackson-jq-version}$overwrite=merge&Export-Package=net*;version=${jackson-jq-version}</bundle> <bundle dependency='true'>wrap:mvn:org.jruby.jcodings/jcodings/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:org.jruby.joni/joni/${auto-detect-version}</bundle> @@ -1811,19 +1811,19 @@ </feature> <feature name='camel-jslt' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:com.schibsted.spt.data/jslt/${jslt-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-jslt/${upstream.version}</bundle> </feature> <feature name='camel-jsonata' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:com.dashjoin/jsonata/${jsonata-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-jsonata/${upstream.version}</bundle> </feature> <feature name='camel-json-patch' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:com.github.java-json-tools/json-patch/${json-patch-version}$overwrite=merge&Export-Package=com.github.fge*;version=${json-patch-version}&Import-Package=com.fasterxml*,com.github*;javax*</bundle> <bundle dependency='true'>wrap:mvn:com.github.java-json-tools/jackson-coreutils/${auto-detect-version}$overwrite=merge&Export-Package=com.github.fge*;version=${auto-detect-version}&Import-Package=com.fasterxml*,com.github*;javax*</bundle> <bundle dependency='true'>mvn:com.github.java-json-tools/msg-simple/${auto-detect-version}</bundle> @@ -1832,10 +1832,10 @@ </feature> <feature name='camel-json-validator' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:com.networknt/json-schema-validator/${networknt-json-schema-validator-version}</bundle> <bundle dependency='true'>mvn:com.ethlo.time/itu/${auto-detect-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-json-validator/${upstream.version}</bundle> </feature> @@ -1853,7 +1853,7 @@ </feature> <feature name='camel-jsonpath' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:com.jayway.jsonpath/json-path/${json-path-version}</bundle> <bundle dependency='true'>mvn:net.minidev/json-smart/${json-smart-version}</bundle> <bundle dependency='true'>mvn:net.minidev/accessors-smart/${json-smart-version}</bundle> @@ -1892,8 +1892,8 @@ </feature> <feature name='camel-knative' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-cloudevents</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2-version}</bundle> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-knative/${upstream.version}</bundle> </feature> <feature name='camel-knative-http' version='${upstream.version}' start-level='50'> @@ -1905,7 +1905,7 @@ </feature> <feature name='camel-kubernetes' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:io.fabric8/kubernetes-client/${kubernetes-client-version}</bundle> <bundle dependency='true'>wrap:mvn:io.fabric8/kubernetes-client-api/${kubernetes-client-version}</bundle> <bundle dependency='true'>mvn:io.fabric8/kubernetes-model-admissionregistration/${kubernetes-client-version}</bundle> @@ -1951,7 +1951,7 @@ </feature> <feature name='camel-langchain4j-chat' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-core/${langchain4j-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-langchain4j-chat/${upstream.version}</bundle> </feature> @@ -1973,7 +1973,7 @@ </feature> <feature name='camel-langchain4j-tools' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-core/${langchain4j-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-langchain4j-tools/${upstream.version}</bundle> </feature> @@ -2009,7 +2009,7 @@ </feature> <feature name='camel-leveldb' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:org.iq80.leveldb/leveldb/${leveldb-version}</bundle> <bundle dependency='true'>mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-leveldb/${upstream.version}</bundle> @@ -2028,7 +2028,7 @@ <feature name='camel-lumberjack' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version='[4.1,5)'>netty</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle>mvn:org.apache.camel.karaf/camel-lumberjack/${upstream.version}</bundle> </feature> <feature name='camel-lzf' version='${upstream.version}' start-level='50'> @@ -2047,7 +2047,7 @@ <feature name='camel-mail-microsoft-oauth' version='${upstream.version}' start-level='50'> <feature version='[${azure-core-version},2)'>azure-msal4j</feature> <feature version='${camel-osgi-version-range}'>camel-mail</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:org.ow2.asm/asm/${auto-detect-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-mail-microsoft-oauth/${upstream.version}</bundle> </feature> @@ -2062,7 +2062,7 @@ </feature> <feature name='camel-metrics' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle> <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-jmx/${metrics-version}</bundle> <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-version}</bundle> @@ -2070,7 +2070,7 @@ </feature> <feature name='camel-micrometer' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:io.micrometer/micrometer-core/${micrometer-version}$overwrite=merge&Import-Package=*;resolution:=optional</bundle> <bundle dependency='true'>mvn:io.micrometer/micrometer-commons/${micrometer-version}</bundle> <bundle dependency='true'>mvn:io.micrometer/micrometer-registry-jmx/${micrometer-version}</bundle> @@ -2246,7 +2246,7 @@ <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version="[4,5)">http-client</feature> <feature version="[6,7)">jakarta-servlet</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:org.apache.olingo/odata-commons-api/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:org.apache.olingo/odata-commons-core/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:org.apache.olingo/odata-client-api/${auto-detect-version}</bundle> @@ -2257,7 +2257,7 @@ <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> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${auto-detect-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:com.fasterxml/aalto-xml/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-common/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-transport/${auto-detect-version}</bundle> @@ -2271,12 +2271,12 @@ </feature> <feature name='camel-openapi-java' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[3,4)'>jakarta-validation</feature> <bundle dependency='true'>wrap:mvn:org.apache.camel/camel-tooling-util/${camel-version}$Export-Package=org.apache.camel*;version=${camel-version}</bundle> <bundle dependency='true'>wrap:mvn:org.apache.camel/camel-xml-io/${camel-version}$Export-Package=org.apache.camel*;version=${camel-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle> <bundle dependency='true'>wrap:mvn:io.swagger.parser.v3/swagger-parser-core/${swagger-openapi3-java-parser-version}</bundle> <bundle dependency='true'>wrap:mvn:io.swagger.parser.v3/swagger-parser-v3/${swagger-openapi3-java-parser-version}</bundle> @@ -2288,14 +2288,14 @@ </feature> <feature name='camel-openapi-validator' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:io.swagger.core.v3/swagger-models/${auto-detect-version}</bundle> <bundle dependency='true'>wrap:mvn:com.atlassian.oai/swagger-request-validator-core/${swagger-request-validator-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-openapi-validator/${upstream.version}</bundle> </feature> <feature name='camel-opensearch' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[4,5)">http-client</feature> <bundle dependency='true'>mvn:jakarta.json/jakarta.json-api/${jakarta-json-api-version}</bundle> <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle> @@ -2306,7 +2306,7 @@ </feature> <feature name='camel-openstack' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[33,34)'>guava</feature> <!-- use wrap to override the guava version --> <bundle dependency='true'>wrap:mvn:com.github.openstack4j.core/openstack4j-core/${openstack4j-version}$overwrite=merge&Import-Package=com.fasterxml*,com.github*,javax*,org*,com.google*;version='[33,34)'</bundle> @@ -2348,7 +2348,7 @@ </feature> <feature name='camel-parquet-avro' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle> <bundle dependency='true'>mvn:org.apache.avro/avro/${avro-version}</bundle> @@ -2423,12 +2423,12 @@ </feature> <feature name='camel-plc4x' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:org.apache.plc4x/plc4j-api/${plc4x-version}</bundle> <bundle dependency='true'>mvn:org.apache.plc4x/plc4j-scraper/${plc4x-version}</bundle> <bundle dependency='true'>mvn:org.apache.plc4x/plc4j-connection-cache/${plc4x-version}</bundle> <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-collections4/${commons-collections4-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle> @@ -2514,7 +2514,7 @@ </feature> <feature name='camel-redis' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[4.1,5)'>netty</feature> <feature version='${camel-osgi-spring-version}'>spring</feature> <bundle dependency='true'>mvn:org.redisson/redisson/${redisson-version}</bundle> @@ -2522,7 +2522,7 @@ <bundle dependency='true'>mvn:com.esotericsoftware/minlog/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:com.esotericsoftware/reflectasm/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:org.objenesis/objenesis/${objenesis-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle> @@ -2552,7 +2552,7 @@ </feature> <feature name='camel-rest-openapi' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-platform-http</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:io.swagger.parser.v3/swagger-parser-core/${swagger-openapi3-java-parser-version}</bundle> <bundle dependency='true'>wrap:mvn:io.swagger.parser.v3/swagger-parser-v3/${swagger-openapi3-java-parser-version}</bundle> <bundle dependency='true'>mvn:io.swagger.core.v3/swagger-core-jakarta/${swagger-openapi3-version}</bundle> @@ -2590,12 +2590,12 @@ <feature name='camel-salesforce' version='${upstream.version}' start-level='50'> <feature version="${jetty12.tesb.version-range}">jetty</feature> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[32,33)">guava</feature> <feature version="[3,4)">jakarta-validation</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema-jakarta/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema-jakarta/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle dependency='true'>wrap:mvn:io.grpc/grpc-api/${grpc-version}</bundle> <bundle dependency='true'>wrap:mvn:io.grpc/grpc-protobuf/${grpc-version}</bundle> @@ -2617,7 +2617,7 @@ </feature> <feature name='camel-sap-netweaver' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle>mvn:org.apache.camel.karaf/camel-sap-netweaver/${upstream.version}</bundle> </feature> <feature name='camel-saxon' version='${upstream.version}' start-level='50'> @@ -2637,14 +2637,14 @@ </feature> <feature name='camel-servicenow' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='${camel-osgi-version-range}'>camel-cxf</feature> <feature version="[4,5)">jaxb-runtime</feature> <feature version="[5,6)">jakarta-servlet</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson2.tesb.version}</bundle> <bundle dependency='true'>mvn:org.apache.ws.xmlschema/xmlschema-core/${auto-detect-version}</bundle> <bundle dependency='true'>mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${cxf.tesb.version}</bundle> <bundle dependency='true'>mvn:org.apache.cxf/cxf-rt-rs-security-jose-jaxrs/${cxf-version}</bundle> @@ -2737,7 +2737,7 @@ </feature> <feature name='camel-splunk-hec' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[5,6)'>http-client</feature> <bundle dependency='true'>mvn:commons-validator/commons-validator/${commons-validator-version}</bundle> <bundle dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle> @@ -2820,7 +2820,7 @@ </feature> <feature name='camel-stitch' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[4.1,5)'>netty</feature> <bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle> <bundle dependency='true'>mvn:io.projectreactor/reactor-core/${reactor-version}</bundle> @@ -2871,7 +2871,7 @@ </feature> <feature name='camel-tahu' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle>mvn:org.eclipse.tahu/tahu-core/${tahu-version}</bundle> <bundle>mvn:org.eclipse.tahu/tahu-edge/${tahu-version}</bundle> <bundle>mvn:org.eclipse.tahu/tahu-host/${tahu-version}</bundle> @@ -2888,7 +2888,7 @@ <feature name='camel-telegram' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version='${camel-osgi-version-range}'>camel-webhook</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-telegram/${upstream.version}</bundle> </feature> @@ -2943,7 +2943,7 @@ </feature> <feature name='camel-twilio' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[4,5)">http-client</feature> <bundle dependency='true'>wrap:mvn:com.twilio.sdk/twilio/${twilio-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-twilio/${upstream.version}</bundle> @@ -2984,7 +2984,7 @@ </feature> <feature name='camel-vertx' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-vertx-common</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle>mvn:org.apache.camel.karaf/camel-vertx/${upstream.version}</bundle> </feature> <feature name='camel-vertx-common' version='${upstream.version}' start-level='50'> @@ -3017,14 +3017,14 @@ </feature> <feature name='camel-wasm' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:com.dylibso.chicory/runtime/${chicocy-version}</bundle> <bundle dependency='true'>wrap:mvn:com.dylibso.chicory/wasm/${chicocy-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-wasm/${upstream.version}</bundle> </feature> <feature name='camel-weather' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version='[5,6)'>http-client</feature> <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents.core5/httpcore5-h2/${httpclient-version}$Bundle-SymbolicName=org.apache.httpcore5.h2&Bundle-Version=${httpclient-version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-weather/${upstream.version}</bundle> @@ -3046,16 +3046,16 @@ <feature name='camel-whatsapp' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> <feature version='${camel-osgi-version-range}'>camel-webhook</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> + <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-whatsapp/${upstream.version}</bundle> </feature> <feature name='camel-wordpress' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-cxf</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> - <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson2-version}</bundle> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson2.tesb.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson2.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-wordpress/${upstream.version}</bundle> </feature> <feature name='camel-workday' version='${upstream.version}' start-level='50'> @@ -3065,7 +3065,7 @@ </feature> <feature name='camel-xchange' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>wrap:mvn:org.knowm.xchange/xchange-core/${xchange-version}</bundle> <bundle dependency='true'>wrap:mvn:org.knowm.xchange/xchange-binance/${xchange-version}</bundle> <bundle dependency='true'>wrap:mvn:com.github.mmazi/rescu/${auto-detect-version}</bundle> @@ -3073,7 +3073,7 @@ </feature> <feature name='camel-xj' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-xslt-saxon</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle>mvn:org.apache.camel.karaf/camel-xj/${upstream.version}</bundle> </feature> <feature name='camel-xmlsecurity' version='${upstream.version}' start-level='50'> @@ -3107,7 +3107,7 @@ </feature> <feature name='camel-zeebe' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle dependency='true'>wrap:mvn:io.camunda/zeebe-client-java/${zeebe-version}</bundle> <bundle dependency='true'>wrap:mvn:io.camunda/zeebe-gateway-protocol-impl/${zeebe-version}</bundle> @@ -3139,7 +3139,7 @@ </feature> <feature name='camel-zookeeper' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[32,33)">guava</feature> <feature version="[3,4)">zookeeper-core</feature> <!-- <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Export-Package=org.apache.zookeeper*;version=${zookeeper-version}</bundle> --> @@ -3152,7 +3152,7 @@ </feature> <feature name='camel-zookeeper-master' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-core</feature> - <feature version='${camel-osgi-jackson2-version}'>jackson</feature> + <feature version='${camel-osgi-jackson2.tesb.version}'>jackson</feature> <feature version="[32,33)">guava</feature> <feature version="[3,4)">zookeeper-core</feature> <!-- <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Export-Package=org.apache.zookeeper*;version=${zookeeper-version}</bundle> --> diff --git a/pom.xml b/pom.xml index 922054a83..393878399 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ <camel-spring.tesb.version>4.8.1.20240820</camel-spring.tesb.version> <camel-blueprint.tesb.version>4.8.1.20240820</camel-blueprint.tesb.version> - <cxf.tesb.version>4.1.0.20241216</cxf.tesb.version> + <cxf.tesb.version>4.1.0.1</cxf.tesb.version> <jetty11.tesb.version>11.0.21</jetty11.tesb.version> <jetty12.tesb.version>12.0.15</jetty12.tesb.version> <jetty.tesb.version>${jetty12.tesb.version}</jetty.tesb.version> @@ -105,6 +105,8 @@ <jetty12.tesb.version-range>[12,13)</jetty12.tesb.version-range> <jetty.tesb.version-range>${jetty12.tesb.version-range}</jetty.tesb.version-range> <async-http-client.tesb.version>2.12.4</async-http-client.tesb.version> + <jackson-asl.tesb.version>1.9.16-TALEND</jackson-asl.tesb.version> + <jackson2.tesb.version>2.18.2</jackson2.tesb.version> <jaxb3-istack.tesb.version>4.0.1</jaxb3-istack.tesb.version> <jaxb3-fastinfoset.tesb.version>2.0.0</jaxb3-fastinfoset.tesb.version> <jaxb3-staxex.tesb.version>2.0.1</jaxb3-staxex.tesb.version> @@ -116,6 +118,7 @@ <jython-standalone.tesb.version>${jython-version}</jython-standalone.tesb.version> <kudu.tesb.version>1.17.1</kudu.tesb.version> <mina.tesb.version>2.2.4</mina.tesb.version> + <paranamer.tesb.version>2.8</paranamer.tesb.version> <protobuf.tesb.version>3.25.5</protobuf.tesb.version> <pulsar.tesb.version>3.3.3</pulsar.tesb.version> <velocity.tesb.version>2.4.1</velocity.tesb.version> @@ -124,6 +127,7 @@ <zookeeper-server.tesb.version>3.9.3.jetty12.1</zookeeper-server.tesb.version> <camel-osgi-cxf.tesb.version>[4.1,4.2)</camel-osgi-cxf.tesb.version> <camel-osgi-jetty.tesb.version>[12,13)</camel-osgi-jetty.tesb.version> + <camel-osgi-jackson2.tesb.version>[2.18,2.19)</camel-osgi-jackson2.tesb.version> <jdk-version>17</jdk-version> <maven.compiler.source>${jdk-version}</maven.compiler.source> @@ -199,8 +203,8 @@ <consul-client-version>1.4.1</consul-client-version> <couchbase-client-version>3.7.2</couchbase-client-version> <curator-version>5.7.0</curator-version> - <cxf-version>4.1.0</cxf-version> - <cxf-codegen-plugin-version>4.1.0</cxf-codegen-plugin-version> + <cxf-version>4.1.0.1</cxf-version> + <cxf-codegen-plugin-version>4.1.0.1</cxf-codegen-plugin-version> <cxf-xjc-plugin-version>4.1.0</cxf-xjc-plugin-version> <cxf-xjc-utils-version>4.1.0</cxf-xjc-utils-version> <datasonnet-mapper-version>2.5.2-jakarta4</datasonnet-mapper-version> @@ -565,7 +569,7 @@ <camel-osgi-spring-version>[6.1,6.2)</camel-osgi-spring-version> <camel-osgi-saaj-version>[2,4)</camel-osgi-saaj-version> <camel-osgi-slf4j-version>[2,3)</camel-osgi-slf4j-version> - <camel-osgi-cxf-version>[4.0,4.2)</camel-osgi-cxf-version> + <camel-osgi-cxf-version>[4.1,4.2)</camel-osgi-cxf-version> <!-- Camel Karaf OSGI version ranges --> <camel-osgi-version-clean>4.8</camel-osgi-version-clean> @@ -745,6 +749,8 @@ <jetty12.tesb.version-range>${jetty12.tesb.version-range}</jetty12.tesb.version-range> <jetty.tesb.version-range>${jetty.tesb.version-range}</jetty.tesb.version-range> <async-http-client.tesb.version>${async-http-client.tesb.version}</async-http-client.tesb.version> + <jackson-asl.tesb.version>${jackson-asl.tesb.version}</jackson-asl.tesb.version> + <jackson2.tesb.version>${jackson2.tesb.version}</jackson2.tesb.version> <jaxb3-istack.tesb.version>${jaxb3-istack.tesb.version}</jaxb3-istack.tesb.version> <jaxb3-fastinfoset.tesb.version>${jaxb3-fastinfoset.tesb.version}</jaxb3-fastinfoset.tesb.version> <jaxb3-staxex.tesb.version>${jaxb3-staxex.tesb.version}</jaxb3-staxex.tesb.version> @@ -756,6 +762,7 @@ <jython-standalone.tesb.version>${jython-standalone.tesb.version}</jython-standalone.tesb.version> <kudu.tesb.version>${kudu.tesb.version}</kudu.tesb.version> <mina.tesb.version>${mina.tesb.version}</mina.tesb.version> + <paranamer.tesb.version>${paranamer.tesb.version}</paranamer.tesb.version> <protobuf.tesb.version>${protobuf.tesb.version}</protobuf.tesb.version> <pulsar.tesb.version>${pulsar.tesb.version}</pulsar.tesb.version> <velocity.tesb.version>${velocity.tesb.version}</velocity.tesb.version>