Repository: maven Updated Branches: refs/heads/master 15223116a -> 3677220f6
MNG-5805: Restore binary compatibility Signed-off-by: Jason van Zyl <ja...@tesla.io> Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3677220f Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3677220f Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3677220f Branch: refs/heads/master Commit: 3677220f6e499e97f2b47b0593bc394b689d14d6 Parents: 1522311 Author: Anton Tanasenko <atg.sleepl...@gmail.com> Authored: Mon Jul 20 00:01:50 2015 +0300 Committer: Jason van Zyl <ja...@tesla.io> Committed: Mon Jul 20 13:54:53 2015 -0400 ---------------------------------------------------------------------- .../org/apache/maven/lifecycle/Lifecycle.java | 8 +++- .../DefaultLifecyclePluginAnalyzer.java | 6 +-- .../mapping/DefaultLifecycleMapping.java | 14 ++++-- .../maven/lifecycle/mapping/Lifecycle.java | 48 ++++++++++++++++---- .../lifecycle/mapping/LifecycleMapping.java | 2 +- .../maven/lifecycle/mapping/LifecyclePhase.java | 45 ++++++++++++++++++ 6 files changed, 105 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/3677220f/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java b/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java index 54aefc4..5fc99d5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java @@ -68,10 +68,16 @@ public class Lifecycle return this.phases; } - public Map<String, LifecyclePhase> getDefaultPhases() + public Map<String, LifecyclePhase> getDefaultLifecyclePhases() { return defaultPhases; } + + @Deprecated + public Map<String, String> getDefaultPhases() + { + return LifecyclePhase.toLegacyMap( getDefaultLifecyclePhases() ); + } @Override public String toString() http://git-wip-us.apache.org/repos/asf/maven/blob/3677220f/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index e71d200..a72ce8e 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -104,11 +104,11 @@ public class DefaultLifecyclePluginAnalyzer if ( lifecycleConfiguration != null ) { - phaseToGoalMapping = lifecycleConfiguration.getPhases(); + phaseToGoalMapping = lifecycleConfiguration.getLifecyclePhases(); } - else if ( lifecycle.getDefaultPhases() != null ) + else if ( lifecycle.getDefaultLifecyclePhases() != null ) { - phaseToGoalMapping = lifecycle.getDefaultPhases(); + phaseToGoalMapping = lifecycle.getDefaultLifecyclePhases(); } if ( phaseToGoalMapping != null ) http://git-wip-us.apache.org/repos/asf/maven/blob/3677220f/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java index 3deca00..e6845a3 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java @@ -61,13 +61,13 @@ public class DefaultLifecycleMapping for ( String lifecycleId : lifecycleIds ) { - Map<String, LifecyclePhase> phases = getPhases( lifecycleId ); + Map<String, LifecyclePhase> phases = getLifecyclePhases( lifecycleId ); if ( phases != null ) { Lifecycle lifecycle = new Lifecycle(); lifecycle.setId( lifecycleId ); - lifecycle.setPhases( phases ); + lifecycle.setLifecyclePhases( phases ); lifecycleMap.put( lifecycleId, lifecycle ); } @@ -88,7 +88,7 @@ public class DefaultLifecycleMapping return null; } - public Map<String, LifecyclePhase> getPhases( String lifecycle ) + private Map<String, LifecyclePhase> getLifecyclePhases( String lifecycle ) { initLifecycleMap(); @@ -96,7 +96,7 @@ public class DefaultLifecycleMapping if ( lifecycleMapping != null ) { - return lifecycleMapping.getPhases(); + return lifecycleMapping.getLifecyclePhases(); } else if ( "default".equals( lifecycle ) ) { @@ -107,5 +107,11 @@ public class DefaultLifecycleMapping return null; } } + + @Deprecated + public Map<String, String> getPhases( String lifecycle ) + { + return LifecyclePhase.toLegacyMap( getLifecyclePhases( lifecycle ) ); + } } http://git-wip-us.apache.org/repos/asf/maven/blob/3677220f/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java index c80ed2f..d2b6d6c 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java @@ -19,9 +19,12 @@ package org.apache.maven.lifecycle.mapping; * under the License. */ +import java.util.Collections; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + /** * Class Lifecycle. */ @@ -35,7 +38,7 @@ public class Lifecycle /** * Field phases */ - private Map<String, LifecyclePhase> phases; + private Map<String, LifecyclePhase> lifecyclePhases; /* * NOTE: This exists merely for backward-compat with legacy-style lifecycle definitions and allows configuration @@ -53,13 +56,13 @@ public class Lifecycle } /** - * Method getPhases + * Method getLifecyclePhases */ - public Map<String, LifecyclePhase> getPhases() + public Map<String, LifecyclePhase> getLifecyclePhases() { - return this.phases; + return this.lifecyclePhases; } - + /** * Method setId * @@ -71,13 +74,40 @@ public class Lifecycle } /** - * Method setPhases + * Method setLifecyclePhases * * @param phases */ - public void setPhases( Map<String, LifecyclePhase> phases ) + public void setLifecyclePhases( Map<String, LifecyclePhase> lifecyclePhases ) + { + this.lifecyclePhases = lifecyclePhases; + } + + @Deprecated + public Map<String, String> getPhases() { - this.phases = phases; - } //-- void setPhases(java.util.List) + Map<String, LifecyclePhase> lphases = getLifecyclePhases(); + if ( lphases == null ) + { + return null; + } + + if ( lphases.isEmpty() ) + { + return Collections.emptyMap(); + } + + Map<String, String> phases = new LinkedHashMap<>(); + for ( Map.Entry<String, LifecyclePhase> e: lphases.entrySet() ) + { + phases.put( e.getKey(), e.getValue().toString() ); + } + return phases; + } + @Deprecated + public void setPhases( Map<String, LifecyclePhase> phases ) + { + setLifecyclePhases( phases ); + } } http://git-wip-us.apache.org/repos/asf/maven/blob/3677220f/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java index 3248f70..e656cc9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java @@ -34,6 +34,6 @@ public interface LifecycleMapping List<String> getOptionalMojos( String lifecycle ); @Deprecated - Map<String, LifecyclePhase> getPhases( String lifecycle ); + Map<String, String> getPhases( String lifecycle ); } http://git-wip-us.apache.org/repos/asf/maven/blob/3677220f/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java index e0cc8dd..d9afcf5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java @@ -20,7 +20,10 @@ package org.apache.maven.lifecycle.mapping; */ import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import org.codehaus.plexus.util.StringUtils; @@ -61,4 +64,46 @@ public class LifecyclePhase mojos.add( lifecycleMojo ); } } + + @Override + public String toString() + { + StringBuilder sb = new StringBuilder(); + boolean first = true; + for ( LifecycleMojo mojo: getMojos() ) + { + if ( first ) + { + first = false; + } + else + { + sb.append( "," ); + } + sb.append( mojo.getGoal() ); + } + return sb.toString(); + } + + @Deprecated + public static Map<String, String> toLegacyMap( Map<String, LifecyclePhase> lifecyclePhases ) + { + if ( lifecyclePhases == null ) + { + return null; + } + + if ( lifecyclePhases.isEmpty() ) + { + return Collections.emptyMap(); + } + + Map<String, String> phases = new LinkedHashMap<>(); + for ( Map.Entry<String, LifecyclePhase> e: lifecyclePhases.entrySet() ) + { + phases.put( e.getKey(), e.getValue().toString() ); + } + return phases; + } + }
