Author: bentmann
Date: Mon Feb 9 21:10:28 2009
New Revision: 742735
URL: http://svn.apache.org/viewvc?rev=742735&view=rev
Log:
o Deleted maven-it-plugin-file which has been superseded by the
maven-it-plugin-log-file
Removed:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-file/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.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/it0024/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0496/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0985/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3808/pom.xml
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
Mon Feb 9 21:10:28 2009
@@ -53,12 +53,13 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
- cliOptions.add( "--settings settings.xml" );
+ cliOptions.add( "--settings" );
+ cliOptions.add( "settings.xml" );
verifier.setCliOptions( cliOptions );
Properties systemProperties = new Properties();
- systemProperties.put( "maven.pathname", "target/file.txt" );
+ systemProperties.put( "log.logFile", "target/file.txt" );
verifier.setSystemProperties( systemProperties );
- verifier.executeGoal( "itfile:file" );
+ verifier.executeGoal( "itlog-file:reset" );
verifier.assertFilePresent( "target/file.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
Mon Feb 9 21:10:28 2009
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Properties;
/**
* This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-469";>MNG-469</a>.
@@ -50,10 +51,12 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" );
- verifier.assertFilePresent( "target/reporting.txt" );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config"
);
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+
+ Properties props = verifier.loadProperties( "target/config.properties"
);
+ assertEquals( "not-the-default-value", props.getProperty(
"defaultParam" ) );
}
/**
@@ -67,8 +70,9 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config"
);
verifier.assertFilePresent( "target/build.txt" );
+ verifier.assertFileNotPresent( "target/reporting.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
Mon Feb 9 21:10:28 2009
@@ -46,7 +46,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-log-file:2.1-SNAPSHOT:reset" );
verifier.assertFilePresent( "target/file.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
Mon Feb 9 21:10:28 2009
@@ -57,7 +57,7 @@
verifier.assertFilePresent( "target/model.properties" );
Properties props = verifier.loadProperties( "target/model.properties"
);
- assertEquals( "maven-it-plugin-file", props.getProperty(
"project.reporting.plugins.0.artifactId" ) );
+ assertEquals( "maven-it-plugin-log-file", props.getProperty(
"project.reporting.plugins.0.artifactId" ) );
assertEquals( "maven-it-plugin-expression", props.getProperty(
"project.reporting.plugins.1.artifactId" ) );
assertEquals( "maven-it-plugin-configuration", props.getProperty(
"project.reporting.plugins.2.artifactId" ) );
}
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=742735&r1=742734&r2=742735&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
Mon Feb 9 21:10:28 2009
@@ -143,12 +143,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-fork</artifactId>
<version>${itPluginVersion}</version>
<scope>runtime</scope>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0024/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0024/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0024/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0024/pom.xml
Mon Feb 9 21:10:28 2009
@@ -27,7 +27,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: it0024</name>
+ <name>Maven Integration Test :: it0024</name>
<description>
Test usage of <executions/> inside a plugin rather than
<goals/>
that are directly inside the plugin.
@@ -37,17 +37,17 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
<execution>
<id>test</id>
<phase>initialize</phase>
<configuration>
- <pathname>target/plugin-exec-configuration.txt</pathname>
+ <logFile>target/plugin-exec-configuration.txt</logFile>
</configuration>
<goals>
- <goal>file</goal>
+ <goal>reset</goal>
</goals>
</execution>
</executions>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test0/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
Mon Feb 9 21:10:28 2009
@@ -27,7 +27,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-469</name>
+ <name>Maven Integration Test :: MNG-469</name>
<description>
Test that reporting configuration applies to build plugins, too.
</description>
@@ -36,11 +36,12 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-configuration</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
+ <propertiesFile>target/config.properties</propertiesFile>
<!-- should override default value when plugin is invoked during
build lifecycle -->
- <pathname>target/reporting.txt</pathname>
+ <defaultParam>not-the-default-value</defaultParam>
</configuration>
</plugin>
</plugins>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test1/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
Mon Feb 9 21:10:28 2009
@@ -27,7 +27,7 @@
<version>1.1</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-469</name>
+ <name>Maven Integration Test :: MNG-469</name>
<description>
Test that reporting configuration does not override build configuration
during build lifecycle.
</description>
@@ -36,11 +36,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-configuration</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
<!-- should be dominant when plugin is invoked during build
lifecycle -->
- <pathname>target/build.txt</pathname>
+ <propertiesFile>target/build.txt</propertiesFile>
</configuration>
</plugin>
</plugins>
@@ -50,11 +50,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-configuration</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
<!-- should not override value from <build> configuration when
plugin is invoked during build lifecycle -->
- <pathname>target/reporting.txt</pathname>
+ <propertiesFile>target/reporting.txt</propertiesFile>
</configuration>
</plugin>
</plugins>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0496/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0496/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0496/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0496/pom.xml
Mon Feb 9 21:10:28 2009
@@ -27,7 +27,7 @@
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: it0028</name>
+ <name>Maven Integration Test :: it0028</name>
<description>
Test that unused configuration parameters from the POM don't cause the
mojo to fail...they will show up as warnings in the -X output instead.
@@ -37,9 +37,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
+ <logFile>target/file.txt</logFile>
<unused>something</unused>
</configuration>
</plugin>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0985/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0985/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0985/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0985/pom.xml
Mon Feb 9 21:10:28 2009
@@ -39,17 +39,17 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
<execution>
<id>exec1</id>
<phase>initialize</phase>
<goals>
- <goal>file</goal>
+ <goal>reset</goal>
</goals>
<configuration>
- <pathname>target/unexpected.txt</pathname>
+ <logFile>target/unexpected.txt</logFile>
</configuration>
</execution>
</executions>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3719/pom.xml
Mon Feb 9 21:10:28 2009
@@ -27,7 +27,7 @@
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3719</name>
+ <name>Maven Integration Test :: MNG-3719</name>
<description>
Test the plugins are executeed in the order given in the POM.
</description>
@@ -40,17 +40,17 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
<execution>
<id>step 1</id>
<phase>validate</phase>
<goals>
- <goal>file</goal>
+ <goal>reset</goal>
</goals>
<configuration>
- <pathname>target/model.properties</pathname>
+ <logFile>target/model.properties</logFile>
</configuration>
</execution>
</executions>
@@ -77,17 +77,17 @@
</plugin>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
<execution>
<id>step 3</id>
<phase>validate</phase>
<goals>
- <goal>file</goal>
+ <goal>reset</goal>
</goals>
<configuration>
- <pathname>target/model.properties</pathname>
+ <logFile>target/model.properties</logFile>
</configuration>
</execution>
</executions>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3808/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3808/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3808/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3808/pom.xml
Mon Feb 9 21:10:28 2009
@@ -62,7 +62,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-file</artifactId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
<version>2.1-SNAPSHOT</version>
</plugin>
<plugin>
Modified:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml?rev=742735&r1=742734&r2=742735&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
Mon Feb 9 21:10:28 2009
@@ -42,7 +42,6 @@
<module>maven-it-plugin-core-stubs</module>
<module>maven-it-plugin-dependency-resolution</module>
<module>maven-it-plugin-expression</module>
- <module>maven-it-plugin-file</module>
<module>maven-it-plugin-fork</module>
<module>maven-it-plugin-log-file</module>
<module>maven-it-plugin-no-project</module>
