You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/04/06 14:54:48 UTC
svn commit: r931130 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-2103/ resources/mng-2103/child-1/
resources/mng-2103/child-2/ resources/mng-2103/child/
Author: bentmann
Date: Tue Apr 6 12:54:47 2010
New Revision: 931130
URL: http://svn.apache.org/viewvc?rev=931130&view=rev
Log:
o Extended IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-1/
- copied from r931123, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/pom.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-1/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java?rev=931130&r1=931129&r2=931130&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java Tue Apr 6 12:54:47 2010
@@ -48,14 +48,18 @@ public class MavenITmng2103PluginExecuti
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2103" );
- Verifier verifier = new Verifier( new File( testDir, "child" ).getAbsolutePath() );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.deleteDirectory( "target" );
+ verifier.deleteDirectory( "child-1/target" );
+ verifier.deleteDirectory( "child-2/target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- List execs = verifier.loadLines( "target/log.txt", "UTF-8" );
+ List execs = verifier.loadLines( "child-1/target/log.txt", "UTF-8" );
+ assertEquals( Arrays.asList( new String[] { "inherited" } ), execs );
+
+ execs = verifier.loadLines( "child-2/target/log.txt", "UTF-8" );
assertEquals( Arrays.asList( new String[] { "inherited" } ), execs );
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-1/pom.xml?rev=931130&r1=931123&r2=931130&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-1/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-1/pom.xml Tue Apr 6 12:54:47 2010
@@ -29,12 +29,14 @@ under the License.
</parent>
<groupId>org.apache.maven.its.mng2103</groupId>
- <artifactId>test</artifactId>
+ <artifactId>child-1</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-2103</name>
+ <name>Maven Integration Test :: MNG-2103 :: Child-1</name>
<description>
Verify that the plugin-level inherited flag can be overriden by the execution-level flag.
</description>
+
+ <!-- NOTE: This module does not mention the build plugin with the inherited execution -->
</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/pom.xml?rev=931130&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/pom.xml Tue Apr 6 12:54:47 2010
@@ -0,0 +1,51 @@
+<?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.mng2103</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng2103</groupId>
+ <artifactId>child-2</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-2103 :: Child-2</name>
+ <description>
+ Verify that the plugin-level inherited flag can be overriden by the execution-level flag.
+ </description>
+
+ <!-- NOTE: This module mentions the build plugin with the inherited execution -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/child-2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/pom.xml?rev=931130&r1=931129&r2=931130&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2103/pom.xml Tue Apr 6 12:54:47 2010
@@ -32,6 +32,11 @@ under the License.
Verify that the plugin-level inherited flag can be overriden by the execution-level flag.
</description>
+ <modules>
+ <module>child-1</module>
+ <module>child-2</module>
+ </modules>
+
<build>
<plugins>
<plugin>