Author: michaelo
Date: Sat Sep 22 21:59:31 2018
New Revision: 1841698
URL: http://svn.apache.org/viewvc?rev=1841698&view=rev
Log:
Reformat POM structure to Maven convention
Modified:
velocity/tools/branches/VELTOOLS-177/pom.xml
velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/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-simple/pom.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=1841698&r1=1841697&r2=1841698&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/pom.xml (original)
+++ velocity/tools/branches/VELTOOLS-177/pom.xml Sat Sep 22 21:59:31 2018
@@ -20,196 +20,197 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <artifactId>velocity-master</artifactId>
- <groupId>org.apache.velocity</groupId>
- <version>2</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-parent</artifactId>
- <name>VelocityTools</name>
- <version>3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <url>http://velocity.apache.org/tools/devel/</url>
- <description>
- VelocityTools is an integrated collection of Velocity subprojects
- with the common goal of creating tools and infrastructure to speed and
ease
- development of both web and non-web applications using the Velocity
template
- engine.
- </description>
- <inceptionYear>2002</inceptionYear>
-
+ <artifactId>velocity-master</artifactId>
+ <version>2</version>
+ </parent>
+
+ <artifactId>velocity-tools-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>VelocityTools</name>
+ <description>
+ VelocityTools is an integrated collection of Velocity subprojects
+ with the common goal of creating tools and infrastructure to speed and ease
+ development of both web and non-web applications using the Velocity
template
+ engine.
+ </description>
+ <url>https://velocity.apache.org/tools/devel/</url>
+ <inceptionYear>2002</inceptionYear>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <junit.version>4.12</junit.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <surefire.plugin.version>2.22.0</surefire.plugin.version>
+ <servlet.api.version>3.1.0</servlet.api.version>
+ <velocity.engine.version>2.0</velocity.engine.version>
+ </properties>
+
+ <modules>
+ <module>velocity-tools-generic</module>
+ <module>velocity-tools-view</module>
+ <module>velocity-tools-view-jsp</module>
+ <module>velocity-tools-examples</module>
+ </modules>
+
+ <scm>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk</developerConnection>
+ <url>https://svn.apache.org/viewvc/velocity/tools/trunk</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/VELTOOLS</url>
+ </issueManagement>
+
+ <!-- This project is an effort by many people. If you feel that your name
+ should be in here and has been omitted in error, please open an issue with
+ the Velocity Tools Issue tracker. -->
+ <contributors>
+ <contributor>
+ <name>Chris Townsen</name>
+ </contributor>
+ <contributor>
+ <name>Craig R. McClanahan</name>
+ </contributor>
+ <contributor>
+ <name>Dave Bryson</name>
+ </contributor>
+ <contributor>
+ <name>David Graham</name>
+ </contributor>
+ <contributor>
+ <name>David Winterfeldt</name>
+ </contributor>
+ <contributor>
+ <name>Denis Bredelet</name>
+ </contributor>
+ <contributor>
+ <name>Dmitri Colebatch</name>
+ </contributor>
+ <contributor>
+ <name>Gabriel Sidler</name>
+ </contributor>
+ <contributor>
+ <name>Kent Johnson</name>
+ </contributor>
+ <contributor>
+ <name>Leon Messerschmidt</name>
+ </contributor>
+ <contributor>
+ <name>Mike Kienenberger</name>
+ </contributor>
+ <contributor>
+ <name>Oliver O'Halloran</name>
+ </contributor>
+ <contributor>
+ <name>S. Brett Sutton</name>
+ </contributor>
+ <contributor>
+ <name>Shinobu Kawai</name>
+ </contributor>
+ <contributor>
+ <name>Spencer Davis</name>
+ </contributor>
+ <contributor>
+ <name>Ted Husted</name>
+ </contributor>
+ <contributor>
+ <name>Tim Colson</name>
+ </contributor>
+ </contributors>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>deploy</goals>
+ <arguments>-Papache-release</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <debug>true</debug>
+ <optimize>false</optimize>
+ <showDeprecation>true</showDeprecation>
+ <showWarning>true</showWarning>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ <include>**/*Tests.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>org.slf4j.simpleLogger.defaultLogLevel</name>
+ <value>trace</value>
+ </property>
+ <property>
+ <name>org.slf4j.simpleLogger.logFile</name>
+ <value>${project.build.directory}/velocity-tools.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+
<excludePackageNames>org.apache.velocity.tools.examples</excludePackageNames>
+ <additionalparam>${javadoc.opts}</additionalparam>
+ <detectLinks/>
+ </configuration>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <configuration>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- java 8 doclint checks are too strict for our current javadoc state...
-->
+ <profiles>
+ <profile>
+ <id>doclint-java8-disable</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <junit.version>4.12</junit.version>
- <slf4j.version>1.7.25</slf4j.version>
- <surefire.plugin.version>2.22.0</surefire.plugin.version>
- <servlet.api.version>3.1.0</servlet.api.version>
- <velocity.engine.version>2.0</velocity.engine.version>
+ <javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
-
- <!-- java 8 doclint checks are too strict for our current javadoc state...
-->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <javadoc.opts>-Xdoclint:none</javadoc.opts>
- </properties>
- </profile>
- </profiles>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <goals>deploy</goals>
- <arguments>-Papache-release</arguments>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <optimize>false</optimize>
- <showDeprecation>true</showDeprecation>
- <showWarning>true</showWarning>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- <include>**/*Tests.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>org.slf4j.simpleLogger.defaultLogLevel</name>
- <value>trace</value>
- </property>
- <property>
- <name>org.slf4j.simpleLogger.logFile</name>
-
<value>${project.build.directory}/velocity-tools.log</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
- <configuration>
-
<excludePackageNames>org.apache.velocity.tools.examples</excludePackageNames>
- <additionalparam>${javadoc.opts}</additionalparam>
- <detectLinks/>
- </configuration>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <configuration>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/VELTOOLS</url>
- </issueManagement>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/tools/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/velocity/tools/trunk</url>
- </scm>
- <modules>
- <module>velocity-tools-generic</module>
- <module>velocity-tools-view</module>
- <module>velocity-tools-view-jsp</module>
- <module>velocity-tools-examples</module>
- </modules>
-
- <!-- This project is an effort by many people. If you feel that your name
- should be in here and has been omitted in error, please open an issue
with
- the Velocity Tools Issue tracker. -->
- <contributors>
- <contributor>
- <name>Chris Townsen</name>
- </contributor>
- <contributor>
- <name>Craig R. McClanahan</name>
- </contributor>
- <contributor>
- <name>Dave Bryson</name>
- </contributor>
- <contributor>
- <name>David Graham</name>
- </contributor>
- <contributor>
- <name>David Winterfeldt</name>
- </contributor>
- <contributor>
- <name>Denis Bredelet</name>
- </contributor>
- <contributor>
- <name>Dmitri Colebatch</name>
- </contributor>
- <contributor>
- <name>Gabriel Sidler</name>
- </contributor>
- <contributor>
- <name>Kent Johnson</name>
- </contributor>
- <contributor>
- <name>Leon Messerschmidt</name>
- </contributor>
- <contributor>
- <name>Mike Kienenberger</name>
- </contributor>
- <contributor>
- <name>Oliver O'Halloran</name>
- </contributor>
- <contributor>
- <name>S. Brett Sutton</name>
- </contributor>
- <contributor>
- <name>Shinobu Kawai</name>
- </contributor>
- <contributor>
- <name>Spencer Davis</name>
- </contributor>
- <contributor>
- <name>Ted Husted</name>
- </contributor>
- <contributor>
- <name>Tim Colson</name>
- </contributor>
- </contributors>
+ </profile>
+ </profiles>
</project>
Modified: velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml?rev=1841698&r1=1841697&r2=1841698&view=diff
==============================================================================
--- velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml
(original)
+++ velocity/tools/branches/VELTOOLS-177/velocity-tools-examples/pom.xml Sat
Sep 22 21:59:31 2018
@@ -19,20 +19,24 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>velocity-tools-parent</artifactId>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.velocity</groupId>
+
<artifactId>velocity-tools-examples</artifactId>
<packaging>pom</packaging>
+
<name>Apache Velocity Tools - Examples</name>
<description>Examples to show how to use Velocity Tools</description>
+
<modules>
- <module>velocity-tools-examples-showcase</module>
- <module>velocity-tools-examples-simple</module>
+ <module>velocity-tools-examples-showcase</module>
+ <module>velocity-tools-examples-simple</module>
</modules>
</project>
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=1841698&r1=1841697&r2=1841698&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 22 21:59:31 2018
@@ -20,164 +20,168 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>velocity-tools-examples</artifactId>
- <groupId>org.apache.velocity</groupId>
- <version>3.0-SNAPSHOT</version>
- </parent>
- <properties>
- <webapp-slf4j-logger.version>1.3</webapp-slf4j-logger.version>
- </properties>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-examples-showcase</artifactId>
- <packaging>war</packaging>
- <name>Apache Velocity Tools Examples - Showcase</name>
- <description>Showcase of features in Velocity Tools.</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.6.8</version>
- <configuration>
- <container>
- <containerId>jetty9x</containerId>
- </container>
- <configuration>
- <files>
- <copy>
-
<file>${project.basedir}/src/main/policy/showcase.policy</file>
- <todir>/</todir>
- <configfile>true</configfile>
- </copy>
- </files>
- <properties>
- <!-- variables referenced in the showcase policy
file -->
- <!-- commented since broken on windows due to a
cargo bug like MNG-6386
-
<cargo.container>${project.build.directory}/cargo/installs</cargo.container>
-
<cargo.repository>${settings.localRepository}</cargo.repository>
-
<cargo.webapp>${project.build.directory}/${project.artifactId}</cargo.webapp>
-
<cargo.velocity-engine.version>${velocity.engine.version}</cargo.velocity-engine.version>
-
<cargo.velocity-tools.version>${project.version}</cargo.velocity-tools.version>
-
<cargo.slf4j.version>${slf4j.version}</cargo.slf4j.version>
-
<cargo.webapp-slf4j-logger.version>${webapp-slf4j-logger.version}</cargo.webapp-slf4j-logger.version>
- -->
- <cargo.jvmargs>
- <!-- enable remote debugging
-
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006
- -->
-
- <!-- enable Jetty debug log
- -Dorg.eclipse.jetty.LEVEL=DEBUG
- -->
-
- <!-- enable security manager
- (disabled for now, see above note about
policy file)
- -Djava.security.manager
-
-Djava.security.policy=${project.build.directory}/cargo/configurations/jetty9x/showcase.policy
- -->
- </cargo.jvmargs>
- </properties>
- </configuration>
- </configuration>
- <executions>
- <execution>
- <configuration>
- <wait>false</wait>
- </configuration>
- <id>start-server</id>
- <goals>
- <goal>start</goal>
- </goals>
- <phase>pre-integration-test</phase>
- </execution>
- <execution>
- <id>stop-server</id>
- <goals>
- <goal>stop</goal>
- </goals>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <finalName>velocity-tools-examples-showcase</finalName>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-view</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet.api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.7</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>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.2</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.republicate</groupId>
- <artifactId>webapp-slf4j-logger</artifactId>
- <version>${webapp-slf4j-logger.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <artifactId>velocity-tools-examples</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>velocity-tools-examples-showcase</artifactId>
+ <packaging>war</packaging>
+
+ <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>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.7</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>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.2</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.republicate</groupId>
+ <artifactId>webapp-slf4j-logger</artifactId>
+ <version>${webapp-slf4j-logger.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.22.0</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.6.8</version>
+ <configuration>
+ <container>
+ <containerId>jetty9x</containerId>
+ </container>
+ <configuration>
+ <files>
+ <copy>
+ <file>${project.basedir}/src/main/policy/showcase.policy</file>
+ <todir>/</todir>
+ <configfile>true</configfile>
+ </copy>
+ </files>
+ <properties>
+ <!-- variables referenced in the showcase policy file -->
+ <!-- commented since broken on windows due to a cargo bug like
MNG-6386
+
<cargo.container>${project.build.directory}/cargo/installs</cargo.container>
+ <cargo.repository>${settings.localRepository}</cargo.repository>
+
<cargo.webapp>${project.build.directory}/${project.artifactId}</cargo.webapp>
+
<cargo.velocity-engine.version>${velocity.engine.version}</cargo.velocity-engine.version>
+
<cargo.velocity-tools.version>${project.version}</cargo.velocity-tools.version>
+ <cargo.slf4j.version>${slf4j.version}</cargo.slf4j.version>
+
<cargo.webapp-slf4j-logger.version>${webapp-slf4j-logger.version}</cargo.webapp-slf4j-logger.version>
+ -->
+ <cargo.jvmargs>
+ <!-- enable remote debugging
+
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006
+ -->
+
+ <!-- enable Jetty debug log
+ -Dorg.eclipse.jetty.LEVEL=DEBUG
+ -->
+
+ <!-- enable security manager
+ (disabled for now, see above note about policy file)
+ -Djava.security.manager
+
-Djava.security.policy=${project.build.directory}/cargo/configurations/jetty9x/showcase.policy
+ -->
+ </cargo.jvmargs>
+ </properties>
+ </configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <configuration>
+ <wait>false</wait>
+ </configuration>
+ <id>start-server</id>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ </execution>
+ <execution>
+ <id>stop-server</id>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=1841698&r1=1841697&r2=1841698&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 22 21:59:31 2018
@@ -19,26 +19,27 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>velocity-tools-examples</artifactId>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-examples</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.velocity</groupId>
+
<artifactId>velocity-tools-examples-simple</artifactId>
<packaging>war</packaging>
+
<name>Apache Velocity Tools Examples - Simple</name>
<description>Simple webapp based on Velocity Tools</description>
- <build>
- <finalName>velocity-tools-examples-simple</finalName>
- </build>
+
<dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-view-jsp</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view-jsp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
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=1841698&r1=1841697&r2=1841698&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
22 21:59:31 2018
@@ -19,90 +19,95 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>velocity-tools-parent</artifactId>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.velocity</groupId>
+
<artifactId>velocity-tools-generic</artifactId>
+
<name>Apache Velocity Tools - Generic tools</name>
<description>Generic tools that can be used in any context.</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.1.1</version>
- <executions>
- <execution>
- <id>shade</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
-
<include>com.googlecode.json-simple:json-simple</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.json.simple</pattern>
-
<shadedPattern>org.apache.velocity.tools.shaded.org.json.simple</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.json.simple.parser</pattern>
-
<shadedPattern>org.apache.velocity.tools.shaded.org.json.simple.parser</shadedPattern>
- </relocation>
- </relocations>
- <minimizeJar>true</minimizeJar>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
<dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${velocity.engine.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.3</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>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>${velocity.engine.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.3</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>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.googlecode.json-simple:json-simple</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.json.simple</pattern>
+
<shadedPattern>org.apache.velocity.tools.shaded.org.json.simple</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.json.simple.parser</pattern>
+
<shadedPattern>org.apache.velocity.tools.shaded.org.json.simple.parser</shadedPattern>
+ </relocation>
+ </relocations>
+ <minimizeJar>true</minimizeJar>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=1841698&r1=1841697&r2=1841698&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 22 21:59:31 2018
@@ -19,52 +19,56 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>velocity-tools-parent</artifactId>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-parent</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.velocity</groupId>
+
<artifactId>velocity-tools-view-jsp</artifactId>
+
<name>Apache Velocity Tools - JSP support</name>
<description>Enables the use of Velocity under a JSP
environment.</description>
+
<dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-view</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet.api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.6</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.6</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
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=1841698&r1=1841697&r2=1841698&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 22
21:59:31 2018
@@ -20,73 +20,77 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>velocity-tools-parent</artifactId>
- <groupId>org.apache.velocity</groupId>
- <version>3.0-SNAPSHOT</version>
- </parent>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-view</artifactId>
- <name>Apache Velocity Tools - View tools</name>
- <description>Tools to be used in a servlet context.</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- <include>**/*Tests.java</include>
- </includes>
- <systemProperties>
- <property>
- <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>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-generic</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet.api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <artifactId>velocity-tools-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>velocity-tools-view</artifactId>
+
+ <name>Apache Velocity Tools - View tools</name>
+ <description>Tools to be used in a servlet context.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-generic</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ <include>**/*Tests.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <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>
+ </plugins>
+ </build>
</project>
