Author: bentmann
Date: Wed Jun 17 21:27:26 2009
New Revision: 785812
URL: http://svn.apache.org/viewvc?rev=785812&view=rev
Log:
o Polished IT suite
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3746/readme.txt
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3428/src/main/java/tests/MyMojo.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java?rev=785812&r1=785811&r2=785812&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
Wed Jun 17 21:27:26 2009
@@ -38,7 +38,8 @@
}
/**
- * Test that exclusions defined on a dependency apply to its transitive
dependencies as well.
+ * Test that a plugin that depends on log4j and employes the artifact
resolver does not die when using
+ * commons-http to resolve an artifact.
*/
public void testit()
throws Exception
@@ -46,6 +47,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4207" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml?rev=785812&r1=785811&r2=785812&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
Wed Jun 17 21:27:26 2009
@@ -117,6 +117,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log4j</artifactId>
+ <version>${itPluginVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-log-file</artifactId>
<version>${itPluginVersion}</version>
<scope>runtime</scope>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3428/src/main/java/tests/MyMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3428/src/main/java/tests/MyMojo.java?rev=785812&r1=785811&r2=785812&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3428/src/main/java/tests/MyMojo.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3428/src/main/java/tests/MyMojo.java
Wed Jun 17 21:27:26 2009
@@ -47,6 +47,8 @@
{
Artifact artifact = (Artifact) it.next();
+ System.out.println( artifact );
+
if ( "commons-cli".equals( artifact.getArtifactId() ) )
{
foundCommonsCli = true;
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml?rev=785812&r1=785811&r2=785812&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml
Wed Jun 17 21:27:26 2009
@@ -22,11 +22,17 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.mngXXXX</groupId>
+ <groupId>org.apache.maven.its.mng4208</groupId>
<artifactId>test</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
+ <name>Maven Integration Test :: MNG-4208</name>
+ <description>
+ Test that a plugin that depends on log4j and employes the artifact
resolver does not die when using
+ commons-http to resolve an artifact.
+ </description>
+
<build>
<extensions>
<extension>
@@ -34,16 +40,20 @@
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>1.0-beta-5</version>
</extension>
- <!--extension>
+ <!--
+ FWIW, adding the extension below would make the test pass but it has to
work with the bundled wagon, too.
+ <extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>1.0-beta-5</version>
- </extension-->
+ </extension>
+ -->
</extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-log4j</artifactId>
+ <version>2.1-SNAPSHOT</version>
<configuration>
<groupId>test</groupId>
<artifactId>test</artifactId>
