Merge pull request #1005 from apache/7.0.x/WW-5449-remove-vel-tools

WW-5449 Make Velocity Tools dependency optional for Velocity plugin
apache · Jul 29, 2024 · 817b0cd · 817b0cd
2 parents 6265455 + ca358c5
commit 817b0cd
Show file tree

Hide file tree

Showing 8 changed files with 310 additions and 234 deletions.
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
@@ -87,6 +87,14 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-velocity-plugin</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>

diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
@@ -44,6 +44,16 @@
             <artifactId>struts2-velocity-plugin</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
+            <optional>true</optional>
+        </dependency>
 
    </dependencies>
     <properties>

diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
@@ -42,11 +42,12 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
+            <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>