This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.25.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6ccde83cb3bcc46ba235421dbf5a640bc19b59d2 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Dec 18 14:02:26 2020 +0100 Fixing karaf features --- parent/pom.xml | 5 +++-- platforms/karaf/features/src/main/resources/features.xml | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1f89f1b..86bd7ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -151,7 +151,7 @@ <commons-jexl2-version>2.1.1</commons-jexl2-version> <commons-jxpath-version>1.3</commons-jxpath-version> <commons-lang-version>2.6</commons-lang-version> - <commons-lang3-version>3.8.1</commons-lang3-version> + <commons-lang3-version>3.11</commons-lang3-version> <commons-logging-version>1.2</commons-logging-version> <commons-math-version>2.2</commons-math-version> <commons-math3-version>3.6.1</commons-math3-version> @@ -446,7 +446,7 @@ <kafka-version>2.1.0</kafka-version> <kafka-bundle-version>2.1.0_1</kafka-bundle-version> <karaf2-version>2.4.4</karaf2-version> - <karaf4-version>4.2.1</karaf4-version> + <karaf4-version>4.2.10</karaf4-version> <kie-version>7.14.0.Final</kie-version> <krati-version>0.4.9</krati-version> <kubernetes-client-version>4.1.1</kubernetes-client-version> @@ -682,6 +682,7 @@ <swagger-ui-version>2.2.10</swagger-ui-version> <stax-api-version>1.0.1</stax-api-version> <stax2-api-bundle-version>3.1.4</stax2-api-bundle-version> + <stax2v4-api-bundle-version>4.2</stax2v4-api-bundle-version> <stringtemplate-bundle-version>4.0.8_1</stringtemplate-bundle-version> <stringtemplate-version>4.0.8</stringtemplate-version> <tagsoup-bundle-version>1.2.1_1</tagsoup-bundle-version> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 617b80a..ac2a58a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -430,7 +430,7 @@ <feature name='camel-consul' version='${project.version}' resolver='(obr)' start-level='50'> <details>camel-consul currently do not work in OSGi</details> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/22.0</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> @@ -630,6 +630,7 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle> @@ -1176,6 +1177,7 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle> <bundle>mvn:org.apache.camel/camel-jacksonxml/${project.version}</bundle> </feature> @@ -1318,6 +1320,10 @@ </feature> <feature name='camel-johnzon' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm-version}</bundle> + <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle> + <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle> + <bundle dependency='true'>mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}</bundle> <bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle> <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle> <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle> @@ -2066,6 +2072,7 @@ <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle> <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm-version}</bundle> <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle> + <bundle dependency='true'>mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}</bundle> <bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle> <bundle>mvn:org.codehaus.groovy/groovy/${groovy-version}</bundle> <bundle>mvn:org.codehaus.groovy/groovy-jsr223/${groovy-version}</bundle> @@ -2521,6 +2528,7 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> <bundle>mvn:org.apache.camel/camel-wordpress/${project.version}</bundle> </feature>
