This is an automated email from the ASF dual-hosted git repository.
mehul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new acb41b9 RANGER-3213 : Upgrade to velocity 2.3
acb41b9 is described below
commit acb41b92663670b0bb50863bc2550ac9863e62fb
Author: mateenmansoori <[email protected]>
AuthorDate: Wed Mar 31 14:40:02 2021 +0530
RANGER-3213 : Upgrade to velocity 2.3
Signed-off-by: Mehul Parikh <[email protected]>
---
pom.xml | 2 +-
security-admin/pom.xml | 2 +-
security-admin/src/main/webapp/META-INF/applicationContext.xml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 022b6a9..0b0dfad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,7 @@
<sun-jersey-bundle.version>1.19</sun-jersey-bundle.version>
<tomcat.embed.version>8.5.63</tomcat.embed.version>
<testng.version>6.9.4</testng.version>
- <velocity.version>1.7</velocity.version>
+ <velocity.version>2.3</velocity.version>
<zookeeper.version>3.4.14</zookeeper.version>
<codehaus.woodstox.stax2api.version>3.1.4</codehaus.woodstox.stax2api.version>
<fasterxml.woodstox.version>5.0.3</fasterxml.woodstox.version>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 86e46b9..94425a5 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -362,7 +362,7 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
</dependency>
<dependency>
diff --git a/security-admin/src/main/webapp/META-INF/applicationContext.xml
b/security-admin/src/main/webapp/META-INF/applicationContext.xml
index b24f4d4..066a201 100644
--- a/security-admin/src/main/webapp/META-INF/applicationContext.xml
+++ b/security-admin/src/main/webapp/META-INF/applicationContext.xml
@@ -215,6 +215,7 @@ http://www.springframework.org/schema/util/spring-util.xsd";>
<value>resource.loader=class
class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader</value>
</property>
+ <property name="overrideLogging" value="false" />
</bean>
<bean id="messageSource"
class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
<property name="basenames">
