Re: svn commit: r728725 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/builder/ resources-project-builder/merged-plugin-exec-goals-order/ resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/ resources-...

[Jason van Zyl]

Awesome, thanks.

On 22-Dec-08, at 11:59 AM, bentm...@apache.org wrote:

Author: bentmann
Date: Mon Dec 22 08:59:19 2008
New Revision: 728725

URL: http://svn.apache.org/viewvc?rev=728725&view=rev
Log:
o Created UT from MNG-3937

Added:

maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/ (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/ (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/ (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/ (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/ (with props) maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml (with props)

Modified:

maven/components/trunk/maven-project/src/test/java/org/apache/ maven/project/builder/PomConstructionTest.java

Modified: maven/components/trunk/maven-project/src/test/java/org/ apache/maven/project/builder/PomConstructionTest.java

URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=728725&r1=728724&r2=728725&view=diff

= = = = = = = = ====================================================================== --- maven/components/trunk/maven-project/src/test/java/org/apache/ maven/project/builder/PomConstructionTest.java (original) +++ maven/components/trunk/maven-project/src/test/java/org/apache/ maven/project/builder/PomConstructionTest.java Mon Dec 22 08:59:19 2008

@@ -178,6 +178,32 @@
    }
    //*/

+    /* FIXME: cf. MNG-3937

+ public void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement()

+        throws Exception
+    {

+ PomTestWrapper pom = buildPom( "merged-plugin-exec-goals- order/wo-plugin-mngt/sub" ); + assertEquals( 5, ( (List<?>) pom.getValue( "build/ plugins[1]/executions[1]/goals" ) ).size() ); + assertEquals( "child-a", pom.getValue( "build/plugins[1]/ executions[1]/goals[1]" ) ); + assertEquals( "merged", pom.getValue( "build/plugins[1]/ executions[1]/goals[2]" ) ); + assertEquals( "child-b", pom.getValue( "build/plugins[1]/ executions[1]/goals[3]" ) ); + assertEquals( "parent-b", pom.getValue( "build/plugins[1]/ executions[1]/goals[4]" ) ); + assertEquals( "parent-a", pom.getValue( "build/plugins[1]/ executions[1]/goals[5]" ) );

+    }
+

+ public void testOrderOfMergedPluginExecutionGoalsWithPluginManagement()

+        throws Exception
+    {

+ PomTestWrapper pom = buildPom( "merged-plugin-exec-goals- order/w-plugin-mngt/sub" ); + assertEquals( 5, ( (List<?>) pom.getValue( "build/ plugins[1]/executions[1]/goals" ) ).size() ); + assertEquals( "child-a", pom.getValue( "build/plugins[1]/ executions[1]/goals[1]" ) ); + assertEquals( "merged", pom.getValue( "build/plugins[1]/ executions[1]/goals[2]" ) ); + assertEquals( "child-b", pom.getValue( "build/plugins[1]/ executions[1]/goals[3]" ) ); + assertEquals( "parent-b", pom.getValue( "build/plugins[1]/ executions[1]/goals[4]" ) ); + assertEquals( "parent-a", pom.getValue( "build/plugins[1]/ executions[1]/goals[5]" ) );

+    }
+    //*/
+
    private PomArtifactResolver artifactResolver( String basedir )
    {

return new FileBasedPomArtifactResolver( new File( BASE_POM_DIR, basedir ) );

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/

------------------------------------------------------------------------------
   bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/

------------------------------------------------------------------------------
   bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/

------------------------------------------------------------------------------
   bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/

------------------------------------------------------------------------------
   bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml

URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml?rev=728725&view=auto

= = = = = = = = ====================================================================== --- maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml (added) +++ maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml Mon Dec 22 08:59:19 2008

@@ -0,0 +1,59 @@
+<?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>
+
+  <groupId>org.apache.maven.its.mng3937</groupId>
+  <artifactId>parent-2</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>

+ Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly

+    ordered.
+  </description>
+
+  <build>
+    <!-- This project uses plugin management for the test plugin -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-a</artifactId>
+          <version>1.0-SNAPSHOT</version>
+          <executions>
+            <execution>
+              <id>merge</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>parent-b</goal>
+                <goal>merged</goal>
+                <goal>parent-a</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml

------------------------------------------------------------------------------
   svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml

------------------------------------------------------------------------------
   svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/ pom.xml

URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml?rev=728725&view=auto

= = = = = = = = ====================================================================== --- maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml (added) +++ maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml Mon Dec 22 08:59:19 2008

@@ -0,0 +1,59 @@
+<?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.mng3937</groupId>
+    <artifactId>parent-2</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child-2</artifactId>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>

+ Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly

+    ordered.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>merge</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>child-a</goal>
+              <goal>merged</goal>
+              <goal>child-b</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/ pom.xml

------------------------------------------------------------------------------
   svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/ pom.xml

------------------------------------------------------------------------------
   svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/

------------------------------------------------------------------------------
   bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml

URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml?rev=728725&view=auto

= = = = = = = = ====================================================================== --- maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml (added) +++ maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml Mon Dec 22 08:59:19 2008

@@ -0,0 +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>
+
+  <groupId>org.apache.maven.its.mng3937</groupId>
+  <artifactId>parent-1</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>

+ Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly

+    ordered.
+  </description>
+
+  <build>

+ <!-- This project does not use plugin management for the test plugin -->

+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>merge</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parent-b</goal>
+              <goal>merged</goal>
+              <goal>parent-a</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml

------------------------------------------------------------------------------
   svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml

------------------------------------------------------------------------------
   svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/

------------------------------------------------------------------------------
   bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/ pom.xml

URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml?rev=728725&view=auto

= = = = = = = = ====================================================================== --- maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml (added) +++ maven/components/trunk/maven-project/src/test/resources-project- builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml Mon Dec 22 08:59:19 2008

@@ -0,0 +1,59 @@
+<?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.mng3937</groupId>
+    <artifactId>parent-1</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child-1</artifactId>
+
+  <name>Maven Integration Test :: MNG-3937</name>
+  <description>

+ Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly

+    ordered.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>merge</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>child-a</goal>
+              <goal>merged</goal>
+              <goal>child-b</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/ pom.xml

------------------------------------------------------------------------------
   svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources- project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/ pom.xml

------------------------------------------------------------------------------
   svn:keywords = Author Date Id Revision

Thanks,

Jason

----------------------------------------------------------
Jason van Zyl
Founder,  Apache Maven
jason at sonatype dot com
----------------------------------------------------------

Our achievements speak for themselves. What we have to keep track
of are our failures, discouragements and doubts. We tend to forget
the past difficulties, the many false starts, and the painful
groping. We see our past achievements as the end result of a
clean forward thrust, and our present difficulties as
signs of decline and decay.

 -- Eric Hoffer, Reflections on the Human Condition


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org