You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/02/22 19:37:33 UTC
svn commit: r1731711 - in /maven/plugins/trunk/maven-invoker-plugin/src:
main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
Author: khmarbaise
Date: Mon Feb 22 18:37:33 2016
New Revision: 1731711
URL: http://svn.apache.org/viewvc?rev=1731711&view=rev
Log:
[MINVOKER-199] Remove @Deprecated marked code and parameters
o Removed interpolationsProperties parameter including the references.
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1731711&r1=1731710&r2=1731711&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Mon Feb 22 18:37:33 2016
@@ -330,15 +330,6 @@ public abstract class AbstractInvokerMoj
private List<String> profiles;
/**
- * List of properties which will be used to interpolate goal files.
- *
- * @since 1.1
- * @deprecated As of version 1.3, the parameter {@link #filterProperties} should be used instead.
- */
- @Parameter
- private Properties interpolationsProperties;
-
- /**
* A list of additional properties which will be used to filter tokens in POMs and goal files.
*
* @since 1.3
@@ -2136,10 +2127,7 @@ public abstract class AbstractInvokerMoj
private Map<String, Object> getInterpolationValueSource()
{
Map<String, Object> props = new HashMap<String, Object>();
- if ( interpolationsProperties != null )
- {
- props.putAll( (Map) interpolationsProperties );
- }
+
if ( filterProperties != null )
{
props.putAll( filterProperties );
Modified: maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java?rev=1731711&r1=1731710&r2=1731711&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java Mon Feb 22 18:37:33 2016
@@ -84,7 +84,7 @@ public class InterpolationTest
Properties properties = new Properties();
properties.put( "foo", "bar" );
properties.put( "version", "2.0-SNAPSHOT" );
- setVariableValueToObject( invokerMojo, "interpolationsProperties", properties );
+ setVariableValueToObject( invokerMojo, "filterProperties", properties );
String dirPath =
getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
+ "resources" + File.separatorChar + "unit" + File.separatorChar + "interpolation";