Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #414 from jbonofre/AMQ-7252 

[AMQ-7252] Upgrade to Velocity 2.1
This commit is contained in:
Jean-Baptiste Onofré 2019-11-18 21:19:03 +01:00 committed by GitHub
parent f5b1800b0e 4f07dc5b49
commit 0829c3efd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-console/pom.xml
View File

@ -125,7 +125,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId> <artifactId>velocity-engine-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>

2
assembly/src/main/descriptors/common-bin.xml
View File

@ -204,7 +204,7 @@
<include>com.thoughtworks.xstream:xstream</include> <include>com.thoughtworks.xstream:xstream</include>
<include>xpp3:xpp3</include> <include>xpp3:xpp3</include>
<include>org.codehaus.jettison:jettison</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.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>
<include>org.jasypt:jasypt</include> <include>org.jasypt:jasypt</include>
<include>org.jasypt:jasypt-spring31</include> <include>org.jasypt:jasypt-spring31</include>

4
pom.xml
View File

@ -122,7 +122,7 @@
<spring-version>4.3.24.RELEASE</spring-version> <spring-version>4.3.24.RELEASE</spring-version>
<stax2-api-version>3.0.2</stax2-api-version> <stax2-api-version>3.0.2</stax2-api-version>
<taglibs-version>1.2.5</taglibs-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> <woodstox-core-asl-version>4.2.0</woodstox-core-asl-version>
<xalan-version>2.7.2</xalan-version> <xalan-version>2.7.2</xalan-version>
<xmlbeans-version>2.6.0</xmlbeans-version> <xmlbeans-version>2.6.0</xmlbeans-version>
@ -1137,7 +1137,7 @@
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId> <artifactId>velocity-engine-core</artifactId>
<version>${velocity-version}</version> <version>${velocity-version}</version>
</dependency> </dependency>
<dependency> <dependency>