Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MNG-5805: Restore binary compatibility 

Signed-off-by: Jason van Zyl <jason@tesla.io>
This commit is contained in:
Anton Tanasenko 2015-07-20 00:01:50 +03:00 committed by Jason van Zyl
parent 15223116a6
commit 3677220f6e
6 changed files with 105 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
View File

@ -68,10 +68,16 @@ public List<String> getPhases()
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()

6
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
View File

@ -104,11 +104,11 @@ public Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging )
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 )

14
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
View File

@ -61,13 +61,13 @@ private void initLifecycleMap()
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 List<String> getOptionalMojos( String lifecycle )
return null;
}
public Map<String, LifecyclePhase> getPhases( String lifecycle )
private Map<String, LifecyclePhase> getLifecyclePhases( String lifecycle )
{
initLifecycleMap();
@ -96,7 +96,7 @@ public Map<String, LifecyclePhase> getPhases( String lifecycle )
if ( lifecycleMapping != null )
{
return lifecycleMapping.getPhases();
return lifecycleMapping.getLifecyclePhases();
}
else if ( "default".equals( lifecycle ) )
{
@ -107,5 +107,11 @@ else if ( "default".equals( lifecycle ) )
return null;
}
}
@Deprecated
public Map<String, String> getPhases( String lifecycle )
{
return LifecyclePhase.toLegacyMap( getLifecyclePhases( lifecycle ) );
}
}

48
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
View File

@ -19,9 +19,12 @@
* 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 String getId()
}
/**
* 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 void setId( String id )
}
/**
* Method setPhases
* Method setLifecyclePhases
*
* @param phases
*/
public void setLifecyclePhases( Map<String, LifecyclePhase> lifecyclePhases )
{
this.lifecyclePhases = lifecyclePhases;
}
@Deprecated
public Map<String, String> getPhases()
{
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 )
{
this.phases = phases;
} //-- void setPhases(java.util.List)
setLifecyclePhases( phases );
}
}

2
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
View File

@ -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 );
}

45
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
View File

@ -20,7 +20,10 @@
*/
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 void set( String goals )
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;
}
}