Merge pull request #659 from jbonofre/AMQ-8170
[AMQ-8170] Upgrade to Jackson 2.12.3
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index a3e0829..9fb6629 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -63,7 +63,7 @@
<bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson-version}</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-databind-version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-version}</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
</feature>
</features>
diff --git a/pom.xml b/pom.xml
index b307006..ed08370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,7 @@
<httpclient-version>4.5.13</httpclient-version>
<httpcore-version>4.4.14</httpcore-version>
<insight-version>1.2.0.Beta4</insight-version>
- <jackson-version>2.9.10</jackson-version>
- <jackson-databind-version>2.9.10.8</jackson-databind-version>
+ <jackson-version>2.12.3</jackson-version>
<jasypt-version>1.9.3</jasypt-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
<jetty9-version>9.4.41.v20210516</jetty9-version>
@@ -81,7 +80,7 @@
<json-simple-version>1.1.1</json-simple-version>
<junit-version>4.13.2</junit-version>
<hamcrest-version>1.3</hamcrest-version>
- <karaf-version>4.2.10</karaf-version>
+ <karaf-version>4.2.11</karaf-version>
<log4j-version>1.2.17</log4j-version>
<mockito-version>3.8.0</mockito-version>
<owasp-dependency-check-version>5.2.4</owasp-dependency-check-version>
@@ -622,9 +621,9 @@
<artifactId>qdox</artifactId>
</exclusion>
</exclusions>
-
</dependency>
+ <!-- Jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -638,7 +637,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson-databind-version}</version>
+ <version>${jackson-version}</version>
</dependency>
<!-- Used to configure the activemq logs -->
