commit 31f29438989e30dcc4213776b9c74fb69be61be0
author Jean-Baptiste Onofré <jbonofre@apache.org> Mon Nov 18 21:54:46 2019 +0100
committer GitHub <noreply@github.com> Mon Nov 18 21:54:46 2019 +0100
tree 688f82db906cdb23adbbe36f4adab5f7b482a962
parent 1c5b7cc66b9b314a7f2c27bf6231344b10a5c2bc
parent 6cf846e0509ddedbd2d3d1f5697b07e5ff36a8a0

Merge pull request #416 from jbonofre/AMQ-7345

[AMQ-7345] Upgrade to jackson-databind 2.9.10.1

activemq-console/pom.xml

diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index e8b30f2..826b1eb 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -125,7 +125,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
+      <artifactId>velocity-engine-core</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>

assembly/src/main/descriptors/common-bin.xml

diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 77f4753..9a9400c 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -204,7 +204,7 @@
         <include>com.thoughtworks.xstream:xstream</include>
         <include>xpp3:xpp3</include>
         <include>org.codehaus.jettison:jettison</include>
-        <include>org.apache.velocity:velocity</include>
+        <include>org.apache.velocity:velocity-engine-core</include>
         <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>
         <include>org.jasypt:jasypt</include>
         <include>org.jasypt:jasypt-spring31</include>

pom.xml

diff --git a/pom.xml b/pom.xml
index bcd948f..8960f63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <jetty9-version>9.4.22.v20191022</jetty9-version>
     <jetty-version>${jetty9-version}</jetty-version>
     <jmdns-version>3.4.1</jmdns-version>
-    <tomcat-api-version>8.0.53</tomcat-api-version>
+    <tomcat-api-version>9.0.27</tomcat-api-version>
     <jettison-version>1.4.0</jettison-version>
     <jmock-version>2.5.1</jmock-version>
     <jolokia-version>1.6.0</jolokia-version>
@@ -123,7 +123,7 @@
     <spring-version>4.3.24.RELEASE</spring-version>
     <stax2-api-version>3.0.2</stax2-api-version>
     <taglibs-version>1.2.5</taglibs-version>
-    <velocity-version>1.7</velocity-version>
+    <velocity-version>2.1</velocity-version>
     <woodstox-core-asl-version>4.2.0</woodstox-core-asl-version>
     <xalan-version>2.7.2</xalan-version>
     <xmlbeans-version>2.6.0</xmlbeans-version>
@@ -1138,7 +1138,7 @@
 
       <dependency>
         <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity</artifactId>
+        <artifactId>velocity-engine-core</artifactId>
         <version>${velocity-version}</version>
       </dependency>
       <dependency>