You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/05/21 09:35:27 UTC
svn commit: r1340913 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/
maven-plugin-plugin/src/it/ant-basic/
maven-plugin-plugin/src/it/ant-reference-parameter/
maven-plugin-plugin/src/it/ant-simple-usage/
maven-plugin-plugin/src/it/ant-simple-us...
Author: olamy
Date: Mon May 21 07:35:26 2012
New Revision: 1340913
URL: http://svn.apache.org/viewvc?rev=1340913&view=rev
Log:
move ant version to a property
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml
maven/plugin-tools/trunk/maven-script/maven-script-ant/pom.xml
maven/plugin-tools/trunk/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Mon May 21 07:35:26 2012
@@ -66,6 +66,7 @@
<it.debug>true</it.debug>
<siteDeployUrlPlugin>scp://people.apache.org/www/maven.apache.org/plugins/maven-plugin-plugin/</siteDeployUrlPlugin>
<siteUrlPlugin>http://maven.apache.org/plugins/maven-plugin-plugin/</siteUrlPlugin>
+ <antVersion>1.7.1</antVersion>
</properties>
<!-- Copy from project up -->
@@ -382,6 +383,7 @@
<debug>${it.debug}</debug>
<filterProperties>
<sitePluginVersion>3.0</sitePluginVersion>
+ <antVersion>${antVersion}</antVersion>
</filterProperties>
<goals>
<goal>verify</goal>
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-basic/pom.xml Mon May 21 07:35:26 2012
@@ -31,14 +31,14 @@
<description>Tests the simplest case of using an Ant script to drive a mojo.</description>
<properties>
- <pluginPluginVersion>@project.version@</pluginPluginVersion><!-- -->
+ <pluginPluginVersion>@project.version@</pluginPluginVersion>
</properties>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>@antVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml Mon May 21 07:35:26 2012
@@ -32,9 +32,9 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>@antVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml Mon May 21 07:35:26 2012
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency>
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/pom.xml Mon May 21 07:35:26 2012
@@ -33,9 +33,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>@antVersion@</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml Mon May 21 07:35:26 2012
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
</dependencies>
Modified: maven/plugin-tools/trunk/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-script/maven-script-ant/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-script/maven-script-ant/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-script/maven-script-ant/pom.xml Mon May 21 07:35:26 2012
@@ -34,12 +34,12 @@ under the License.
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.1</version>
+ <version>${antVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.7.1</version>
+ <version>${antVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/plugin-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=1340913&r1=1340912&r2=1340913&view=diff
==============================================================================
--- maven/plugin-tools/trunk/pom.xml (original)
+++ maven/plugin-tools/trunk/pom.xml Mon May 21 07:35:26 2012
@@ -161,6 +161,7 @@
<siteDeployUrl>scp://people.apache.org/www/maven.apache.org/plugin-tools/</siteDeployUrl>
<siteUrl>http://maven.apache.org/plugin-tools/</siteUrl>
<mavenVersion>2.2.1</mavenVersion>
+ <antVersion>1.7.1</antVersion>
</properties>
<dependencyManagement>