You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2022/04/10 04:56:40 UTC

[activemq] branch activemq-5.16.x updated: [AMQ-8556] Upgrade Jackson 2.13.2 (#805)

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
     new 9a3035738 [AMQ-8556] Upgrade Jackson 2.13.2 (#805)
9a3035738 is described below

commit 9a303573864460252eb364670487be375138c1cd
Author: Matt Pavlovich <ma...@hyte.io>
AuthorDate: Sat Apr 9 07:54:34 2022 -0500

    [AMQ-8556] Upgrade Jackson 2.13.2 (#805)
    
    (cherry picked from commit a4c03a15090ad3ac8954c22fe72146b59152d9db)
---
 activemq-karaf/src/main/resources/features-core.xml | 2 +-
 pom.xml                                             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index ac1eb4549..b8604c5bb 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-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 9e0a54ff5..03c51cdf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,8 @@
     <httpclient-version>4.5.13</httpclient-version>
     <httpcore-version>4.4.15</httpcore-version>
     <insight-version>1.2.0.Beta4</insight-version>
-    <jackson-version>2.13.1</jackson-version>
+    <jackson-version>2.13.2</jackson-version>
+    <jackson-databind-version>2.13.2.2</jackson-databind-version>
     <jasypt-version>1.9.3</jasypt-version>
     <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
     <jetty9-version>9.4.45.v20220203</jetty9-version>
@@ -711,7 +712,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 -->