Repository: maven-integration-testing Updated Branches: refs/heads/master ea3d3f939 -> da436b95b
[MNG-5581] Provide a way to customize lifecycle mapping logic o Updated the test 'LifecycleMappingDelegate' to implement Maven 3.4 API. 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/da436b95 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/da436b95 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/da436b95 Branch: refs/heads/master Commit: da436b95bbc151cf8c8d3ea24320e0a64080f808 Parents: ea3d3f9 Author: Christian Schulte <[email protected]> Authored: Tue Dec 22 00:30:31 2015 +0100 Committer: Christian Schulte <[email protected]> Committed: Tue Dec 22 00:30:31 2015 +0100 ---------------------------------------------------------------------- .../maven/it/MavenITmng5581LifecycleMappingDelegate.java | 4 +--- .../extension/pom.xml | 1 + .../TestLifecycleMappingDelegate.java | 11 +++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/da436b95/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 b70304a..f923550 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 @@ -20,7 +20,6 @@ package org.apache.maven.it; */ import java.io.File; -import java.util.Arrays; import java.util.List; import org.apache.maven.it.util.ResourceExtractor; @@ -63,8 +62,7 @@ public class MavenITmng5581LifecycleMappingDelegate verifier.verifyErrorFreeLog(); // run custom "test-only" build phase - // See MNG-5359 for why the default lifecycle needs to be run as well. - verifier.executeGoals( Arrays.asList( "validate", "test-only" ) ); + verifier.executeGoal( "test-only" ); verifier.resetStreams(); verifier.verifyErrorFreeLog(); verifier.verifyTextInLog( "maven-surefire-plugin" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/da436b95/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 5dd8e43..373da00 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,6 +28,7 @@ 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/da436b95/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 9c5c5e4..2f03dc2 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,10 +12,12 @@ 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; @@ -34,6 +36,15 @@ 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 {
