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 f835d60414f1c88340cf0b11c9f818a1c33fd389 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Dec 18 17:53:42 2020 +0100 camel karaf feature fixes --- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 017d422..1fe3239 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -331,6 +331,7 @@ <jackson-spark-version>2.4.5</jackson-spark-version> <jackson2-scala-version>2.6.1</jackson2-scala-version> <jackson2-version>2.9.10</jackson2-version> + <jackson2v11-version>2.11.3</jackson2v11-version> <jackson2-databind-version>2.9.10.7</jackson2-databind-version> <jackrabbit-version>2.19.5</jackrabbit-version> <jackrabbit-guava-version>15.0</jackrabbit-guava-version> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 95415a7..9308441 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1444,6 +1444,7 @@ <feature name='camel-kura' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature>scr</feature> + <bundle dependency='true'>mvn:org.osgi/org.osgi.service.event/1.4.0</bundle> <bundle dependency='true'>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-kura/${project.version}</bundle> </feature> @@ -1768,12 +1769,12 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-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> - <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/${stax2-api-bundle-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2v11-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2v11-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2v11-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2v11-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2v11-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 dependency='true'>mvn:com.fasterxml/aalto-xml/0.9.10</bundle> <bundle dependency='true'>mvn:org.apache.camel/camel-olingo4-api/${project.version}</bundle> @@ -2017,6 +2018,7 @@ </feature> <feature name='camel-sap-netweaver' version='${project.version}' resolver='(obr)' start-level='50'> <feature>http</feature> + <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle> <bundle>mvn:org.apache.camel/camel-sap-netweaver/${project.version}</bundle>
