From 0e6d31729c2e45ac090803fb5a5c491b473ea3e0 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 20 Nov 2023 14:49:28 -0600
Subject: [PATCH] WN-5141

- use eclipse transformer for Velocity Tools View and Velocity Tools View Jsp
---
 plugins/tiles/pom.xml                 | 11 ++--
 plugins/velocity/pom.xml              |  8 +--
 pom.xml                               | 21 +++++---
 velocity-tools-jsp-jakarta/README.md  |  3 ++
 velocity-tools-jsp-jakarta/pom.xml    | 77 +++++++++++++++++++++++++++
 velocity-tools-view-jakarta/README.md |  3 ++
 velocity-tools-view-jakarta/pom.xml   | 71 ++++++++++++++++++++++++
 7 files changed, 179 insertions(+), 15 deletions(-)
 create mode 100644 velocity-tools-jsp-jakarta/README.md
 create mode 100644 velocity-tools-jsp-jakarta/pom.xml
 create mode 100644 velocity-tools-view-jakarta/README.md
 create mode 100644 velocity-tools-view-jakarta/pom.xml

diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index b28ef17ca..e017c018c 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -80,14 +80,15 @@
             <artifactId>velocity-engine-core</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.velocity.tools</groupId>
-            <artifactId>velocity-tools-view</artifactId>
+         <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
             <optional>true</optional>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.velocity.tools</groupId>
-            <artifactId>velocity-tools-view-jsp</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index 8a3e05738..125d65259 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -40,13 +40,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.velocity.tools</groupId>
-            <artifactId>velocity-tools-view</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.velocity.tools</groupId>
-            <artifactId>velocity-tools-view-jsp</artifactId>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index cf5376129..c59b0be74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,8 @@
         <module>bom</module>
         <module>freemarker-jakarta</module>
         <module>sitemesh2-jakarta</module>
+        <module>velocity-tools-view-jakarta</module>
+        <module>velocity-tools-jsp-jakarta</module>
         <module>core</module>
         <module>plugins</module>
         <module>bundles</module>
@@ -122,6 +124,7 @@
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <freemarker.version>2.3.32</freemarker.version>
         <sitemesh.version>2.5.0</sitemesh.version>
+        <velocity-tools.version>3.1</velocity-tools.version>
 
         <!-- Site generation -->
         <fluido-skin.version>1.9</fluido-skin.version>
@@ -693,15 +696,21 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.velocity.tools</groupId>
-                <artifactId>velocity-tools-view</artifactId>
-                <version>3.1</version>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.velocity.tools</groupId>
-                <artifactId>velocity-tools-view-jsp</artifactId>
-                <version>3.1</version>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            
+            <dependency>
+              <groupId>org.apache.velocity.tools</groupId>
+              <artifactId>velocity-tools-generic</artifactId>
+              <version>${velocity-tools.version}</version>
             </dependency>
 
             <dependency>
diff --git a/velocity-tools-jsp-jakarta/README.md b/velocity-tools-jsp-jakarta/README.md
new file mode 100644
index 000000000..a91b06a96
--- /dev/null
+++ b/velocity-tools-jsp-jakarta/README.md
@@ -0,0 +1,3 @@
+# Struts 2 Velocity Tools Jsp Jakarta
+This uses the eclipse transformer maven plugin to make the Velocity Tools Jsp dependency Jakarta EE 9+ compatible.
+
diff --git a/velocity-tools-jsp-jakarta/pom.xml b/velocity-tools-jsp-jakarta/pom.xml
new file mode 100644
index 000000000..92fd1ac95
--- /dev/null
+++ b/velocity-tools-jsp-jakarta/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-parent</artifactId>
+    <version>7.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
+  <packaging>jar</packaging>
+  <name>Struts 2 Jakarta EE Compatible Velocity Tools Jsp</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.site.skip>true</maven.site.skip>
+    <maven.site.deploy.skip>true</maven.site.deploy.skip>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>eclipse-transformer-velocity-tools-jsp-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.velocity.tools</groupId>
+                <artifactId>velocity-tools-view-jsp</artifactId>
+                <version>${velocity-tools.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.velocity.tools</groupId>
+      <artifactId>velocity-tools-generic</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/velocity-tools-view-jakarta/README.md b/velocity-tools-view-jakarta/README.md
new file mode 100644
index 000000000..422068ce1
--- /dev/null
+++ b/velocity-tools-view-jakarta/README.md
@@ -0,0 +1,3 @@
+# Struts 2 Velocity Tools Jakarta
+This uses the eclipse transformer maven plugin to make the Velocity Tools dependency Jakarta EE 9+ compatible.
+
diff --git a/velocity-tools-view-jakarta/pom.xml b/velocity-tools-view-jakarta/pom.xml
new file mode 100644
index 000000000..d25f71203
--- /dev/null
+++ b/velocity-tools-view-jakarta/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-parent</artifactId>
+    <version>7.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
+  <packaging>jar</packaging>
+  <name>Struts 2 Jakarta EE Compatible Velocity Tools View</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.site.skip>true</maven.site.skip>
+    <maven.site.deploy.skip>true</maven.site.deploy.skip>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>transformer-maven-plugin</artifactId>
+        <version>0.5.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <rules>
+            <jakartaDefaults>true</jakartaDefaults>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>eclipse-transformer-velocity-tools-view-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <artifact>
+                <groupId>org.apache.velocity.tools</groupId>
+                <artifactId>velocity-tools-view</artifactId>
+                <version>${velocity-tools.version}</version>
+              </artifact>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>