Upgrade from velocity:1.7 to velocity-engine-core:2.3

2 files changed, 11 insertions, 2 deletions

diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index 29bc8406b15..8fe5b2aecd1 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -73,8 +73,15 @@
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
+            <artifactId>velocity-engine-core</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- Must use the one provided by Jdisc to prevent two instances of slf4j classes. -->
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Test -->
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();
     }