You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/08/25 22:19:53 UTC
svn commit: r240129 - in /maven/components/trunk/maven-core-it: ./ it0060/
it0060/subproject/ it0060/subproject/src/ it0060/subproject/src/main/
it0060/subproject/src/main/java/ it0060/subproject/src/main/java/org/
it0060/subproject/src/main/java/org/a...
Author: jdcasey
Date: Thu Aug 25 13:19:40 2005
New Revision: 240129
URL: http://svn.apache.org/viewcvs?rev=240129&view=rev
Log:
Resolving: MNG-732
o new version of plexus-utils with Xpp3Dom.mergeXpp3Dom(..) modification allows appending of list elements.
o added it0060 to test new functionality.
Added:
maven/components/trunk/maven-core-it/it0060/
maven/components/trunk/maven-core-it/it0060/expected-results.txt (with props)
maven/components/trunk/maven-core-it/it0060/goals.txt (with props)
maven/components/trunk/maven-core-it/it0060/pom.xml (with props)
maven/components/trunk/maven-core-it/it0060/subproject/
maven/components/trunk/maven-core-it/it0060/subproject/pom.xml (with props)
maven/components/trunk/maven-core-it/it0060/subproject/src/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java (with props)
maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/
maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/it0001.properties (with props)
maven/components/trunk/maven-core-it/it0060/subproject/src/test/
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java (with props)
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java (with props)
maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java (with props)
Modified:
maven/components/trunk/maven-core-it/README.txt
maven/components/trunk/maven-core-it/integration-tests.txt
Modified: maven/components/trunk/maven-core-it/README.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=240129&r1=240128&r2=240129&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/README.txt (original)
+++ maven/components/trunk/maven-core-it/README.txt Thu Aug 25 13:19:40 2005
@@ -167,6 +167,10 @@
it0059: Verify that maven-1 POMs will be ignored but not stop the resolution
process.
+it0060: Test aggregation of list configuration items when using
+ 'combine.children=append' attribute. Specifically, merge the list of
+ excludes for the testCompile mojo.
+
-------------------------------------------------------------------------------
- generated sources
Modified: maven/components/trunk/maven-core-it/integration-tests.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=240129&r1=240128&r2=240129&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Thu Aug 25 13:19:40 2005
@@ -1,3 +1,4 @@
+it0060
it0059
it0058
it0057
Added: maven/components/trunk/maven-core-it/it0060/expected-results.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/expected-results.txt?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it0060/expected-results.txt Thu Aug 25 13:19:40 2005
@@ -0,0 +1,4 @@
+subproject/target/classes/org/apache/maven/it0001/Person.class
+subproject/target/test-classes/org/apache/maven/it0001/PersonTest.class
+!subproject/target/test-classes/org/apache/maven/it0001/PersonTwoTest.class
+!subproject/target/test-classes/org/apache/maven/it0001/PersonThreeTest.class
Propchange: maven/components/trunk/maven-core-it/it0060/expected-results.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/expected-results.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/goals.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/goals.txt?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it0060/goals.txt Thu Aug 25 13:19:40 2005
@@ -0,0 +1 @@
+test
Propchange: maven/components/trunk/maven-core-it/it0060/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/pom.xml?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0060/pom.xml Thu Aug 25 13:19:40 2005
@@ -0,0 +1,35 @@
+<model>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it0060</artifactId>
+ <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>
+
+ <modules>
+ <module>subproject</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <testExcludes>
+ <testExclude implementation="java.lang.String">**/PersonTwoTest.java</testExclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</model>
Propchange: maven/components/trunk/maven-core-it/it0060/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/subproject/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/subproject/pom.xml?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/subproject/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0060/subproject/pom.xml Thu Aug 25 13:19:40 2005
@@ -0,0 +1,25 @@
+<model>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it0060</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>maven-core-it0060-subproject</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes combine.children="append">
+ <testExclude implementation="java.lang.String">**/PersonThreeTest.java</testExclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</model>
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java (added)
+++ maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java Thu Aug 25 13:19:40 2005
@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+public class Person
+{
+ private String name;
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+}
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/it0001.properties
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/it0001.properties?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/it0001.properties (added)
+++ maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/it0001.properties Thu Aug 25 13:19:40 2005
@@ -0,0 +1 @@
+name = jason
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/it0001.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/main/resources/it0001.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java (added)
+++ maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java Thu Aug 25 13:19:40 2005
@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+import junit.framework.TestCase;
+
+public class PersonTest
+ extends TestCase
+{
+ public void testPerson()
+ {
+ Person person = new Person();
+
+ person.setName( "foo" );
+
+ assertEquals( "foo", person.getName() );
+ }
+}
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java (added)
+++ maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java Thu Aug 25 13:19:40 2005
@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+import junit.framework.TestCase;
+
+public class PersonThreeTest
+ extends TestCase
+{
+ public void testPerson()
+ {
+ Person person = new Person();
+
+ person.setName( "foo" );
+
+ assertEquals( "foo", person.getName() );
+ }
+}
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonThreeTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java?rev=240129&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java (added)
+++ maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java Thu Aug 25 13:19:40 2005
@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+import junit.framework.TestCase;
+
+public class PersonTwoTest
+ extends TestCase
+{
+ public void testPerson()
+ {
+ Person person = new Person();
+
+ person.setName( "foo" );
+
+ assertEquals( "foo", person.getName() );
+ }
+}
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0060/subproject/src/test/java/org/apache/maven/it0001/PersonTwoTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org