Author: olamy
Date: Sun May 13 13:03:13 2012
New Revision: 1337865
URL: http://svn.apache.org/viewvc?rev=1337865&view=rev
Log:
move ant test to maven plugin it tests
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/ant-simple-usage/
- copied from r1337859,
maven/plugin-tools/trunk/maven-plugin-tools-ant/integration-tests/simpleUsage/
Removed:
maven/plugin-tools/trunk/maven-plugin-tools-ant/integration-tests/simpleUsage/
Modified:
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/usage/pom.xml
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=1337865&r1=1337859&r2=1337865&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
Sun May 13 13:03:13 2012
@@ -30,7 +30,11 @@
<name>Simple Ant-Mojo</name>
<packaging>maven-plugin</packaging>
<description>Tests the simplest case of using an Ant script to drive a
mojo.</description>
-
+
+ <properties>
+ <pluginPluginVersion>@project.version@</pluginPluginVersion><!-- -->
+ </properties>
+
<dependencies>
<dependency>
<groupId>ant</groupId>
@@ -40,12 +44,11 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script-ant</artifactId>
- <version>2.0.1</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
<build>
- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
@@ -54,9 +57,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
+ <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-ant</artifactId>
- <version>2.0.1</version>
+ <version>@project.version@</version>
</dependency>
</dependencies>
</plugin>
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=1337865&r1=1337859&r2=1337865&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
Sun May 13 13:03:13 2012
@@ -44,13 +44,6 @@
<groupId>org.apache.maven.ant.it</groupId>
<artifactId>simpleUsage-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-ant-factory</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
- </dependency>
- </dependencies>
<configuration>
<name>Hani</name>
