Author: khmarbaise
Date: Mon Feb 22 09:00:52 2016
New Revision: 1731603
URL: http://svn.apache.org/viewvc?rev=1731603&view=rev
Log:
[MINVOKER-199] Remove @Deprecated marked code and parameters
o Removed goalsFile parameter including the references.
Removed:
maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/goals.txt
maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/validate-goal.txt
maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/interpolation/goals.txt
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
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.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=1731603&r1=1731602&r2=1731603&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 09:00:52 2016
@@ -246,15 +246,6 @@ public abstract class AbstractInvokerMoj
private List<String> goals = Collections.singletonList( "package" );
/**
- * The name of the project-specific file that contains the enumeration of
goals to execute for that test.
- *
- * @deprecated As of version 1.2, the key <code>invoker.goals</code> from
the properties file specified by the
- * parameter {@link #invokerPropertiesFile} should be used
instead.
- */
- @Parameter( property = "invoker.goalsFile", defaultValue = "goals.txt" )
- private String goalsFile;
-
- /**
*/
@Component
private Invoker invoker;
@@ -1915,7 +1906,9 @@ public abstract class AbstractInvokerMoj
{
try
{
- return getTokens( basedir, goalsFile, goals );
+ //FIXME: Currently we have null for goalsFile which has been
removed.
+ // This might mean we can remove getGoals() at all ? Check this.
+ return getTokens( basedir, null, goals );
}
catch ( IOException e )
{
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=1731603&r1=1731602&r2=1731603&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 09:00:52 2016
@@ -71,26 +71,6 @@ public class InterpolationTest
assertEquals( "barOnProject", compositeMap.get( "fooOnProject" ) );
}
- public void testInterpolationGoalsFile()
- throws Exception
- {
- InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "goalsFile", "goals.txt" );
- setVariableValueToObject( invokerMojo, "project",
buildMavenProjectStub() );
- setVariableValueToObject( invokerMojo, "settings", new Settings() );
- Properties properties = new Properties();
- properties.put( "cleanProps", "clean" );
- properties.put( "version", "2.0-SNAPSHOT" );
- setVariableValueToObject( invokerMojo, "interpolationsProperties",
properties );
- String dirPath =
- getBasedir() + File.separatorChar + "src" + File.separatorChar +
"test" + File.separatorChar + "resources"
- + File.separatorChar + "unit" + File.separatorChar +
"interpolation";
- List<String> goals = invokerMojo.getGoals( new File( dirPath ) );
- assertEquals( goals.toString(), 2, goals.size() );
- assertEquals( "clean", goals.get( 0 ) );
- assertEquals( "bar:foo:1.0-SNAPSHOT:mygoal", goals.get( 1 ) );
- }
-
public void testPomInterpolation()
throws Exception
{
@@ -99,7 +79,6 @@ public class InterpolationTest
try
{
InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "goalsFile", "goals.txt" );
setVariableValueToObject( invokerMojo, "project",
buildMavenProjectStub() );
setVariableValueToObject( invokerMojo, "settings", new Settings()
);
Properties properties = new Properties();
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java?rev=1731603&r1=1731602&r2=1731603&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java
Mon Feb 22 09:00:52 2016
@@ -20,14 +20,11 @@ package org.apache.maven.plugin.invoker;
*/
import java.io.File;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugin.invoker.model.BuildJob;
-import org.apache.maven.settings.Settings;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
/**
* @author Olivier Lamy
@@ -38,36 +35,16 @@ public class InvokerMojoTest
extends AbstractMojoTestCase
{
- /**
- * test reading goals from a file
- */
- public void testReadGoalsFromFile()
- throws Exception
- {
- MavenProjectStub project = new MavenProjectStub();
- project.setTestClasspathElements( Collections.EMPTY_LIST );
-
- InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "goalsFile", "goals.txt" );
- setVariableValueToObject( invokerMojo, "project", project );
- setVariableValueToObject( invokerMojo, "settings", new Settings() );
- String dirPath = getBasedir() +
"/src/test/resources/unit/goals-from-file/";
- List<String> goals = invokerMojo.getGoals( new File( dirPath ) );
- assertEquals( 3, goals.size() );
- }
-
public void testSingleInvokerTest()
throws Exception
{
InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "goalsFile",
"validate-goal.txt" );
String dirPath = getBasedir() + "/src/test/resources/unit";
List<String> goals = invokerMojo.getGoals( new File( dirPath ) );
assertEquals( 1, goals.size() );
setVariableValueToObject( invokerMojo, "projectsDirectory", new File(
dirPath ) );
setVariableValueToObject( invokerMojo, "invokerTest", "*dummy*" );
BuildJob[] poms = invokerMojo.getBuildJobs();
- System.out.println( Arrays.asList( poms ) );
assertEquals( 1, poms.length );
}
@@ -75,14 +52,12 @@ public class InvokerMojoTest
throws Exception
{
InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "goalsFile",
"validate-goal.txt" );
String dirPath = getBasedir() + "/src/test/resources/unit";
List<String> goals = invokerMojo.getGoals( new File( dirPath ) );
assertEquals( 1, goals.size() );
setVariableValueToObject( invokerMojo, "projectsDirectory", new File(
dirPath ) );
setVariableValueToObject( invokerMojo, "invokerTest",
"*dummy*,*terpolatio*" );
BuildJob[] poms = invokerMojo.getBuildJobs();
- System.out.println( Arrays.asList( poms ) );
assertEquals( 2, poms.length );
}
@@ -90,14 +65,12 @@ public class InvokerMojoTest
throws Exception
{
InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "goalsFile",
"validate-goal.txt" );
String dirPath = getBasedir() + "/src/test/resources/unit";
List<String> goals = invokerMojo.getGoals( new File( dirPath ) );
assertEquals( 1, goals.size() );
setVariableValueToObject( invokerMojo, "projectsDirectory", new File(
dirPath ) );
setVariableValueToObject( invokerMojo, "invokerTest", "*" );
BuildJob[] poms = invokerMojo.getBuildJobs();
- System.out.println( Arrays.asList( poms ) );
assertEquals( 4, poms.length );
}
