From 349026b6ee958c56887fdc6a64a14042565a22b0 Mon Sep 17 00:00:00 2001
From: Jason Porter <lightguard.jp@gmail.com>
Date: Thu, 1 Aug 2024 01:57:10 -0600
Subject: [PATCH] [7.67.x-blue] Update velocity engine core (#3829)

* [7.67.x-blue] Updating velocity engine gav

Signed-off-by: Jason Porter <lightguard.jp@gmail.com>

* Updating properties for Velocity 2.1

Removing deprecated properties and setting the correct name for others
that were changed in 2.1

Signed-off-by: Jason Porter <lightguard.jp@gmail.com>

---------

Signed-off-by: Jason Porter <lightguard.jp@gmail.com>
---
 .../kie-wb-common-data-modeller-core/pom.xml             | 2 +-
 .../services/datamodeller/codegen/GenerationEngine.java  | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kie-wb-common-services/kie-wb-common-data-modeller-core/pom.xml b/kie-wb-common-services/kie-wb-common-data-modeller-core/pom.xml
index ea64e5b7253..afe43889c8d 100644
--- a/kie-wb-common-services/kie-wb-common-data-modeller-core/pom.xml
+++ b/kie-wb-common-services/kie-wb-common-data-modeller-core/pom.xml
@@ -87,7 +87,7 @@
     <!-- code adf dependencies -->
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
+      <artifactId>velocity-engine-core</artifactId>
     </dependency>
 
     <!-- java parser dependencies -->
diff --git a/kie-wb-common-services/kie-wb-common-data-modeller-core/src/main/java/org/kie/workbench/common/services/datamodeller/codegen/GenerationEngine.java b/kie-wb-common-services/kie-wb-common-data-modeller-core/src/main/java/org/kie/workbench/common/services/datamodeller/codegen/GenerationEngine.java
index ea1cb91b2bd..6dcb4b48af1 100644
--- a/kie-wb-common-services/kie-wb-common-data-modeller-core/src/main/java/org/kie/workbench/common/services/datamodeller/codegen/GenerationEngine.java
+++ b/kie-wb-common-services/kie-wb-common-data-modeller-core/src/main/java/org/kie/workbench/common/services/datamodeller/codegen/GenerationEngine.java
@@ -69,12 +69,9 @@ private void init() throws Exception {
             // Init velocity engine
             Properties properties = new Properties();
 
-            properties.setProperty("resource.loader", "class");
-            properties.setProperty("class.resource.loader.description", "Velocity Classpath Resource Loader");
-            properties.setProperty("class.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
-
-            //TODO REVIEW THIS
-            properties.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.JdkLogChute");
+            properties.setProperty("resource.loaders", "class");
+            properties.setProperty("resource.loader.class.description", "Velocity Classpath Resource Loader");
+            properties.setProperty("resource.loader.class.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
 
             // init velocity engine
             velocityEngine.init(properties);