o Decoupled it0031 from production plugin

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

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0031Test.java

@@ -32,7 +32,7 @@ public class MavenIT0031Test
 {
     public MavenIT0031Test()
     {
-    }            
+    }
 
     /**
      * Test usage of plugins.xml mapping file on the repository to resolve plugin artifactId from it's prefix using the
@@ -42,21 +42,18 @@ public void testit0031()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0031" );
+
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         List cliOptions = new ArrayList();
         cliOptions.add( "--settings settings.xml" );
         verifier.setCliOptions( cliOptions );
         Properties systemProperties = new Properties();
-        systemProperties.put( "model", "src/main/mdo/test.mdo" );
-        systemProperties.put( "version", "1.0.0" );
+        systemProperties.put( "maven.pathname", "target/file.txt" );
         verifier.setSystemProperties( systemProperties );
-        Properties verifierProperties = new Properties();
-        verifierProperties.put( "failOnErrorOutput", "false" );
-        verifier.setVerifierProperties( verifierProperties );
-        verifier.executeGoal( "modello:java" );
-        verifier.assertFilePresent( "target/generated-sources/modello/org/apache/maven/it/it0031/Root.java" );
-        // don't verify error free log
+        verifier.executeGoal( "itfile:file" );
+        verifier.assertFilePresent( "target/file.txt" );
+        verifier.verifyErrorFreeLog();
         verifier.resetStreams();
-
     }
+
 }

its/core-it-suite/src/test/resources/it0031/pom.xml

@@ -1,35 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <name>Maven Integration Test :: it0031</name> 
+
   <groupId>org.apache.maven.its.it0031</groupId>
   <artifactId>maven-it-it0031</artifactId>
-  <description>Test usage of plugins.xml mapping file on the repository to resolve
-        plugin artifactId from it's prefix using the pluginGroups in
-        the provided settings.xml.</description>
   <version>1.0-SNAPSHOT</version>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-touch</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <pluginItem>${test}</pluginItem>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-    <!--remove when the IT plugins are actually release-->
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache.snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
+
+  <name>Maven Integration Test :: it0031</name> 
+  <description>
+    Test usage of plugins.xml mapping file on the repository to resolve
+    plugin artifactId from it's prefix using the pluginGroups in
+    the provided settings.xml.
+  </description>
+
+  <!--remove when the IT plugins are actually release-->
+  <pluginRepositories>
+      <pluginRepository>
+          <id>apache.snapshots</id>
+          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+          <snapshots>
+              <enabled>true</enabled>
+          </snapshots>
+          <releases>
+              <enabled>false</enabled>
+          </releases>
+      </pluginRepository>
+  </pluginRepositories>
 </project>

its/core-it-suite/src/test/resources/it0031/settings.xml

@@ -1,5 +1,5 @@
 <settings>
   <pluginGroups>
-    <pluginGroup>org.codehaus.modello</pluginGroup>
+    <pluginGroup>org.apache.maven.its.plugins</pluginGroup>
   </pluginGroups>
 </settings>