Merge pull request #956 from jbonofre/KARAF-6451
[KARAF-6451] Upgrade to Jackson 2.10.0
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 9ecbc00..63ff686 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -281,9 +281,9 @@
<feature name="docker" description="Docker service and commands" version="${project.version}">
<details>Docker support providing service, commands, and MBean.</details>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.10</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.10</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.10</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
<bundle>mvn:org.apache.karaf.docker/org.apache.karaf.docker.core/${project.version}</bundle>
</feature>
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 35d87fd..55e677a 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -104,9 +104,9 @@
<feature version="[5.1,6)">spring-jdbc</feature>
<feature version="[5.1,6)">spring-tx</feature>
<feature version="[5.1,6)">spring-web</feature>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.10</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.10</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.10</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security51.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security51.version}</bundle>
diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml
index 0294d7e..6b4f9bc 100644
--- a/examples/karaf-rest-example/pom.xml
+++ b/examples/karaf-rest-example/pom.xml
@@ -42,7 +42,6 @@
<properties>
<cxf.version>3.3.2</cxf.version>
- <jackson.version>2.9.10</jackson.version>
</properties>
</project>
diff --git a/pom.xml b/pom.xml
index eb2e128..20b2d07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
<awaitility.version>3.1.6</awaitility.version>
<bouncycastle.version>1.62</bouncycastle.version>
<cglib.bundle.version>3.2.9_1</cglib.bundle.version>
-
+ <jackson.version>2.10.0</jackson.version>
<jna.version>5.4.0</jna.version>
<jaxb.version>2.3.2</jaxb.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
@@ -167,7 +167,6 @@
<commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.6.2</commons-pool2.version>
<commons-io.version>2.6</commons-io.version>
-
<dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
<eclipselink.version>2.7.4</eclipselink.version>
<jasypt.bundle.version>1.9.3_1</jasypt.bundle.version>
