This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new d7f5a9d [AMQ-7345] Upgrade to jackson-databind 2.9.10.1
d7f5a9d is described below
commit d7f5a9d01eccafdfbede19c6b91caddcdb463920
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Mon Nov 18 18:31:59 2019 +0100
[AMQ-7345] Upgrade to jackson-databind 2.9.10.1
(cherry picked from commit 6cf846e0509ddedbd2d3d1f5697b07e5ff36a8a0)
---
activemq-karaf/src/main/resources/features-core.xml | 2 +-
pom.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/activemq-karaf/src/main/resources/features-core.xml
b/activemq-karaf/src/main/resources/features-core.xml
index 53314c0..5ca943d 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -66,7 +66,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-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-annotations/${jackson-version}</bundle>
<bundle
dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
</feature>
diff --git a/pom.xml b/pom.xml
index 0a0b417..e7a76e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
<httpcore-version>4.4.11</httpcore-version>
<insight-version>1.2.0.Beta4</insight-version>
<jackson-version>2.9.10</jackson-version>
+ <jackson-databind-version>2.9.10.1</jackson-databind-version>
<jasypt-version>1.9.2</jasypt-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
<jetty9-version>9.4.22.v20191022</jetty9-version>
@@ -674,7 +675,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson-version}</version>
+ <version>${jackson-databind-version}</version>
</dependency>
<!-- Used to configure the activemq logs -->
