From 68e9b92b4ec85d94df7fa1c5a611fcbbc1c90aaa Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Sat, 20 Sep 2008 22:42:43 +0000
Subject: [PATCH] o Decoupled ITs from production versions of core plugins

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@697429 13f79535-47bb-0310-9956-ffa450edef68
---
 .../integrationtests/MavenIT0051Test.java     |  4 +-
 .../integrationtests/MavenIT0052Test.java     |  3 +-
 .../src/test/resources/it0051/pom.xml         | 60 ++++++++++---------
 .../java/org/apache/maven/it0051/Person.java  | 16 -----
 .../src/main/resources/it0051.properties      |  1 -
 .../org/apache/maven/it0051/PersonTest.java   | 16 -----
 .../src/test/resources/it0052/pom.xml         | 55 +++++++++++++----
 .../java/org/apache/maven/it0052/Person.java  | 16 -----
 .../src/main/resources/it0052.properties      |  1 -
 .../org/apache/maven/it0052/PersonTest.java   | 16 -----
 10 files changed, 78 insertions(+), 110 deletions(-)
 delete mode 100644 its/core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0051/Person.java
 delete mode 100644 its/core-integration-tests/src/test/resources/it0051/src/main/resources/it0051.properties
 delete mode 100644 its/core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0051/PersonTest.java
 delete mode 100644 its/core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0052/Person.java
 delete mode 100644 its/core-integration-tests/src/test/resources/it0052/src/main/resources/it0052.properties
 delete mode 100644 its/core-integration-tests/src/test/resources/it0052/src/test/java/org/apache/maven/it0052/PersonTest.java

diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
index 0a342bee67..29e92c050c 100644
--- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
+++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0051Test.java
@@ -29,8 +29,8 @@ public class MavenIT0051Test
         cliOptions.add( "--no-plugin-registry -DperformRelease=true" );
         verifier.setCliOptions( cliOptions );
         verifier.executeGoal( "package" );
