integration test clean up, making it possible to run using the -tests.jar.

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@578616 13f79535-47bb-0310-9956-ffa450edef68

its/ITProblems.txt

@@ -1,17 +1,48 @@
+* Instructions
+
+Running the following from the top-level directory builds a distributable:
+
+----
+mvn install
+----
+
+If you wish to also run the integration tests themselves:
+
+----
+mvn -Prun-its install
+----
+
+This command can also be run from the core-integration-tests directory if the prerequisite artifacts have already been
+installed or deployed.
+
+* Outstanding Issues
+
 The top things that could be done:
 
-1) The issues that would be most helpful that could be tackled on a piecewise basis by many would be to take plugin specific ITs out of the ITs. There are many in there for the surefire plugin so while you're doing that you can look at it. Piecewise but probably totally simple because you have to replace it with an IT that actually tests what it was testing. A lot of time I have had to make a new IT plugin flavour.
+1) The issues that would be most helpful that could be tackled on a piecewise basis by many would be to take plugin
+   specific ITs out of the ITs. There are many in there for the surefire plugin so while you're doing that you can look
+   at it. Piecewise but probably totally simple because you have to replace it with an IT that actually tests what it
+   was testing. A lot of time I have had to make a new IT plugin flavour.
 
-2) The next issue of importance would be to collect all the in IT plugin plugins, invokers and verifiers and align all theses.
+2) The next issue of importance would be to collect all the in IT plugin plugins, invokers and verifiers and align all
+   these.
 
 3) Once 2) is done then we wire the embedder option into the resulting invoker.
 
-As far as them working in situ: the ITs could now run from the top level of http://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/ with an addition to the POM. It's not there because I generally build from the top-level and then walk into  http://svn.apache.org/repos/asf/maven/core-integration-testing/trunk/core-integration-tests/. The invoker plugin has been released and that's what I used to install the supporting artifacts because they can't install in a reactor run normally because there are 5 artifacts with the id.
+4) Proper isolation. The tests currently pick up your Maven settings file and current local repository. A clean local
+   repo can be used but it would result in a lot of unnecessary artifact retrieval. This fails in a locked down
+   environment (as additional repositories declared in IT 92, 94 and 120 are ignored). It also causes other risks.
+   A possible solution is to construct a repository artifact (using a POM with the dependency plugin to create an
+   assembly) that represents everything used by the ITs, then to have the setUp lay that out as a remote repo and use a
+   controlled settings.xml that uses a clean local repository, and mirrors central to that remote repository.
 
-I am not entirely happy with the structure we have but I don't think it's worth changing right now until 1) and 2) are done. It's not obvious how to run them from and IDE and that's where I've found it to be most convenient to run them.
+5) The support artifacts are currently deployed to the central repository, meaning they can get out of sync with those
+   in SVN (unless they are assumed to have been 'released'). After solving (4), these could be injected into the
+   constructed repository instead.
 
+I am not entirely happy with the structure we have but I don't think it's worth changing right now until 1) and 2) are
+done. It's not obvious how to run them from and IDE and that's where I've found it to be most convenient to run them.
 
-- [-] Goals
     - [ ] An IT should be completely self-contained so that the problem
           can be understood by looking in one place, in one Maven
           project.
@@ -19,11 +50,6 @@ I am not entirely happy with the structure we have but I don't think it's worth
           easily create ITs for us. The is not completed but we do have the
           core-integration-test-sample directory with has a sample I 
           offered to users.
-    - [+] The ITs should be in a project of their own so that we can
-          reuse them across versions of Maven. We could actually run
-          new versions of integration tests against old versions of
-          Maven. Solution: the ITs are now in a separate build and it
-          is possible to run them
     - [ ] We should be able to easily integrate the IT into a larger
           run where we can use forked or embedded execution.
     - [ ] We should create Archetypes for all categories of problems so
@@ -52,17 +78,6 @@ I am not entirely happy with the structure we have but I don't think it's worth
           set that up. Needs to be fully fixed. But it is much nicer
           running this stuff in your IDE.
 - [-] Problems with ITs
-    - [+] Verifier jar required by the bootstrap requires a special
-          verifier.jar there is no released version of this tool.
-          Solution: the bootstrap now uses Ant and we've gotten rid of
-          a lot of the complexity.
-    - [+] The maven-core-it plugin needs to be decoupled into its
-          separate purposes because there are currently 12 different
-          things going on in the plugin and it would be really
-          confusing for a new user to figure out what's going on in the
-          plugin and how it applies to the integration testing.
-          Solution: these have now been broken down into plugins that
-          correspond to their function in the ITs.
     - [ ] it0006 is an integration test for the verifier plugin.
     - [ ] it0014 uses the compiler plugin to test plugin configuration.
     - [ ] it0016 is an integration test for the WAR plugin.

