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

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1337862 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/it/ant-reference-parameter}/pom.xml      | 16 ++++++++--------
 .../maven/plugins/antWithRefs/ArtifactsTask.java |  0
 .../apache/maven/plugins/antWithRefs/antlib.xml  |  0
 .../src/main/scripts/test.build.xml              |  0
 .../src/main/scripts/test.mojos.xml              |  0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename {maven-plugin-tools-ant/integration-tests/referenceParameter => maven-plugin-plugin/src/it/ant-reference-parameter}/pom.xml (91%)
 rename {maven-plugin-tools-ant/integration-tests/referenceParameter => maven-plugin-plugin/src/it/ant-reference-parameter}/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java (100%)
 rename {maven-plugin-tools-ant/integration-tests/referenceParameter => maven-plugin-plugin/src/it/ant-reference-parameter}/src/main/resources/org/apache/maven/plugins/antWithRefs/antlib.xml (100%)
 rename {maven-plugin-tools-ant/integration-tests/referenceParameter => maven-plugin-plugin/src/it/ant-reference-parameter}/src/main/scripts/test.build.xml (100%)
 rename {maven-plugin-tools-ant/integration-tests/referenceParameter => maven-plugin-plugin/src/it/ant-reference-parameter}/src/main/scripts/test.mojos.xml (100%)

diff --git a/maven-plugin-tools-ant/integration-tests/referenceParameter/pom.xml b/maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml
similarity index 91%
rename from maven-plugin-tools-ant/integration-tests/referenceParameter/pom.xml
rename to maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml
index 66f18a9..b9f463f 100644
--- a/maven-plugin-tools-ant/integration-tests/referenceParameter/pom.xml
+++ b/maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml
@@ -21,7 +21,7 @@
 
 <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 ../../../../maven-site/target/site/maven-v4_0_0.xsd ">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.plugins</groupId>
+  <groupId>org.apache.maven.ant.it</groupId>
   <artifactId>maven-ant-it-referenceParameter</artifactId>
   <name>Ant-Mojo Integration Test with non-String parameter</name>
   <version>1.0-SNAPSHOT</version>
@@ -29,16 +29,16 @@
   <description>Tests using an Ant script to drive a mojo where a parameter is not a String type.</description>
   
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-script-ant</artifactId>
-      <version>2.0.2</version>
-    </dependency>
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.6.5</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-script-ant</artifactId>
+      <version>2.2.1</version>
+    </dependency>
   </dependencies>
   
   <build>
@@ -50,9 +50,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.2</version>
+            <version>@project.version@</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java b/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java
similarity index 100%
rename from maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java
rename to maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java
diff --git a/maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/resources/org/apache/maven/plugins/antWithRefs/antlib.xml b/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/resources/org/apache/maven/plugins/antWithRefs/antlib.xml
similarity index 100%
rename from maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/resources/org/apache/maven/plugins/antWithRefs/antlib.xml
rename to maven-plugin-plugin/src/it/ant-reference-parameter/src/main/resources/org/apache/maven/plugins/antWithRefs/antlib.xml
diff --git a/maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/scripts/test.build.xml b/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.build.xml
similarity index 100%
rename from maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/scripts/test.build.xml
rename to maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.build.xml
diff --git a/maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/scripts/test.mojos.xml b/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml
similarity index 100%
rename from maven-plugin-tools-ant/integration-tests/referenceParameter/src/main/scripts/test.mojos.xml
rename to maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml