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/04/30 23:56:27 UTC
svn commit: r1741820 -
/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Author: khmarbaise
Date: Sat Apr 30 21:56:27 2016
New Revision: 1741820
URL: http://svn.apache.org/viewvc?rev=1741820&view=rev
Log:
Refactored code
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.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=1741820&r1=1741819&r2=1741820&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 Sat Apr 30 21:56:27 2016
@@ -653,30 +653,7 @@ public abstract class AbstractInvokerMoj
return;
}
- final List<String> scriptClassPath;
- if ( addTestClassPath )
- {
- scriptClassPath = new ArrayList<String>( testClassPath );
- for ( Artifact pluginArtifact : pluginArtifacts )
- {
- scriptClassPath.remove( pluginArtifact.getFile().getAbsolutePath() );
- }
- }
- else
- {
- scriptClassPath = null;
- }
- scriptRunner = new ScriptRunner( getLog() );
- scriptRunner.setScriptEncoding( encoding );
- scriptRunner.setGlobalVariable( "localRepositoryPath", localRepositoryPath );
- if ( scriptVariables != null )
- {
- for ( Entry<String, String> entry : scriptVariables.entrySet() )
- {
- scriptRunner.setGlobalVariable( entry.getKey(), entry.getValue() );
- }
- }
- scriptRunner.setClassPath( scriptClassPath );
+ handleScriptRunnerWithScriptClassPath();
Collection<String> collectedProjects = new LinkedHashSet<String>();
for ( BuildJob buildJob : buildJobs )
@@ -704,6 +681,34 @@ public abstract class AbstractInvokerMoj
}
+ private void handleScriptRunnerWithScriptClassPath()
+ {
+ final List<String> scriptClassPath;
+ if ( addTestClassPath )
+ {
+ scriptClassPath = new ArrayList<String>( testClassPath );
+ for ( Artifact pluginArtifact : pluginArtifacts )
+ {
+ scriptClassPath.remove( pluginArtifact.getFile().getAbsolutePath() );
+ }
+ }
+ else
+ {
+ scriptClassPath = null;
+ }
+ scriptRunner = new ScriptRunner( getLog() );
+ scriptRunner.setScriptEncoding( encoding );
+ scriptRunner.setGlobalVariable( "localRepositoryPath", localRepositoryPath );
+ if ( scriptVariables != null )
+ {
+ for ( Entry<String, String> entry : scriptVariables.entrySet() )
+ {
+ scriptRunner.setGlobalVariable( entry.getKey(), entry.getValue() );
+ }
+ }
+ scriptRunner.setClassPath( scriptClassPath );
+ }
+
private void writeSummaryFile( BuildJob[] buildJobs )
throws MojoExecutionException
{