Another Cleanup
* Perform cleanup for 'mvn dependency:analyze'
* Move webapps to version 3.1
git-svn-id: https://svn.apache.org/repos/asf/velocity/tools/branches/VELTOOLS-177@1842345 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 8bbb34e..d90ae04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,16 @@
<version>2.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
diff --git a/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml b/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
index 920fc20..8568e12 100644
--- a/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
+++ b/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
@@ -34,10 +34,6 @@
<name>Apache Velocity Tools Examples - Showcase</name>
<description>Showcase of features in Velocity Tools.</description>
-
- <properties>
- <webapp-slf4j-logger.version>1.3</webapp-slf4j-logger.version>
- </properties>
<dependencies>
<dependency>
@@ -56,36 +52,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>httpunit</groupId>
+ <groupId>org.httpunit</groupId>
<artifactId>httpunit</artifactId>
- <version>1.7</version>
+ <version>1.7.3</version>
<scope>test</scope>
</dependency>
- <!-- httpunit pom marks rhino.js as optional whereas it is not -->
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.7R2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-view-jsp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>javax.servlet.jsp.jstl-api</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.republicate</groupId>
- <artifactId>webapp-slf4j-logger</artifactId>
- <version>${webapp-slf4j-logger.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml b/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
index 898a756..59f44aa 100644
--- a/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
+++ b/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
@@ -19,10 +19,9 @@
under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3.0.xsd"
- version="3.0">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<!-- servlets -->
<servlet>
<servlet-name>velocity</servlet-name>
@@ -53,7 +52,7 @@
<context-param>
<param-name>org.apache.velocity.tools.userCanOverwriteTools</param-name>
<param-value>false</param-value>
- </context-param>
+ </context-param>
<!-- welcome file -->
<welcome-file-list>
<welcome-file>index.vm</welcome-file>
diff --git a/velocity-tools-examples/velocity-tools-examples-simple/pom.xml b/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
index dc23b86..946348d 100644
--- a/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
+++ b/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
@@ -37,9 +37,31 @@
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools-view-jsp</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</project>
diff --git a/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml b/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml
index b6223b2..b8f1a30 100644
--- a/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml
+++ b/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +19,9 @@
under the License.
-->
-<web-app>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<servlet>
<servlet-name>velocity</servlet-name>
<servlet-class>org.apache.velocity.tools.view.VelocityViewServlet</servlet-class>
diff --git a/velocity-tools-generic/pom.xml b/velocity-tools-generic/pom.xml
index 494b8bd..a8220ef 100644
--- a/velocity-tools-generic/pom.xml
+++ b/velocity-tools-generic/pom.xml
@@ -47,7 +47,10 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
- <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/velocity-tools-view-jsp/pom.xml b/velocity-tools-view-jsp/pom.xml
index c573c87..fbd9847 100644
--- a/velocity-tools-view-jsp/pom.xml
+++ b/velocity-tools-view-jsp/pom.xml
@@ -36,7 +36,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools-view</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/velocity-tools-view/pom.xml b/velocity-tools-view/pom.xml
index 83ab6fc..27c56c4 100644
--- a/velocity-tools-view/pom.xml
+++ b/velocity-tools-view/pom.xml
@@ -37,10 +37,26 @@
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools-generic</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
@@ -73,10 +89,6 @@
<name>test.output.dir</name>
<value>${project.build.testOutputDirectory}</value>
</property>
- <property>
- <name>test.result.dir</name>
- <value>${project.build.directory}/results</value>
- </property>
</systemProperties>
</configuration>
</plugin>