-        verifier.assertFilePresent( "target/maven-it-it0051-1.0.jar" );
-        verifier.assertFilePresent( "target/maven-it-it0051-1.0-sources.jar" );
+        verifier.assertFilePresent( "target/source-jar.txt" );
+        verifier.assertFilePresent( "target/javadoc-jar.txt" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java
index 32e9d93e1c..2f129b527f 100644
--- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java
+++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0052Test.java
@@ -25,7 +25,8 @@ public class MavenIT0052Test
         verifier.setCliOptions( cliOptions );
         verifier.executeGoal( "package" );
         verifier.assertFilePresent( "target/maven-it-it0052-1.0.jar" );
-        verifier.assertFileNotPresent( "target/maven-it-it0052-1.0-sources.jar" );
+        verifier.assertFileNotPresent( "target/source-jar.txt" );
+        verifier.assertFileNotPresent( "target/javadoc-jar.txt" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
diff --git a/its/core-integration-tests/src/test/resources/it0051/pom.xml b/its/core-integration-tests/src/test/resources/it0051/pom.xml
index 2d72aebc0a..8253545632 100644
--- a/its/core-integration-tests/src/test/resources/it0051/pom.xml
+++ b/its/core-integration-tests/src/test/resources/it0051/pom.xml
@@ -1,42 +1,46 @@
+<?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 :: it0051</name> 
+
   <groupId>org.apache.maven.its.it0051</groupId>
   <artifactId>maven-it-it0051</artifactId>
-  <description>Test source attachment when -DperformRelease=true is specified.</description>
-  <packaging>jar</packaging>
   <version>1.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: it0051</name> 
+  <description>Test source attachment when -DperformRelease=true is specified.</description>
   
-  <!-- NOTE: This build section has only a single function: 
-       to upgrade the version of plexus-utils, so this test 
-       can handle paths with spaces in them. 
-       
-       Once a new release of the javadoc plugin takes care of
-       http://jira.codehaus.org/browse/MJAVADOC-144
-       we should be able to remove this section of the POM.
-  -->
+  <!-- NOTE: Use stub versions of the core plugins referenced by the release profile -->
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.4</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.codehaus.plexus</groupId>
-              <artifactId>plexus-utils</artifactId>
-              <version>1.5.4</version>
-            </dependency>
-          </dependencies>
+          <version>0.1-stub-SNAPSHOT</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>0.1-stub-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/its/core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0051/Person.java b/its/core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0051/Person.java
deleted file mode 100644
index a986ea2ea4..0000000000
--- a/its/core-integration-tests/src/test/resources/it0051/src/main/java/org/apache/maven/it0051/Person.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0051;
-
-public class Person
-{
-    private String name;
-    
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-}
diff --git a/its/core-integration-tests/src/test/resources/it0051/src/main/resources/it0051.properties b/its/core-integration-tests/src/test/resources/it0051/src/main/resources/it0051.properties
deleted file mode 100644
index f54f8ab106..0000000000
--- a/its/core-integration-tests/src/test/resources/it0051/src/main/resources/it0051.properties
+++ /dev/null
@@ -1 +0,0 @@
-name = jason
diff --git a/its/core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0051/PersonTest.java b/its/core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0051/PersonTest.java
deleted file mode 100644
index 1b898fc7be..0000000000
--- a/its/core-integration-tests/src/test/resources/it0051/src/test/java/org/apache/maven/it0051/PersonTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0051;
-
-import junit.framework.TestCase;
-
-public class PersonTest
-    extends TestCase
-{
-    public void testPerson()
-    {
-        Person person = new Person();
-        
-        person.setName( "foo" );
-        
-        assertEquals( "foo", person.getName() );
-    }
-}
diff --git a/its/core-integration-tests/src/test/resources/it0052/pom.xml b/its/core-integration-tests/src/test/resources/it0052/pom.xml
index dd3fb7dd0a..ab87bfb47b 100644
--- a/its/core-integration-tests/src/test/resources/it0052/pom.xml
+++ b/its/core-integration-tests/src/test/resources/it0052/pom.xml
@@ -1,19 +1,48 @@
+<?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 :: it0052</name> 
+
   <groupId>org.apache.maven.its.it0052</groupId>
   <artifactId>maven-it-it0052</artifactId>
-  <description>Test that source attachment doesn't take place when
-        -DperformRelease=true is missing.</description>
-  <packaging>jar</packaging>
   <version>1.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: it0052</name> 
+  <description>Test that source attachment doesn't take place when -DperformRelease=true is missing.</description>
+
+  <!-- NOTE: Use stub versions of the core plugins referenced by the release profile -->
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>0.1-stub-SNAPSHOT</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>0.1-stub-SNAPSHOT</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
diff --git a/its/core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0052/Person.java b/its/core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0052/Person.java
deleted file mode 100644
index da017ed481..0000000000
--- a/its/core-integration-tests/src/test/resources/it0052/src/main/java/org/apache/maven/it0052/Person.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0052;
-
-public class Person
-{
-    private String name;
-    
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-}
diff --git a/its/core-integration-tests/src/test/resources/it0052/src/main/resources/it0052.properties b/its/core-integration-tests/src/test/resources/it0052/src/main/resources/it0052.properties
deleted file mode 100644
index f54f8ab106..0000000000
--- a/its/core-integration-tests/src/test/resources/it0052/src/main/resources/it0052.properties
+++ /dev/null
@@ -1 +0,0 @@
-name = jason
diff --git a/its/core-integration-tests/src/test/resources/it0052/src/test/java/org/apache/maven/it0052/PersonTest.java b/its/core-integration-tests/src/test/resources/it0052/src/test/java/org/apache/maven/it0052/PersonTest.java
deleted file mode 100644
index 30969834f0..0000000000
--- a/its/core-integration-tests/src/test/resources/it0052/src/test/java/org/apache/maven/it0052/PersonTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0052;
-
-import junit.framework.TestCase;
-
-public class PersonTest
-    extends TestCase
-{
-    public void testPerson()
-    {
-        Person person = new Person();
-        
-        person.setName( "foo" );
-        
-        assertEquals( "foo", person.getName() );
-    }
-}