Author: michaelo Date: Sat Sep 29 21:36:48 2018 New Revision: 1842345 URL: http://svn.apache.org/viewvc?rev=1842345&view=rev Log: Another Cleanup
* Perform cleanup for 'mvn dependency:analyze' * Move webapps to version 3.1 Modified: velocity/tools/branches/VELTOOLS-177/pom.xml velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml Modified: velocity/tools/branches/VELTOOLS-177/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/pom.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/pom.xml (original) +++ velocity/tools/branches/VELTOOLS-177/pom.xml Sat Sep 29 21:36:48 2018 @@ -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> Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml (original) +++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml Sat Sep 29 21:36:48 2018 @@ -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> Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml (original) +++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml Sat Sep 29 21:36:48 2018 @@ -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> Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml (original) +++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/pom.xml Sat Sep 29 21:36:48 2018 @@ -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> Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml (original) +++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/velocity-tools-examples-simple/src/main/webapp/WEB-INF/web.xml Sat Sep 29 21:36:48 2018 @@ -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> Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml (original) +++ velocity/tools/branches/VELTOOLS-177/velocity-tools-generic/pom.xml Sat Sep 29 21:36:48 2018 @@ -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> Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml (original) +++ velocity/tools/branches/VELTOOLS-177/velocity-tools-view-jsp/pom.xml Sat Sep 29 21:36:48 2018 @@ -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> Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml?rev=1842345&r1=1842344&r2=1842345&view=diff ============================================================================== --- velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml (original) +++ velocity/tools/branches/VELTOOLS-177/velocity-tools-view/pom.xml Sat Sep 29 21:36:48 2018 @@ -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>