Author: hboutemy
Date: Sun Sep 4 12:44:39 2011
New Revision: 1165008
URL: http://svn.apache.org/viewvc?rev=1165008&view=rev
Log:
[MNG-3124] test mailing-list inheritance behaviour
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml?rev=1165008&r1=1165007&r2=1165008&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml
Sun Sep 4 12:44:39 2011
@@ -26,6 +26,15 @@ under the License.
<artifactId>child</artifactId>
<version>12-SNAPSHOT</version>
+ <mailingLists>
+ <!--mailingList> MNG-3124: no way to add a list to parent content, only
full override
+ <name>child</name>
+ <post>p...@mailing.list.com</post>
+ <subscribe>subscr...@mailing.list.com</subscribe>
+ <unsubscribe>unsubscr...@mailing.list.com</unsubscribe>
+ </mailingList-->
+ </mailingLists>
+
<build>
<plugins>
<plugin>
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml?rev=1165008&r1=1165007&r2=1165008&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml
Sun Sep 4 12:44:39 2011
@@ -29,7 +29,16 @@ under the License.
<!-- name is not inherited, but description is -->
<description>Model inheritance description</description>
- <url>http://www.apache.org/child/</url><!-- child's artifactId added to
parent url -->
+ <url>http://www.apache.org/child/</url><!-- child's artifactId appended to
parent url -->
+
+ <mailingLists>
+ <mailingList>
+ <name>parent</name>
+ <post>p...@mailing.list.com</post>
+ <subscribe>subscr...@mailing.list.com</subscribe>
+ <unsubscribe>unsubscr...@mailing.list.com</unsubscribe>
+ </mailingList>
+ </mailingLists>
<build>
<plugins>
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml?rev=1165008&r1=1165007&r2=1165008&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml
Sun Sep 4 12:44:39 2011
@@ -31,6 +31,15 @@ under the License.
<description>Model inheritance description</description>
<url>http://www.apache.org/</url>
+ <mailingLists>
+ <mailingList>
+ <name>parent</name>
+ <post>p...@mailing.list.com</post>
+ <subscribe>subscr...@mailing.list.com</subscribe>
+ <unsubscribe>unsubscr...@mailing.list.com</unsubscribe>
+ </mailingList>
+ </mailingLists>
+
<build>
<plugins>
<plugin>
