You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2015/12/21 02:46:13 UTC

[1/2] maven-integration-testing git commit: [MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 8db2b86be -> 0fdf7c282


[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)

o Updated to remove non-existent plugin versions from the test pom.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/2e10d60a
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/2e10d60a
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/2e10d60a

Branch: refs/heads/master
Commit: 2e10d60ac3d9652201c713219de5de89ea621d3b
Parents: 8db2b86
Author: Christian Schulte <sc...@apache.org>
Authored: Mon Dec 21 02:41:27 2015 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Mon Dec 21 02:41:27 2015 +0100

----------------------------------------------------------------------
 core-it-suite/src/test/resources/mng-5359/pom.xml | 15 ---------------
 1 file changed, 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2e10d60a/core-it-suite/src/test/resources/mng-5359/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5359/pom.xml b/core-it-suite/src/test/resources/mng-5359/pom.xml
index 8b13d9d..29f8331 100644
--- a/core-it-suite/src/test/resources/mng-5359/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5359/pom.xml
@@ -53,21 +53,6 @@ under the License.
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>


[2/2] maven-integration-testing git commit: [MNG-5581] Provide a way to customize lifecycle mapping logic

Posted by sc...@apache.org.
[MNG-5581] Provide a way to customize lifecycle mapping logic

o Updated to make test work with Maven >= 3.4.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/0fdf7c28
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/0fdf7c28
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/0fdf7c28

Branch: refs/heads/master
Commit: 0fdf7c282a2916a03ea612c3aa43df400b3f6a51
Parents: 2e10d60
Author: Christian Schulte <sc...@apache.org>
Authored: Mon Dec 21 02:43:11 2015 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Mon Dec 21 02:43:11 2015 +0100

----------------------------------------------------------------------
 .../apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0fdf7c28/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index f923550..5facdec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -62,7 +62,8 @@ public class MavenITmng5581LifecycleMappingDelegate
         verifier.verifyErrorFreeLog();
 
         // run custom "test-only" build phase
-        verifier.executeGoal( "test-only" );
+        // See MNG-5359 for why the default lifecycle needs to be run as well.
+        verifier.executeGoal( "validate test-only" );
         verifier.resetStreams();
         verifier.verifyErrorFreeLog();
         verifier.verifyTextInLog( "maven-surefire-plugin" );