diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-10-19 10:07:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 10:07:46 +0200 |
| commit | 969bd7338215bbf1919ee2bb5884ee30e092353b (patch) | |
| tree | ea52147ca18dfe6005d86da09f9f7182542f106b /node-admin | |
| parent | da0d3160666a9b5248e542b338e6331e02fb7cfa (diff) | |
| parent | e9e6e2be791c041d16287fa4ce6097466aff404b (diff) | |
Merge pull request #19611 from vespa-engine/upgrade-velocity
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, 4 insertions, 2 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 29bc8406b15..63d854d4ffe 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -73,7 +73,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</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 26d97d06724..f0ba6272679 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,6 +3,8 @@ 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; @@ -19,7 +21,7 @@ import static com.yahoo.yolean.Exceptions.uncheck; public class Template { static { - Velocity.addProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogSystem"); + Velocity.addProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, NOPLogger.NOP_LOGGER); Velocity.init(); } |