its/core-integration-testing-plugins/maven-it-plugin-configuration/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-configuration</artifactId>
@@ -31,7 +31,6 @@
     A plugin that allows any configuration in the form of a DOM which allows inspection after
     configuration processing inside Maven's core.
   </description>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
   <dependencies>
     <dependency>

its/core-integration-testing-plugins/maven-it-plugin-context-passing/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-context-passing</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Context Passing</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/maven-it-plugin-fork/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-fork</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Fork</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
   <dependencies>
     <dependency>

its/core-integration-testing-plugins/maven-it-plugin-generate-envar-properties/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-generate-envar-properties</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Envar</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/maven-it-plugin-generate-properties/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-generate-properties</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Interpolated POM Configuration</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/maven-it-plugin-loadable/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-loadable</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Loadable</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/maven-it-plugin-no-project/pom.xml

@@ -21,13 +21,12 @@
   <parent>                                                                                                                                                             
     <artifactId>maven-it-plugins</artifactId>                                                                                                                          
     <groupId>org.apache.maven.its.plugins</groupId>                                                                                                                    
-    <version>1-SNAPSHOT</version>                                                                                                                                      
+    <version>2.1-SNAPSHOT</version>                                                                                                                                      
   </parent> 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-no-project</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Core Integration Test Plugin</name>
-  <version>1.1-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/maven-it-plugin-packaging/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-packaging</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Packaging</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
   <dependencies>
     <dependency>

its/core-integration-testing-plugins/maven-it-plugin-parameter-implementation/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-parameter-implementation</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Parameter Implementation</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/maven-it-plugin-setter/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-setter</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Setter</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/maven-it-plugin-touch/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-touch</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Touch</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
   <dependencies>
     <dependency>

its/core-integration-testing-plugins/maven-it-plugin-uses-properties/pom.xml

@@ -21,13 +21,12 @@
   <parent>
     <artifactId>maven-it-plugins</artifactId>
     <groupId>org.apache.maven.its.plugins</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-it-plugin-uses-properties</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Integration Test Plugin :: Uses Properties Plugin</name>
-  <version>1.0-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
 
   <properties>

its/core-integration-testing-plugins/pom.xml

@@ -2,12 +2,11 @@
   <parent>
     <artifactId>core-integration-testing</artifactId>
     <groupId>org.apache.maven.its</groupId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.plugins</groupId>
   <artifactId>maven-it-plugins</artifactId>
-  <version>1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>maven-it-plugin-configuration</module>

its/core-integration-testing-support/1.0/src/main/java/org/apache/maven/it/Support.java

@@ -1,5 +0,0 @@
-package org.apache.maven.it;
-
-public class Support
-{
-}

its/core-integration-testing-support/1.1/src/main/java/org/apache/maven/it/Support.java

@@ -1,5 +0,0 @@
-package org.apache.maven.it;
-
-public class Support
-{
-}

its/core-integration-testing-support/1.2/src/main/java/org/apache/maven/it/Support.java

@@ -1,5 +0,0 @@
-package org.apache.maven.it;
-
-public class Support
-{
-}

its/core-integration-testing-support/1.3/src/main/java/org/apache/maven/it/Support.java

@@ -1,5 +0,0 @@
-package org.apache.maven.it;
-
-public class Support
-{
-}

its/core-integration-testing-support/1.4/src/main/java/org/apache/maven/it/Support.java

@@ -1,5 +0,0 @@
-package org.apache.maven.it;
-
-public class Support
-{
-}

its/core-integration-testing-support/build.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-v="1.0 1.1 1.1-old-location 1.2 1.3 1.4"
-
-for i in $v
-do
-  ( cd $i; mvn install )
-done

its/core-integration-testing-support/pom.xml

@@ -21,29 +21,26 @@
   <artifactId>integration-test-support-artifacts</artifactId>
   <packaging>pom</packaging>
   <name>Integration Test Support Artifacts</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.1-SNAPSHOT</version>
-      <build>
+  <build>
-        <plugins>
+    <plugins>
-          <plugin>
+      <plugin>
-            <artifactId>maven-invoker-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
+        <version>2.1</version>
-              <debug>true</debug>
+        <configuration>
-              <projectsDirectory>${basedir}</projectsDirectory>
+          <descriptor>src/main/assembly/repo.xml</descriptor>
-              <pomIncludes>
+        </configuration>
-                <pomInclude>**/pom.xml</pomInclude>
+        <executions>
-              </pomIncludes>
+          <execution>
-            </configuration>
+            <phase>package</phase>
-            <executions>
+            <goals>
-              <execution>
+              <goal>single</goal>
-                <phase>install</phase>
+            </goals>
-                <goals>
+          </execution>
-                  <goal>run</goal>
+        </executions>
-                </goals>
+      </plugin>
-              </execution>
+    </plugins>
-            </executions>
+  </build>
-          </plugin>
-        </plugins>
-      </build>
 </project>
 
 

