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

o removed deprecation as they are in the 2.1.x line so users will know before 3.0 comes out. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@757606 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-03-23 23:57:01 +00:00
parent 43e21dd1a5
commit 9d05d7a835
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View File

@ -19,6 +19,9 @@ package org.apache.maven.plugin;
* under the License. * under the License.
*/ */
import java.io.File;
import java.util.Properties;
import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor;
@ -29,11 +32,6 @@ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator
import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.introspection.ReflectionValueExtractor; import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
/** /**
* @author Jason van Zyl * @author Jason van Zyl
* @version $Id$ * @version $Id$
@ -42,24 +40,6 @@ import java.util.Properties;
public class PluginParameterExpressionEvaluator public class PluginParameterExpressionEvaluator
implements ExpressionEvaluator implements ExpressionEvaluator
{ {
private static final Map BANNED_EXPRESSIONS;
private static final Map DEPRECATED_EXPRESSIONS;
static
{
Map deprecated = new HashMap();
deprecated.put( "project.build.resources", "project.resources" );
deprecated.put( "project.build.testResources", "project.testResources" );
DEPRECATED_EXPRESSIONS = deprecated;
Map banned = new HashMap();
BANNED_EXPRESSIONS = banned;
}
private final PathTranslator pathTranslator; private final PathTranslator pathTranslator;
private final MavenSession context; private final MavenSession context;
@ -210,18 +190,6 @@ public class PluginParameterExpressionEvaluator
} }
MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor(); MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
if ( BANNED_EXPRESSIONS.containsKey( expression ) )
{
throw new ExpressionEvaluationException( "The parameter expression: \'" + expression +
"\' used in mojo: \'" + mojoDescriptor.getGoal() + "\' is banned. Use \'" +
BANNED_EXPRESSIONS.get( expression ) + "\' instead." );
}
else if ( DEPRECATED_EXPRESSIONS.containsKey( expression ) )
{
logger.warn( "The parameter expression: \'" + expression + "\' used in mojo: \'" +
mojoDescriptor.getGoal() + "\' has been deprecated. Use \'" + DEPRECATED_EXPRESSIONS.get( expression ) +
"\' instead." );
}
if ( "localRepository".equals( expression ) ) if ( "localRepository".equals( expression ) )
{ {