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 2016/01/14 15:41:24 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 b5ce3a632 -> 5a46a4aa1
[MNG-5359] Declared execution in PluginMgmt gets bound to lifecycle (regression)
o Updated to stop the test from running with Maven 3.
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/041210ea
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/041210ea
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/041210ea
Branch: refs/heads/master
Commit: 041210ea2579dc4abc61c33c537bb903832af316
Parents: b5ce3a6
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jan 14 15:16:03 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jan 14 15:21:40 2016 +0100
----------------------------------------------------------------------
...nITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/041210ea/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
index 73bdbcf..9061146 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest.java
@@ -35,7 +35,8 @@ public class MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest
public MavenITmng5359CleanPluginExecutionDeclarationInPluginMgmtTest()
{
// Might work with versions before 2.0.11, but not verified
- super( "[2.0.11,3.0-alpha-1),[3.4,)" );
+// super( "[2.0.11,3.0-alpha-1),[3.4,)" );
+ super( "[2.0.11,3.0-alpha-1)" );
}
public void testit()
[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
This reverts commit da436b95bbc151cf8c8d3ea24320e0a64080f808 partially.
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/5a46a4aa
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/5a46a4aa
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/5a46a4aa
Branch: refs/heads/master
Commit: 5a46a4aa18f37681b37d9d79acfb9f62665015dd
Parents: 041210e
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jan 14 15:26:50 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jan 14 15:40:04 2016 +0100
----------------------------------------------------------------------
.../extension/pom.xml | 1 -
.../TestLifecycleMappingDelegate.java | 11 -----------
2 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/5a46a4aa/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
index 373da00..5dd8e43 100644
--- a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml
@@ -28,7 +28,6 @@ under the License.
<version>0.1</version>
<properties>
- <!-- Upgrade to 3.4 when released. -->
<maven.version>3.2.1</maven.version>
</properties>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/5a46a4aa/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
index 2f03dc2..9c5c5e4 100644
--- a/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
+++ b/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/src/main/java/org/apache/maven/its/mng5581/lifecyclemappingdelegate/TestLifecycleMappingDelegate.java
@@ -12,12 +12,10 @@ package org.apache.maven.its.mng5581.lifecyclemappingdelegate;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.inject.Named;
import org.apache.maven.execution.MavenSession;
@@ -36,15 +34,6 @@ import org.apache.maven.project.MavenProject;
@Named("test-only")
public class TestLifecycleMappingDelegate implements LifecycleMappingDelegate {
-// @Override
- public Set<String> getRequiredLifecycles()
- {
- // This delegate requires the default lifecycle to operate.
- final Set<String> requiredLifecycles = new HashSet<String>();
- requiredLifecycles.add( "default" );
- return Collections.unmodifiableSet( requiredLifecycles );
- }
-
public Map<String, List<MojoExecution>> calculateLifecycleMappings(MavenSession session, MavenProject project,
Lifecycle lifecycle, String lifecyclePhase) throws PluginNotFoundException, PluginResolutionException,
PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException {