You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/05/16 19:46:09 UTC
svn commit: r1795362 - in /maven/plugins/trunk/maven-invoker-plugin/src:
it/local-repo-default/ it/script-context/ it/script-errors/
it/script-interpreter-detection/ it/selector-conditions/
it/selector-scripts/ main/java/org/apache/maven/plugins/invoker/
Author: rfscholte
Date: Tue May 16 19:46:09 2017
New Revision: 1795362
URL: http://svn.apache.org/viewvc?rev=1795362&view=rev
Log:
[MINVOKER-219] Change default value for cloneProjectsTo and cloneClean
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-default/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/it/script-context/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/it/script-errors/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/it/script-interpreter-detection/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/it/selector-conditions/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-default/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-default/verify.bsh?rev=1795362&r1=1795361&r2=1795362&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-default/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-default/verify.bsh Tue May 16 19:46:09 2017
@@ -37,7 +37,7 @@ try
File localRepoPathOfThisBuild = new File( basedir.getParentFile().getParentFile(), "local-repo" );
System.out.println("Local repository of this build: " + localRepoPathOfThisBuild);
- File textFile = new File( basedir, "src/it/project/target/local-repo-path.txt" );
+ File textFile = new File( basedir, "target/its/project/target/local-repo-path.txt" );
BufferedReader reader = new BufferedReader( new InputStreamReader( new FileInputStream( textFile ), "UTF-8" ) );
File localRepoPathOfSubBuild = new File( reader.readLine() );
reader.close();
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/script-context/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-context/verify.bsh?rev=1795362&r1=1795361&r2=1795362&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/script-context/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/script-context/verify.bsh Tue May 16 19:46:09 2017
@@ -23,14 +23,14 @@ import java.util.regex.*;
File touchFile;
-touchFile = new File( basedir, "src/it/beanshell/touch.txt" );
+touchFile = new File( basedir, "target/its/beanshell/touch.txt" );
System.out.println( "Checking for existence of touch file: " + touchFile );
if ( !touchFile.exists() )
{
throw new FileNotFoundException( "Did not find marker file: " + touchFile );
}
-touchFile = new File( basedir, "src/it/groovy/touch.txt" );
+touchFile = new File( basedir, "target/its/groovy/touch.txt" );
System.out.println( "Checking for existence of touch file: " + touchFile );
if ( !touchFile.exists() )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/script-errors/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-errors/verify.bsh?rev=1795362&r1=1795361&r2=1795362&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/script-errors/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/script-errors/verify.bsh Tue May 16 19:46:09 2017
@@ -24,14 +24,14 @@ import java.util.regex.*;
// make sure the Invoker Plugin was indeed run and the build didn't fail somewhere else
File touchFile;
-touchFile = new File( basedir, "src/it/beanshell/touch.txt" );
+touchFile = new File( basedir, "target/its/beanshell/touch.txt" );
System.out.println( "Checking for existence of touch file: " + touchFile );
if ( !touchFile.exists() )
{
throw new FileNotFoundException( "Did not find marker file: " + touchFile );
}
-touchFile = new File( basedir, "src/it/groovy/touch.txt" );
+touchFile = new File( basedir, "target/its/groovy/touch.txt" );
System.out.println( "Checking for existence of touch file: " + touchFile );
if ( !touchFile.exists() )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/script-interpreter-detection/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-interpreter-detection/verify.bsh?rev=1795362&r1=1795361&r2=1795362&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/script-interpreter-detection/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/script-interpreter-detection/verify.bsh Tue May 16 19:46:09 2017
@@ -24,10 +24,10 @@ import java.util.regex.*;
try
{
String[] files = {
- "src/it/beanshell/target/prebuild.bsh",
- "src/it/beanshell/target/postbuild.bsh",
- "src/it/groovy/target/prebuild.groovy",
- "src/it/groovy/target/postbuild.groovy",
+ "target/its/beanshell/target/prebuild.bsh",
+ "target/its/beanshell/target/postbuild.bsh",
+ "target/its/groovy/target/prebuild.groovy",
+ "target/its/groovy/target/postbuild.groovy",
};
for ( String file : files )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-conditions/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/selector-conditions/verify.bsh?rev=1795362&r1=1795361&r2=1795362&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/selector-conditions/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/selector-conditions/verify.bsh Tue May 16 19:46:09 2017
@@ -24,8 +24,8 @@ import java.util.regex.*;
try
{
String[] expected = {
- "src/it/jre-version-match/target/touch.txt",
- "src/it/os-family-match/target/touch.txt",
+ "target/its/jre-version-match/target/touch.txt",
+ "target/its/os-family-match/target/touch.txt",
};
for ( String file : expected )
{
@@ -39,8 +39,8 @@ try
}
String[] unexpected = {
- "src/it/jre-version-mismatch/target/touch.txt",
- "src/it/os-family-mismatch/target/touch.txt",
+ "target/its/jre-version-mismatch/target/touch.txt",
+ "target/its/os-family-mismatch/target/touch.txt",
};
for ( String file : unexpected )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/verify.bsh?rev=1795362&r1=1795361&r2=1795362&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/verify.bsh (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/verify.bsh Tue May 16 19:46:09 2017
@@ -26,8 +26,8 @@ import org.codehaus.plexus.util.*;
try
{
String[] expected = {
- "src/it/script-ret-true/target/touch.txt",
- "src/it/script-ret-quiet/target/touch.txt",
+ "target/its/script-ret-true/target/touch.txt",
+ "target/its/script-ret-quiet/target/touch.txt",
};
for ( String file : expected )
{
@@ -41,9 +41,9 @@ try
}
String[] unexpected = {
- "src/it/script-ret-false/target/touch.txt",
- "src/it/script-ret-other/target/touch.txt",
- "src/it/script-throws/target/touch.txt",
+ "target/its/script-ret-false/target/touch.txt",
+ "target/its/script-ret-other/target/touch.txt",
+ "target/its/script-throws/target/touch.txt",
};
for ( String file : unexpected )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java?rev=1795362&r1=1795361&r2=1795362&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java Tue May 16 19:46:09 2017
@@ -169,13 +169,13 @@ public abstract class AbstractInvokerMoj
private boolean disableReports;
/**
- * Directory to which projects should be cloned prior to execution. If not specified, each integration test will be
- * run in the directory in which the corresponding IT POM was found. In this case, you most likely want to configure
- * your SCM to ignore <code>target</code> and <code>build.log</code> in the test's base directory.
+ * Directory to which projects should be cloned prior to execution. If set to {@code null}, each integration test
+ * will be run in the directory in which the corresponding IT POM was found. In this case, you most likely want to
+ * configure your SCM to ignore <code>target</code> and <code>build.log</code> in the test's base directory.
*
* @since 1.1
*/
- @Parameter
+ @Parameter( defaultValue = "${project.build.directory}/its" )
private File cloneProjectsTo;
// CHECKSTYLE_OFF: LineLength
@@ -198,7 +198,7 @@ public abstract class AbstractInvokerMoj
*
* @since 1.6
*/
- @Parameter( defaultValue = "false" )
+ @Parameter( defaultValue = "true" )
private boolean cloneClean;
/**