its/core-integration-testing-support/src/main/assembly/repo.xml

@@ -0,0 +1,33 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly>
+  <id>repo</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/repo</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <includeBaseDirectory>false</includeBaseDirectory>
+</assembly>
+

its/core-integration-testing-support/src/main/repo/org/apache/maven/its/maven-core-it-support-old-location/1.1/maven-core-it-support-old-location-1.1.pom

@@ -19,12 +19,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 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>                                                                                                                                                             
+  <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <artifactId>core-integration-testing</artifactId>                                                                                                                  
-    <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <version>1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
-  </parent>   
   <artifactId>maven-core-it-support-old-location</artifactId>
   <version>1.1</version>
   <distributionManagement>

its/core-integration-testing-support/src/main/repo/org/apache/maven/its/maven-core-it-support/1.0/maven-core-it-support-1.0.pom

@@ -19,12 +19,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 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>                                                                                                                                                             
+  <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <artifactId>core-integration-testing</artifactId>                                                                                                                  
-    <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <version>1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
-  </parent>     
   <artifactId>maven-core-it-support</artifactId>
   <version>1.0</version>
 </project>

its/core-integration-testing-support/src/main/repo/org/apache/maven/its/maven-core-it-support/1.1/maven-core-it-support-1.1.pom

@@ -19,12 +19,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 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>                                                                                                                                                             
+  <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <artifactId>core-integration-testing</artifactId>                                                                                                                  
-    <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <version>1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
-  </parent> 
   <artifactId>maven-core-it-support</artifactId>
   <version>1.1</version>
 </project>

its/core-integration-testing-support/src/main/repo/org/apache/maven/its/maven-core-it-support/1.2/maven-core-it-support-1.2.pom

@@ -19,12 +19,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 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>                                                                                                                                                             
+  <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <artifactId>core-integration-testing</artifactId>                                                                                                                  
-    <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <version>1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
-  </parent>   
   <artifactId>maven-core-it-support</artifactId>
   <packaging>it-packaging</packaging>
   <version>1.2</version>
@@ -33,7 +28,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-packaging</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

its/core-integration-testing-support/src/main/repo/org/apache/maven/its/maven-core-it-support/1.3/maven-core-it-support-1.3.pom

@@ -19,12 +19,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 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>                                                                                                                                                             
+  <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <artifactId>core-integration-testing</artifactId>                                                                                                                  
-    <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <version>1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
-  </parent>   
   <artifactId>maven-core-it-support</artifactId>
   <version>1.3</version>
   <build>
@@ -32,7 +27,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-packaging</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

its/core-integration-testing-support/src/main/repo/org/apache/maven/its/maven-core-it-support/1.4/maven-core-it-support-1.4.pom

@@ -19,12 +19,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 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>                                                                                                                                                             
+  <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <artifactId>core-integration-testing</artifactId>                                                                                                                  
-    <groupId>org.apache.maven.its</groupId>                                                                                                                            
-    <version>1-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
-  </parent>   
   <artifactId>maven-core-it-support</artifactId>
   <version>1.4</version>
   <build>
@@ -32,7 +27,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-packaging</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

its/core-integration-tests/pom.xml

@@ -3,10 +3,9 @@
   <parent>
     <groupId>org.apache.maven.its</groupId>
     <artifactId>core-integration-testing</artifactId>
-    <version>1-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <artifactId>core-integration-tests</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <name>Maven Integration Tests</name>
   <build>
     <plugins>
@@ -18,31 +17,54 @@
             <include>**/IntegrationTestSuite.java</include>
           </includes>
           <forkMode>never</forkMode>
+          <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>run-its</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
+          </plugin>  
+        </plugins>  
+      </build>
+    </profile>
+  </profiles>
   <dependencies>
-    <!-- needed for VersionRange and Version -->
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.its</groupId>
-      <artifactId>maven-artifact</artifactId>
+      <artifactId>maven-integration-test-helper</artifactId>
-      <version>2.0.5</version>
+      <version>2.1-SNAPSHOT</version>
+<!-- TODO: not transitive in tests artifact, so must be left in main scope
+      <scope>test</scope>
+-->
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-verifier</artifactId>
       <version>1.1-SNAPSHOT</version>
-    </dependency>
+<!-- TODO: not transitive in tests artifact, so must be left in main scope
-    <dependency>
+      <scope>test</scope>
-      <groupId>org.apache.maven.its</groupId>
+-->
-      <artifactId>maven-integration-test-helper</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
     </dependency>
   </dependencies>
 </project>

its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0002Test.java

