You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/07/09 23:46:51 UTC
svn commit: r675354 - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
resources/mng-3473PluginReportCrash/pom.xml
Author: jdcasey
Date: Wed Jul 9 14:46:51 2008
New Revision: 675354
URL: http://svn.apache.org/viewvc?rev=675354&view=rev
Log:
preserve logfiles from different rounds of maven invocation, and move the project-info-reports-plugin version definition out into the general build section, to make it more concrete and less prone to breakage.
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java?rev=675354&r1=675353&r2=675354&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java Wed Jul 9 14:46:51 2008
@@ -7,6 +7,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -29,6 +30,8 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File logFile = new File( testDir, "log.txt" );
+
// force the use of the 2.4.1 plugin version via a profile here...
List cliOptions = new ArrayList();
cliOptions.add( "-Pplugin-2.4.1" );
@@ -38,13 +41,17 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ logFile.renameTo( new File( testDir, "log-2.4.1-preinstall.txt" ) );
+
//should succeed with 2.4.1
- verifier.executeGoal( "site" );
+ verifier.executeGoals( Arrays.asList( new String[]{ "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom", "site" } ) );
// NOTE: Velocity prints an [ERROR] line pertaining to an incorrect macro usage when run in 2.1, so this doesn't work.
// verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ logFile.renameTo( new File( testDir, "log-2.4.1.txt" ) );
+
//should fail with 2.4
cliOptions.clear();
cliOptions.add( "-Pplugin-2.4" );
@@ -60,5 +67,7 @@
}
verifier.verifyTextInLog( "org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException" );
verifier.resetStreams();
+
+ logFile.renameTo( new File( testDir, "log-2.4.txt" ) );
}
}
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml?rev=675354&r1=675353&r2=675354&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml Wed Jul 9 14:46:51 2008
@@ -47,11 +47,6 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- <plugin>
<artifactId>maven-plugin-plugin</artifactId>
<!--only fails with 2.4, not 2.3 or 2.4.1-->
<version>2.4</version>
@@ -73,5 +68,12 @@
</build>
<reporting>
<outputDirectory>target/site</outputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ </plugins>
</reporting>
</project>