Author: bentmann
Date: Fri Sep 19 15:12:11 2008
New Revision: 697267
URL: http://svn.apache.org/viewvc?rev=697267&view=rev
Log:
o Decoupled it0060 from the Compiler Plugin
Removed:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/subproject/src/
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/subproject/pom.xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java?rev=697267&r1=697266&r2=697267&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0060Test.java
Fri Sep 19 15:12:11 2008
@@ -11,19 +11,16 @@
/**
* Test aggregation of list configuration items when using
- * 'combine.children=append' attribute. Specifically, merge the list of
- * excludes for the testCompile mojo.
+ * 'combine.children=append' attribute.
*/
public void testit0060()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0060" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "test" );
- verifier.assertFilePresent(
"subproject/target/classes/org/apache/maven/it0060/Person.class" );
- verifier.assertFilePresent(
"subproject/target/test-classes/org/apache/maven/it0060/PersonTest.class" );
- verifier.assertFileNotPresent(
"subproject/target/test-classes/org/apache/maven/it0060/PersonTwoTest.class" );
- verifier.assertFileNotPresent(
"subproject/target/test-classes/org/apache/maven/it0060/PersonThreeTest.class"
);
+ verifier.executeGoal( "initialize" );
+ verifier.assertFilePresent( "parent.txt" );
+ verifier.assertFilePresent( "child.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/pom.xml?rev=697267&r1=697266&r2=697267&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/pom.xml
Fri Sep 19 15:12:11 2008
@@ -1,22 +1,37 @@
+<?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 :: it0060</name>
+
<groupId>org.apache.maven.its.it0060</groupId>
<artifactId>maven-it-it0060</artifactId>
- <description>Test aggregation of list configuration items when using
- 'combine.children=append' attribute. Specifically, merge the list of
- excludes for the testCompile mojo.</description>
- <packaging>pom</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>pom</packaging>
+
+ <name>Maven Integration Test :: it0060</name>
+ <description>
+ Test aggregation of list configuration items when using
+ 'combine.children=append' attribute.
+ </description>
<modules>
<module>subproject</module>
@@ -25,13 +40,13 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-file</artifactId>
<inherited>true</inherited>
<configuration>
- <testExcludes>
- <testExclude
implementation="java.lang.String">**/PersonTwoTest.java</testExclude>
- </testExcludes>
+ <pathnames>
+ <pathname>parent.txt</pathname>
+ </pathnames>
</configuration>
</plugin>
</plugins>
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/subproject/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/subproject/pom.xml?rev=697267&r1=697266&r2=697267&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/subproject/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0060/subproject/pom.xml
Fri Sep 19 15:12:11 2008
@@ -1,23 +1,57 @@
+<?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>
+
<parent>
<groupId>org.apache.maven.its.it0060</groupId>
<artifactId>maven-it-it0060</artifactId>
<version>1.0</version>
</parent>
+
<artifactId>subproject</artifactId>
- <packaging>jar</packaging>
<version>1.0</version>
+ <packaging>jar</packaging>
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-file</artifactId>
+ <inherited>true</inherited>
<configuration>
- <testExcludes combine.children="append">
- <testExclude
implementation="java.lang.String">**/PersonThreeTest.java</testExclude>
- </testExcludes>
+ <pathnames combine.children="append">
+ <pathname>child.txt</pathname>
+ </pathnames>
</configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
