From commits-return-3348-archive-asf-public=cust-asf.ponee.io@velocity.apache.org Sat Sep 22 23:59:35 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id EBEC518065B for ; Sat, 22 Sep 2018 23:59:33 +0200 (CEST) Received: (qmail 10480 invoked by uid 500); 22 Sep 2018 21:59:33 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 10470 invoked by uid 99); 22 Sep 2018 21:59:33 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Sep 2018 21:59:33 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 632593A050C for ; Sat, 22 Sep 2018 21:59:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1841698 - in /velocity/tools/branches/VELTOOLS-177: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-tools-generic/ velocity-tools-view-j... Date: Sat, 22 Sep 2018 21:59:31 -0000 To: commits@velocity.apache.org From: michaelo@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180922215932.632593A050C@svn01-us-west.apache.org> 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 @@ --> - - velocity-master - org.apache.velocity - 2 - - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-4.0.0.xsd"> + 4.0.0 + org.apache.velocity - velocity-tools-parent - VelocityTools - 3.0-SNAPSHOT - pom - - http://velocity.apache.org/tools/devel/ - - 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. - - 2002 - + velocity-master + 2 + + + velocity-tools-parent + 3.0-SNAPSHOT + pom + + VelocityTools + + 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. + + https://velocity.apache.org/tools/devel/ + 2002 + + + UTF-8 + 4.12 + 1.7.25 + 2.22.0 + 3.1.0 + 2.0 + + + + velocity-tools-generic + velocity-tools-view + velocity-tools-view-jsp + velocity-tools-examples + + + + scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk + scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk + https://svn.apache.org/viewvc/velocity/tools/trunk + + + jira + https://issues.apache.org/jira/browse/VELTOOLS + + + + + + Chris Townsen + + + Craig R. McClanahan + + + Dave Bryson + + + David Graham + + + David Winterfeldt + + + Denis Bredelet + + + Dmitri Colebatch + + + Gabriel Sidler + + + Kent Johnson + + + Leon Messerschmidt + + + Mike Kienenberger + + + Oliver O'Halloran + + + S. Brett Sutton + + + Shinobu Kawai + + + Spencer Davis + + + Ted Husted + + + Tim Colson + + + + + install + + + + maven-release-plugin + 2.5.3 + + false + true + deploy + -Papache-release + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + false + true + true + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.plugin.version} + + + **/Test*.java + **/*Test.java + **/*TestCase.java + **/*Tests.java + + + + org.slf4j.simpleLogger.defaultLogLevel + trace + + + org.slf4j.simpleLogger.logFile + ${project.build.directory}/velocity-tools.log + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + org.apache.velocity.tools.examples + ${javadoc.opts} + + + + + aggregate + + aggregate + + + + + + + + + + + + + doclint-java8-disable + + [1.8,) + - UTF-8 - 4.12 - 1.7.25 - 2.22.0 - 3.1.0 - 2.0 + -Xdoclint:none - - - - - doclint-java8-disable - - [1.8,) - - - -Xdoclint:none - - - - - - install - - - - maven-release-plugin - 2.5.3 - - false - true - deploy - -Papache-release - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - false - true - true - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.plugin.version} - - - **/Test*.java - **/*Test.java - **/*TestCase.java - **/*Tests.java - - - - org.slf4j.simpleLogger.defaultLogLevel - trace - - - org.slf4j.simpleLogger.logFile - ${project.build.directory}/velocity-tools.log - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - org.apache.velocity.tools.examples - ${javadoc.opts} - - - - - aggregate - - aggregate - - - - - - - - - - - JIRA - http://issues.apache.org/jira/browse/VELTOOLS - - - scm:svn:http://svn.apache.org/repos/asf/velocity/tools/trunk - scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk - http://svn.apache.org/viewvc/velocity/tools/trunk - - - velocity-tools-generic - velocity-tools-view - velocity-tools-view-jsp - velocity-tools-examples - - - - - - Chris Townsen - - - Craig R. McClanahan - - - Dave Bryson - - - David Graham - - - David Winterfeldt - - - Denis Bredelet - - - Dmitri Colebatch - - - Gabriel Sidler - - - Kent Johnson - - - Leon Messerschmidt - - - Mike Kienenberger - - - Oliver O'Halloran - - - S. Brett Sutton - - - Shinobu Kawai - - - Spencer Davis - - - Ted Husted - - - Tim Colson - - + + 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. --> - + 4.0.0 + - velocity-tools-parent org.apache.velocity + velocity-tools-parent 3.0-SNAPSHOT - org.apache.velocity + velocity-tools-examples pom + Apache Velocity Tools - Examples Examples to show how to use Velocity Tools + - velocity-tools-examples-showcase - velocity-tools-examples-simple + velocity-tools-examples-showcase + velocity-tools-examples-simple 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 @@ --> - 4.0.0 - - velocity-tools-examples - org.apache.velocity - 3.0-SNAPSHOT - - - 1.3 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.apache.velocity - velocity-tools-examples-showcase - war - Apache Velocity Tools Examples - Showcase - Showcase of features in Velocity Tools. - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.0 - - - integration-test - - integration-test - - - - verify - - verify - - - - - - org.codehaus.cargo - cargo-maven2-plugin - 1.6.8 - - - jetty9x - - - - - ${project.basedir}/src/main/policy/showcase.policy - / - true - - - - - - - - - - - - - - - - - - - false - - start-server - - start - - pre-integration-test - - - stop-server - - stop - - post-integration-test - - - - - velocity-tools-examples-showcase - - - - org.apache.velocity - velocity-tools-view - ${project.version} - - - javax.servlet - javax.servlet-api - ${servlet.api.version} - provided - - - junit - junit - ${junit.version} - test - - - httpunit - httpunit - 1.7 - test - - - - rhino - js - 1.7R2 - - - org.apache.velocity - velocity-tools-view-jsp - ${project.version} - jar - compile - - - javax.servlet - jstl - 1.2 - - - javax.servlet.jsp - jsp-api - 2.2 - jar - provided - - - com.republicate - webapp-slf4j-logger - ${webapp-slf4j-logger.version} - runtime - - + velocity-tools-examples + 3.0-SNAPSHOT + + + velocity-tools-examples-showcase + war + + Apache Velocity Tools Examples - Showcase + Showcase of features in Velocity Tools. + + + 1.3 + + + + + org.apache.velocity + velocity-tools-view + ${project.version} + + + javax.servlet + javax.servlet-api + ${servlet.api.version} + provided + + + junit + junit + ${junit.version} + test + + + httpunit + httpunit + 1.7 + test + + + + rhino + js + 1.7R2 + + + org.apache.velocity + velocity-tools-view-jsp + ${project.version} + jar + compile + + + javax.servlet + jstl + 1.2 + + + javax.servlet.jsp + jsp-api + 2.2 + jar + provided + + + com.republicate + webapp-slf4j-logger + ${webapp-slf4j-logger.version} + runtime + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.0 + + + integration-test + + integration-test + + + + verify + + verify + + + + + + org.codehaus.cargo + cargo-maven2-plugin + 1.6.8 + + + jetty9x + + + + + ${project.basedir}/src/main/policy/showcase.policy + / + true + + + + + + + + + + + + + + + + + + + false + + start-server + + start + + pre-integration-test + + + stop-server + + stop + + post-integration-test + + + + + 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. --> - + 4.0.0 + - velocity-tools-examples org.apache.velocity + velocity-tools-examples 3.0-SNAPSHOT - org.apache.velocity + velocity-tools-examples-simple war + Apache Velocity Tools Examples - Simple Simple webapp based on Velocity Tools - - velocity-tools-examples-simple - + - - org.apache.velocity - velocity-tools-view-jsp - ${project.version} - + + org.apache.velocity + velocity-tools-view-jsp + ${project.version} + 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. --> - + 4.0.0 + - velocity-tools-parent org.apache.velocity + velocity-tools-parent 3.0-SNAPSHOT - org.apache.velocity + velocity-tools-generic + Apache Velocity Tools - Generic tools Generic tools that can be used in any context. - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - shade - package - - shade - - - - - com.googlecode.json-simple:json-simple - - - - - org.json.simple - org.apache.velocity.tools.shaded.org.json.simple - - - org.json.simple.parser - org.apache.velocity.tools.shaded.org.json.simple.parser - - - true - - - - - - + - - org.apache.velocity - velocity-engine-core - ${velocity.engine.version} - - - commons-beanutils - commons-beanutils - 1.9.3 - - - org.apache.commons - commons-digester3 - 3.2 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - junit - junit - ${junit.version} - test - - - org.slf4j - slf4j-simple - ${slf4j.version} - test - - - com.googlecode.json-simple - json-simple - 1.1.1 - + + org.apache.velocity + velocity-engine-core + ${velocity.engine.version} + + + commons-beanutils + commons-beanutils + 1.9.3 + + + org.apache.commons + commons-digester3 + 3.2 + + + org.slf4j + slf4j-api + ${slf4j.version} + + + junit + junit + ${junit.version} + test + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + shade + package + + shade + + + + + com.googlecode.json-simple:json-simple + + + + + org.json.simple + org.apache.velocity.tools.shaded.org.json.simple + + + org.json.simple.parser + org.apache.velocity.tools.shaded.org.json.simple.parser + + + true + + + + + + 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. --> - + 4.0.0 + - velocity-tools-parent org.apache.velocity + velocity-tools-parent 3.0-SNAPSHOT - org.apache.velocity + velocity-tools-view-jsp + Apache Velocity Tools - JSP support Enables the use of Velocity under a JSP environment. + - - org.apache.velocity - velocity-tools-view - ${project.version} - - - javax.servlet - javax.servlet-api - ${servlet.api.version} - provided - - - javax.servlet.jsp - jsp-api - 2.2 - provided - - - javax.el - el-api - 2.2 - provided - - - junit - junit - ${junit.version} - test - - - org.easymock - easymock - 3.6 - test - + + org.apache.velocity + velocity-tools-view + ${project.version} + + + javax.servlet + javax.servlet-api + ${servlet.api.version} + provided + + + javax.servlet.jsp + jsp-api + 2.2 + provided + + + javax.el + el-api + 2.2 + provided + + + junit + junit + ${junit.version} + test + + + org.easymock + easymock + 3.6 + test + 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 @@ --> - 4.0.0 - - velocity-tools-parent - org.apache.velocity - 3.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.apache.velocity - velocity-tools-view - Apache Velocity Tools - View tools - Tools to be used in a servlet context. - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.plugin.version} - - - **/Test*.java - **/*Test.java - **/*TestCase.java - **/*Tests.java - - - - test.output.dir - ${project.build.testOutputDirectory} - - - test.result.dir - ${project.build.directory}/results - - - - - - - - - org.apache.velocity - velocity-tools-generic - ${project.version} - - - javax.servlet - javax.servlet-api - ${servlet.api.version} - provided - - - junit - junit - ${junit.version} - test - - - org.easymock - easymock - 3.6 - test - - - org.slf4j - slf4j-simple - ${slf4j.version} - test - - + velocity-tools-parent + 3.0-SNAPSHOT + + + velocity-tools-view + + Apache Velocity Tools - View tools + Tools to be used in a servlet context. + + + + org.apache.velocity + velocity-tools-generic + ${project.version} + + + javax.servlet + javax.servlet-api + ${servlet.api.version} + provided + + + junit + junit + ${junit.version} + test + + + org.easymock + easymock + 3.6 + test + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.plugin.version} + + + **/Test*.java + **/*Test.java + **/*TestCase.java + **/*Tests.java + + + + test.output.dir + ${project.build.testOutputDirectory} + + + test.result.dir + ${project.build.directory}/results + + + + + +