You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2014/07/06 04:04:36 UTC
git commit: MNG-5349: Make sure lifecycles have and id. When we
switch to JSR330 I would prefer to use private final fields in Lifecycle.java
and use the Precondition.assertNotNull check. This will serve for now.
Repository: maven
Updated Branches:
refs/heads/master 6cf932094 -> 1a4c003a2
MNG-5349: Make sure lifecycles have and id. When we switch to JSR330 I would prefer to use private final fields in Lifecycle.java and use the Precondition.assertNotNull check. This will serve for now.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1a4c003a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1a4c003a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1a4c003a
Branch: refs/heads/master
Commit: 1a4c003a2bbe04cb18a61adc1bae09133066a116
Parents: 6cf9320
Author: Jason van Zyl <ja...@tesla.io>
Authored: Sun Jun 15 17:05:45 2014 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Sat Jul 5 22:04:11 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/maven/lifecycle/DefaultLifecycles.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/1a4c003a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
index d5fae6c..64c9a7f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
@@ -24,6 +24,8 @@ import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
+import com.google.common.base.Preconditions;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -119,7 +121,9 @@ public class DefaultLifecycles
ArrayList<Lifecycle> result = new ArrayList<Lifecycle>();
for ( String name : lifecycleNames )
{
- result.add( lifecycles.get( name ) );
+ Lifecycle lifecycle = lifecycles.get( name );
+ Preconditions.checkNotNull( "A lifecycle must have an id.", lifecycle.getId() );
+ result.add( lifecycle );
}
return result;
@@ -129,7 +133,7 @@ public class DefaultLifecycles
{
Set<String> phases = new LinkedHashSet<String>();
- for ( Lifecycle lifecycle : lifecycles.values() )
+ for ( Lifecycle lifecycle : getLifeCycles() )
{
phases.addAll( lifecycle.getPhases() );
}