Author: cbrisson
Date: Sun Nov 13 15:49:59 2016
New Revision: 1769509
URL: http://svn.apache.org/viewvc?rev=1769509&view=rev
Log:
[tools] finish struts removal
Removed:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/
Modified:
velocity/tools/trunk/velocity-tools-assembly/pom.xml
velocity/tools/trunk/velocity-tools-assembly/src/main/assembly/all.xml
velocity/tools/trunk/velocity-tools-examples/pom.xml
velocity/tools/trunk/velocity-tools-uberjar/pom.xml
Modified: velocity/tools/trunk/velocity-tools-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-assembly/pom.xml?rev=1769509&r1=1769508&r2=1769509&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-assembly/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-assembly/pom.xml Sun Nov 13 15:49:59
2016
@@ -80,13 +80,6 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-struts</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools-examples-simple</artifactId>
<version>${project.version}</version>
<type>war</type>
@@ -98,13 +91,6 @@
<version>${project.version}</version>
<type>war</type>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-examples-struts</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>compile</scope>
</dependency>
</dependencies>
<profiles>
Modified: velocity/tools/trunk/velocity-tools-assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-assembly/src/main/assembly/all.xml?rev=1769509&r1=1769508&r2=1769509&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-assembly/src/main/assembly/all.xml
(original)
+++ velocity/tools/trunk/velocity-tools-assembly/src/main/assembly/all.xml Sun
Nov 13 15:49:59 2016
@@ -107,14 +107,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>../velocity-tools-struts</directory>
- <outputDirectory>src/velocity-tools-struts</outputDirectory>
- <includes>
- <include>pom.xml</include>
- <include>src/</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../velocity-tools-uberjar</directory>
<outputDirectory>src/velocity-tools-uberjar</outputDirectory>
<includes>
@@ -155,14 +147,6 @@
</includes>
</fileSet>
<fileSet>
-
<directory>../velocity-tools-examples/velocity-tools-examples-struts</directory>
-
<outputDirectory>src/velocity-tools-examples/velocity-tools-examples-struts</outputDirectory>
- <includes>
- <include>pom.xml</include>
- <include>src/</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../target/site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
@@ -183,10 +167,6 @@
<outputDirectory>docs/velocity-tools-view-jsp</outputDirectory>
</fileSet>
<fileSet>
- <directory>../velocity-tools-struts/target/site</directory>
- <outputDirectory>docs/velocity-tools-struts</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../velocity-tools-uberjar/target/site</directory>
<outputDirectory>docs/velocity-tools-uberjar</outputDirectory>
</fileSet>
@@ -206,9 +186,5 @@
<directory>../velocity-tools-examples/velocity-tools-examples-showcase/target/site</directory>
<outputDirectory>docs/velocity-tools-examples/velocity-tools-examples-showcase</outputDirectory>
</fileSet>
- <fileSet>
-
<directory>../velocity-tools-examples/velocity-tools-examples-struts/target/site</directory>
-
<outputDirectory>docs/velocity-tools-examples/velocity-tools-examples-struts</outputDirectory>
- </fileSet>
</fileSets>
</assembly>
Modified: velocity/tools/trunk/velocity-tools-examples/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/pom.xml?rev=1769509&r1=1769508&r2=1769509&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-examples/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-examples/pom.xml Sun Nov 13 15:49:59
2016
@@ -34,6 +34,5 @@
<modules>
<module>velocity-tools-examples-showcase</module>
<module>velocity-tools-examples-simple</module>
- <module>velocity-tools-examples-struts</module>
</modules>
</project>
Modified: velocity/tools/trunk/velocity-tools-uberjar/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-uberjar/pom.xml?rev=1769509&r1=1769508&r2=1769509&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-uberjar/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-uberjar/pom.xml Sun Nov 13 15:49:59 2016
@@ -50,7 +50,6 @@
<include>org.apache.velocity:velocity-tools-xml</include>
<include>org.apache.velocity:velocity-tools-view</include>
<include>org.apache.velocity:velocity-tools-view-jsp</include>
-
<include>org.apache.velocity:velocity-tools-struts</include>
</includes>
</artifactSet>
</configuration>
@@ -66,11 +65,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-struts</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools-xml</artifactId>
<version>${project.version}</version>
