You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/21 19:53:00 UTC

svn commit: r736373 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/builder/ resources-project-builder/dual-execution-ids/ resources-project-builder/dual-execution-ids/sub/

Author: sisbell
Date: Wed Jan 21 10:53:00 2009
New Revision: 736373

URL: http://svn.apache.org/viewvc?rev=736373&view=rev
Log:
Unit test for MNG-3965

Added:
    maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/
    maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml
    maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/
    maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
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=736373&r1=736372&r2=736373&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 Wed Jan 21 10:53:00 2009
@@ -114,7 +114,14 @@
         assertEquals( 3, ( (List<?>) pom.getValue( "repositories" ) ).size() );
     }
 
-
+    /** MNG-3985
+    public void testMultipleExecutionIds()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "dual-execution-ids/sub" );
+        assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
+    }
+    //*/
     public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
         throws Exception
     {

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml?rev=736373&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml Wed Jan 21 10:53:00 2009
@@ -0,0 +1,27 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.mercury</groupId>
+  <artifactId>mercury-parent</artifactId>
+  <version>1.0.0-alpha-3-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.5</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    </build>
+</project>

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml?rev=736373&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml Wed Jan 21 10:53:00 2009
@@ -0,0 +1,43 @@
+<project>
+
+<parent>
+  <artifactId>mercury-parent</artifactId>
+  <groupId>org.apache.maven.mercury</groupId>
+  <version>1.0.0-alpha-3-SNAPSHOT</version>
+</parent>
+
+<modelVersion>4.0.0</modelVersion>
+<groupId>org.apache.maven.mercury</groupId>
+<artifactId>mercury-util</artifactId>
+<name>Mercury Shared Utilities</name>
+<version>1.0.0-alpha-3-SNAPSHOT</version>
+ <build>
+  <pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <version>1.0</version>
+      </plugin>
+      </plugins>
+  </pluginManagement>
+  <plugins>
+    <plugin>
+      <artifactId>maven-remote-resources-plugin</artifactId>
+      <version>1.0</version>
+      <executions>
+        <execution>
+          <id>default-execution-id</id> 
+          <goals>
+            <goal>process</goal>
+          </goals>
+          <configuration>
+            <resourceBundles>
+              <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+            </resourceBundles>
+          </configuration>
+        </execution>
+      </executions>
+    </plugin>
+     </plugins>
+</build>
+  </project>