@@ -2,13 +2,13 @@ package org.apache.maven.integrationtests;
 
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.util.FileUtils;
 
 import java.io.File;
 
 public class MavenIT0002Test
     extends AbstractMavenIntegrationTestCase
 {
-
     /**
      * Builds upon it0001: we add the download of a dependency. We delete
      * the JAR from the local repository and make sure it is there post build.

its/core-integration-tests/src/test/resources/it0008/pom.xml

@@ -24,7 +24,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

its/core-integration-tests/src/test/resources/it0009/pom.xml

@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginItem>pluginItem</pluginItem>
           <goalItem>bad-item</goalItem>

its/core-integration-tests/src/test/resources/it0012/child-project/pom.xml

@@ -9,7 +9,7 @@
       <plugin>
         <artifactId>maven-it-plugin-touch</artifactId>
         <groupId>org.apache.maven.its.plugins</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
 		<outputDirectory>${basedir}/target/</outputDirectory>
           <pluginFile>child-touch-${version}.txt</pluginFile>

its/core-integration-tests/src/test/resources/it0012/pom.xml

@@ -11,7 +11,7 @@
       <plugin>
         <artifactId>maven-it-plugin-touch</artifactId>
         <groupId>org.apache.maven.its.plugins</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginFile>touch-${version}.txt</pluginFile>
         </configuration>

its/core-integration-tests/src/test/resources/it0022/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginItem>${test}</pluginItem>
         </configuration>

its/core-integration-tests/src/test/resources/it0023/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginItem>${test}</pluginItem>
         </configuration>

its/core-integration-tests/src/test/resources/it0025/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <id>test1</id>

its/core-integration-tests/src/test/resources/it0026/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginItem>${test}</pluginItem>
         </configuration>

its/core-integration-tests/src/test/resources/it0027/pom.xml

@@ -11,7 +11,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-fork</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
       </plugin>
     </plugins>
   </build>

its/core-integration-tests/src/test/resources/it0040/pom.xml

@@ -11,7 +11,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-packaging</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

its/core-integration-tests/src/test/resources/it0041/pom.xml

@@ -18,7 +18,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-packaging</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

its/core-integration-tests/src/test/resources/it0044/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginItem>${test}</pluginItem>
         </configuration>

its/core-integration-tests/src/test/resources/it0049/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginFile>touchFile.txt</pluginFile>
         </configuration>

its/core-integration-tests/src/test/resources/it0064/pom.xml

@@ -21,7 +21,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-setter</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <foo>fooValue</foo>
           <bar>barValue</bar>

its/core-integration-tests/src/test/resources/it0071/pom.xml

@@ -21,7 +21,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <pluginItem>${m2.foo}</pluginItem>
         </configuration>

its/core-integration-tests/src/test/resources/it0073/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-context-passing</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <value>thrown-value</value>
         </configuration>

its/core-integration-tests/src/test/resources/it0082/test-component-c/pom.xml

@@ -14,7 +14,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-touch</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <configuration>
           <goalItem>my-test</goalItem>
         </configuration>

its/core-integration-tests/src/test/resources/it0086/pom.xml

@@ -10,7 +10,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-loadable</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>validate</phase>

its/core-integration-tests/src/test/resources/it0087/pom.xml

@@ -13,7 +13,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-loadable</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <dependencies>
           <dependency>
             <groupId>commons-logging</groupId>

its/core-integration-tests/src/test/resources/it0088/pom.xml

@@ -25,7 +25,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-generate-properties</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>process-resources</phase>

its/core-integration-tests/src/test/resources/it0090/pom.xml

@@ -26,7 +26,7 @@
       <plugin>
         <groupId>org.apache.maven.its.plugins</groupId>
         <artifactId>maven-it-plugin-generate-envar-properties</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>process-resources</phase>

its/maven-integration-test-helper/pom.xml

@@ -1,13 +1,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.its</groupId>
-    <artifactId>maven-parent</artifactId>
+    <artifactId>core-integration-testing</artifactId>
-    <version>7-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.maven.its</groupId>
   <artifactId>maven-integration-test-helper</artifactId>
-  <version>1.0-SNAPSHOT</version>
   <name>Maven Integration Tests</name>
   <dependencies>
     <!-- needed for VersionRange and Version -->

its/pom.xml

@@ -27,12 +27,12 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>7-SNAPSHOT</version>
+    <version>6</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven.its</groupId>
   <artifactId>core-integration-testing</artifactId>
-  <version>1-SNAPSHOT</version>
+  <version>2.1-SNAPSHOT</version>
   <name>Maven Integration Testing</name>
   <packaging>pom</packaging>
   <url>http://maven.apache.org</url>
@@ -47,6 +47,7 @@
   </issueManagement>
   <modules>
     <module>core-integration-testing-plugins</module>
+    <module>core-integration-tests</module>
     <module>core-integration-testing-support</module>  
     <module>maven-integration-test-helper</module>  
   </modules>