diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-10-19 11:55:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-19 11:55:44 +0200 |
commit | d5ff7f6927a15f7d0ea2835e7447b968d5513d72 (patch) | |
tree | d2a3dcdf4d675754e41d7a78e407201ccff23371 /node-admin | |
parent | 007ed3495ad085b79740e94690db15fcce2510a6 (diff) |
Revert "Upgrade from velocity:1.7 to velocity-engine-core:2.3"
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/pom.xml | 2 | ||||
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 63d854d4ffe..29bc8406b15 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -73,7 +73,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity-engine-core</artifactId> + <artifactId>velocity</artifactId> <scope>compile</scope> </dependency> diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java index f0ba6272679..26d97d06724 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/Template.java @@ -3,8 +3,6 @@ package com.yahoo.vespa.hosted.node.admin.task.util.file; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeConstants; -import org.slf4j.helpers.NOPLogger; import java.io.StringWriter; import java.nio.file.Files; @@ -21,7 +19,7 @@ import static com.yahoo.yolean.Exceptions.uncheck; public class Template { static { - Velocity.addProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, NOPLogger.NOP_LOGGER); + Velocity.addProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogSystem"); Velocity.init(); } |