Author: bentmann
Date: Tue Jan 6 11:43:25 2009
New Revision: 732076
URL: http://svn.apache.org/viewvc?rev=732076&view=rev
Log:
o Decoupled it0041 from production plugins
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java?rev=732076&r1=732075&r2=732076&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041Test.java
Tue Jan 6 11:43:25 2009
@@ -41,15 +41,16 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0041" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support",
"1.2", "coreit-artifact" );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/maven-it-it0041-1.0-SNAPSHOT.jar"
);
- verifier.assertArtifactPresent( "org.apache.maven",
"maven-core-it-support", "1.2", "coreit-artifact" );
- verifier.assertArtifactPresent( "org.apache.maven",
"maven-core-it-support", "1.2", "pom" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ verifier.assertArtifactPresent( "org.apache.maven",
"maven-core-it-support", "1.2", "coreit-artifact" );
+ verifier.assertArtifactPresent( "org.apache.maven",
"maven-core-it-support", "1.2", "pom" );
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/pom.xml?rev=732076&r1=732075&r2=732076&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0041/pom.xml
Tue Jan 6 11:43:25 2009
@@ -1,10 +1,33 @@
+<?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 :: it0041</name>
+
<groupId>org.apache.maven.its.it0041</groupId>
- <artifactId>maven-it-it0041</artifactId>
- <description>Test the use of a new type from a plugin</description>
+ <artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: it0041</name>
+ <description>Test the use of a new type from a plugin</description>
<dependencies>
<dependency>
@@ -14,6 +37,7 @@
<type>it-artifact</type>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -22,6 +46,20 @@
<version>2.1-SNAPSHOT</version>
<extensions>true</extensions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
