From 4feea7b2681f24753baac3a72db80b15a4f64d7e Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 13 May 2012 13:03:13 +0000
Subject: [PATCH] move ant test to maven plugin it tests

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1337865 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/it/ant-simple-usage}/plugin/pom.xml         | 13 ++++++++-----
 .../plugin/src/main/scripts/test.build.xml          |  0
 .../plugin/src/main/scripts/test.mojos.xml          |  0
 .../src/it/ant-simple-usage}/pom.xml                |  0
 .../src/it/ant-simple-usage}/usage/pom.xml          |  7 -------
 5 files changed, 8 insertions(+), 12 deletions(-)
 rename {maven-plugin-tools-ant/integration-tests/simpleUsage => maven-plugin-plugin/src/it/ant-simple-usage}/plugin/pom.xml (89%)
 rename {maven-plugin-tools-ant/integration-tests/simpleUsage => maven-plugin-plugin/src/it/ant-simple-usage}/plugin/src/main/scripts/test.build.xml (100%)
 rename {maven-plugin-tools-ant/integration-tests/simpleUsage => maven-plugin-plugin/src/it/ant-simple-usage}/plugin/src/main/scripts/test.mojos.xml (100%)
 rename {maven-plugin-tools-ant/integration-tests/simpleUsage => maven-plugin-plugin/src/it/ant-simple-usage}/pom.xml (100%)
 rename {maven-plugin-tools-ant/integration-tests/simpleUsage => maven-plugin-plugin/src/it/ant-simple-usage}/usage/pom.xml (89%)

diff --git a/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml b/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
similarity index 89%
rename from maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml
rename to maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
index c40883a..af1b287 100644
--- a/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml
+++ b/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
@@ -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>
diff --git a/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/src/main/scripts/test.build.xml b/maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.build.xml
similarity index 100%
rename from maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/src/main/scripts/test.build.xml
rename to maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.build.xml
diff --git a/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/src/main/scripts/test.mojos.xml b/maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml
similarity index 100%
rename from maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/src/main/scripts/test.mojos.xml
rename to maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml
diff --git a/maven-plugin-tools-ant/integration-tests/simpleUsage/pom.xml b/maven-plugin-plugin/src/it/ant-simple-usage/pom.xml
similarity index 100%
rename from maven-plugin-tools-ant/integration-tests/simpleUsage/pom.xml
rename to maven-plugin-plugin/src/it/ant-simple-usage/pom.xml
diff --git a/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml b/maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml
similarity index 89%
rename from maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml
rename to maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml
index 9d648b6..e917f36 100644
--- a/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml
+++ b/maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml
@@ -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>