You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/12/06 10:19:14 UTC
[tomee] branch main updated: Update velocity to 2.3
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new d4c5256f81 Update velocity to 2.3
d4c5256f81 is described below
commit d4c5256f813663477ebea35fbbafe118636e03a8
Author: Swell <57...@users.noreply.github.com>
AuthorDate: Fri Nov 11 10:15:00 2022 +0100
Update velocity to 2.3
---
tomee/pom.xml | 4 ++--
tomee/tomee-embedded/pom.xml | 2 +-
.../src/main/java/org/apache/tomee/embedded/Container.java | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tomee/pom.xml b/tomee/pom.xml
index b9f70b7f6e..2142a877e3 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -159,8 +159,8 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.6.4</version>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index 1152d1d993..fb3b666e95 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -465,7 +465,7 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index 4c1a9402a8..27b003958b 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -80,7 +80,6 @@ import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.log.NullLogChute;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
import org.apache.xbean.finder.AnnotationFinder;
import org.apache.xbean.finder.ResourceFinder;
@@ -1010,7 +1009,6 @@ public class Container implements AutoCloseable {
// don't break apps using Velocity facade
final VelocityEngine engine = new VelocityEngine();
- engine.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM, new NullLogChute());
engine.setProperty(Velocity.RESOURCE_LOADER, "class");
engine.setProperty("class.resource.loader.description", "Velocity Classpath Resource Loader");
engine.setProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName());