struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] 08/11: WW-5049 Adds missing internal dependency
Date Tue, 03 Dec 2019 08:32:58 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5049-velocity-plugin
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 383cc2921577b4779ac101a33b3a1a342cb6a816
Author: Lukasz Lenart <lukaszlenart@apache.org>
AuthorDate: Tue Nov 26 20:52:02 2019 +0100

    WW-5049 Adds missing internal dependency
---
 plugins/config-browser/pom.xml                                 |  7 +++++++
 .../org/apache/struts2/config_browser/ShowBeansAction.java     |  3 ++-
 plugins/osgi/pom.xml                                           | 10 ++--------
 plugins/velocity/pom.xml                                       |  6 ------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index d494d4b..1286000 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -34,4 +34,11 @@
     <properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-plugin</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
index c1eec8a..8827fd8 100644
--- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
+++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
@@ -30,6 +30,7 @@ import org.apache.struts2.components.UrlRenderer;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
+import org.apache.struts2.views.velocity.VelocityConstants;
 import org.apache.struts2.views.velocity.VelocityManager;
 
 import java.util.Map;
@@ -57,7 +58,7 @@ public class ShowBeansAction extends ActionNamesAction {
         bindings.put(ActionMapper.class.getName(), addBindings(container, ActionMapper.class,
StrutsConstants.STRUTS_MAPPER_CLASS));
         bindings.put(MultiPartRequest.class.getName(), addBindings(container, MultiPartRequest.class,
StrutsConstants.STRUTS_MULTIPART_PARSER));
         bindings.put(FreemarkerManager.class.getName(), addBindings(container, FreemarkerManager.class,
StrutsConstants.STRUTS_FREEMARKER_MANAGER_CLASSNAME));
-        bindings.put(VelocityManager.class.getName(), addBindings(container, VelocityManager.class,
StrutsConstants.STRUTS_VELOCITY_MANAGER_CLASSNAME));
+        bindings.put(VelocityManager.class.getName(), addBindings(container, VelocityManager.class,
VelocityConstants.STRUTS_VELOCITY_MANAGER_CLASSNAME));
         bindings.put(UrlRenderer.class.getName(), addBindings(container, UrlRenderer.class,
StrutsConstants.STRUTS_URL_RENDERER));
     }
 
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 9162538..d78412c 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -63,14 +63,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-tools</artifactId>
-            <optional>true</optional>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-velocity-plugin</artifactId>
         </dependency>
 
         <dependency>
diff --git a/plugins/velocity/pom.xml b/plugins/velocity/pom.xml
index de58b17..649e1d4 100644
--- a/plugins/velocity/pom.xml
+++ b/plugins/velocity/pom.xml
@@ -35,12 +35,6 @@
 
         <!-- Velocity -->
         <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-        </dependency>
-
-        <!-- Velocity -->
-        <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
         </dependency>


Mime
View raw message