[activemq] branch activemq-5.15.x updated: [AMQ-7252] Upgrade to Velocity 2.1

[jbonofre]

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 8434f86  [AMQ-7252] Upgrade to Velocity 2.1
8434f86 is described below

commit 8434f86de80e062a4b91338f3bbf4b3a3c0b013a
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Fri Nov 15 06:07:40 2019 +0100

    [AMQ-7252] Upgrade to Velocity 2.1
    
    (cherry picked from commit 4f07dc5b49fbdc422349abc10c89323fdbdce059)
---
 activemq-console/pom.xml                     | 2 +-
 assembly/src/main/descriptors/common-bin.xml | 2 +-
 pom.xml                                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index a9ca7ca..572ea9d 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>
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>
diff --git a/pom.xml b/pom.xml
index aeebc70..0a25aad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,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>
@@ -1137,7 +1137,7 @@
 
       <dependency>
         <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity</artifactId>
+        <artifactId>velocity-engine-core</artifactId>
         <version>${velocity-version}</version>
       </dependency>
       <dependency>