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 2014/06/27 22:27:04 UTC
svn commit: r1606207 - in /maven/plugins/trunk/maven-invoker-plugin/src:
main/java/org/apache/maven/plugin/invoker/
test/java/org/apache/maven/plugin/invoker/
Author: khmarbaise
Date: Fri Jun 27 20:27:03 2014
New Revision: 1606207
URL: http://svn.apache.org/r1606207
Log:
- Fixed ASF formatting.
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/IntegrationTestMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/ReportUtils.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SystemPropertyPrinter.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/ExtendedMavenProjectStub.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
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.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=1606207&r1=1606206&r2=1606207&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 Fri Jun 27 20:27:03 2014
@@ -149,10 +149,9 @@ public abstract class AbstractInvokerMoj
private File projectsDirectory;
/**
- * Base directory where all build reports are written to.
- * Every execution of an integration test will produce an XML file which contains the information
- * about success or failure of that particular build job. The format of the resulting XML
- * file is documented in the given <a href="./build-job.html">build-job</a> reference.
+ * Base directory where all build reports are written to. Every execution of an integration test will produce an XML
+ * file which contains the information about success or failure of that particular build job. The format of the
+ * resulting XML file is documented in the given <a href="./build-job.html">build-job</a> reference.
*
* @since 1.4
*/
@@ -261,12 +260,12 @@ public abstract class AbstractInvokerMoj
/**
* Relative path of a selector script to run prior in order to decide if the build should be executed. This script
* may be written with either BeanShell or Groovy. If the file extension is omitted (e.g. <code>selector</code>),
- * the plugin searches for the file by trying out the well-known extensions <code>.bsh</code> and <code>.groovy</code>.
- * If this script exists for a particular project but returns any non-null value different from <code>true</code>,
- * the corresponding build is flagged as skipped. In this case, none of the pre-build hook script,
- * Maven nor the post-build hook script will be invoked. If this script throws an exception, the corresponding
- * build is flagged as in error, and none of the pre-build hook script, Maven not the post-build hook script will
- * be invoked.
+ * the plugin searches for the file by trying out the well-known extensions <code>.bsh</code> and
+ * <code>.groovy</code>. If this script exists for a particular project but returns any non-null value different
+ * from <code>true</code>, the corresponding build is flagged as skipped. In this case, none of the pre-build hook
+ * script, Maven nor the post-build hook script will be invoked. If this script throws an exception, the
+ * corresponding build is flagged as in error, and none of the pre-build hook script, Maven not the post-build hook
+ * script will be invoked.
*
* @since 1.5
*/
@@ -366,19 +365,18 @@ public abstract class AbstractInvokerMoj
*/
@Component
private MavenProject project;
-
+
@Component
private MojoExecution mojoExecution;
/**
- * A comma separated list of projectname patterns to run. Specify this parameter to run individual tests by file name,
- * overriding the {@link #setupIncludes}, {@link #pomIncludes} and {@link #pomExcludes} parameters. Each pattern you
- * specify here will be used to create an include/exclude pattern formatted like
- * <code>${projectsDirectory}/<i>pattern</i></code>. To exclude a test, prefix the pattern with a '<code>!</code>'.
- * So you can just type
- * <nobr><code>-Dinvoker.test=SimpleTest,Comp*Test,!Compare*</code></nobr> to run builds in
- * <code>${projectsDirectory}/SimpleTest</code> and
- * <code>${projectsDirectory}/ComplexTest</code>, but not <code>${projectsDirectory}/CompareTest</code>
+ * A comma separated list of projectname patterns to run. Specify this parameter to run individual tests by file
+ * name, overriding the {@link #setupIncludes}, {@link #pomIncludes} and {@link #pomExcludes} parameters. Each
+ * pattern you specify here will be used to create an include/exclude pattern formatted like
+ * <code>${projectsDirectory}/<i>pattern</i></code>. To exclude a test, prefix the pattern with a '<code>!</code>'.
+ * So you can just type <nobr><code>-Dinvoker.test=SimpleTest,Comp*Test,!Compare*</code></nobr> to run builds in
+ * <code>${projectsDirectory}/SimpleTest</code> and <code>${projectsDirectory}/ComplexTest</code>, but not
+ * <code>${projectsDirectory}/CompareTest</code>
*
* @since 1.1 (exclusion since 1.8)
*/
@@ -432,7 +430,7 @@ public abstract class AbstractInvokerMoj
*/
@Parameter( property = "invoker.mavenExecutable" )
private String mavenExecutable;
-
+
/**
* The <code>JAVA_HOME</code> environment variable to use for forked Maven invocations. Defaults to the current Java
* home directory.
@@ -460,10 +458,10 @@ public abstract class AbstractInvokerMoj
/**
* A flag whether the test class path of the project under test should be included in the class path of the
- * pre-/post-build scripts. If set to <code>false</code>, the class path of script interpreter consists only of
- * the <a href="dependencies.html">runtime dependencies</a> of the Maven Invoker Plugin. If set the
- * <code>true</code>, the project's test class path will be prepended to the interpreter class path. Among
- * others, this feature allows the scripts to access utility classes from the test sources of your project.
+ * pre-/post-build scripts. If set to <code>false</code>, the class path of script interpreter consists only of the
+ * <a href="dependencies.html">runtime dependencies</a> of the Maven Invoker Plugin. If set the <code>true</code>,
+ * the project's test class path will be prepended to the interpreter class path. Among others, this feature allows
+ * the scripts to access utility classes from the test sources of your project.
*
* @since 1.2
*/
@@ -483,59 +481,60 @@ public abstract class AbstractInvokerMoj
* <code>${project.version}</code> to reference project properties or values from the parameter
* {@link #filterProperties}. The snippet below describes the supported properties:
* <p/>
+ *
* <pre>
* # A comma or space separated list of goals/phases to execute, may
* # specify an empty list to execute the default goal of the IT project
* invoker.goals = clean install
- *
+ *
* # Optionally, a list of goals to run during further invocations of Maven
* invoker.goals.2 = ${project.groupId}:${project.artifactId}:${project.version}:run
- *
+ *
* # A comma or space separated list of profiles to activate
* invoker.profiles = its,jdk15
- *
+ *
* # The path to an alternative POM or base directory to invoke Maven on, defaults to the
* # project that was originally specified in the plugin configuration
* # Since plugin version 1.4
* invoker.project = sub-module
- *
+ *
* # The value for the environment variable MAVEN_OPTS
* invoker.mavenOpts = -Dfile.encoding=UTF-16 -Xms32m -Xmx256m
- *
+ *
* # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never"
* invoker.failureBehavior = fail-never
- *
+ *
* # The expected result of the build, possible values are "success" (default) and "failure"
* invoker.buildResult = failure
- *
+ *
* # A boolean value controlling the aggregator mode of Maven, defaults to "false"
* invoker.nonRecursive = true
- *
+ *
* # A boolean value controlling the network behavior of Maven, defaults to "false"
* # Since plugin version 1.4
* invoker.offline = true
- *
+ *
* # The path to the properties file from which to load system properties, defaults to the
* # filename given by the plugin parameter testPropertiesFile
* # Since plugin version 1.4
* invoker.systemPropertiesFile = test.properties
- *
+ *
* # An optional human friendly name for this build job to be included in the build reports.
* # Since plugin version 1.4
* invoker.name = Test Build 01
- *
+ *
* # An optional description for this build job to be included in the build reports.
* # Since plugin version 1.4
* invoker.description = Checks the support for build reports.
- *
+ *
* # A comma separated list of JRE versions on which this build job should be run.
* # Since plugin version 1.4
* invoker.java.version = 1.4+, !1.4.1, 1.7-
- *
+ *
* # A comma separated list of OS families on which this build job should be run.
* # Since plugin version 1.4
* invoker.os.family = !windows, unix, mac
- *
+ *
* # A comma separated list of Maven versions on which this build should be run.
* # Since plugin version 1.5
* invoker.maven.version = 2.0.10+, !2.1.0, !2.2.0
@@ -559,8 +558,7 @@ public abstract class AbstractInvokerMoj
private boolean showVersion;
/**
- * number of threads for running tests in parallel.
- * This will be the number of maven forked process in parallel.
+ * number of threads for running tests in parallel. This will be the number of maven forked process in parallel.
*
* @since 1.6
*/
@@ -574,7 +572,8 @@ public abstract class AbstractInvokerMoj
private List<Artifact> pluginArtifacts;
/**
- * If enable and if you have a settings file configured for the execution, it will be merged with your user settings.
+ * If enable and if you have a settings file configured for the execution, it will be merged with your user
+ * settings.
*
* @since 1.6
*/
@@ -583,17 +582,19 @@ public abstract class AbstractInvokerMoj
/**
* Additional environment variables to set on the command line.
+ *
* @since 1.8
*/
@Parameter
- private Map<String, String> environmentVariables;
+ private Map<String, String> environmentVariables;
/**
* Additional variables for use in the hook scripts.
+ *
* @since 1.9
*/
@Parameter
- private Map<String, String> scriptVariables;
+ private Map<String, String> scriptVariables;
/**
* The scripter runner that is responsible to execute hook scripts.
@@ -611,7 +612,7 @@ public abstract class AbstractInvokerMoj
* The format for elapsed build time.
*/
private final DecimalFormat secFormat = new DecimalFormat( "(0.0 s)", new DecimalFormatSymbols( Locale.ENGLISH ) );
-
+
/**
* The version of Maven which is used to run the builds
*/
@@ -621,20 +622,17 @@ public abstract class AbstractInvokerMoj
* The version of the JRE which is used to run the builds
*/
private String actualJreVersion;
-
-
+
private void setActualJreVersion( String actualJreVersion )
{
this.actualJreVersion = actualJreVersion;
}
-
+
/**
* Invokes Maven on the configured test projects.
*
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the goal encountered severe errors.
- * @throws org.apache.maven.plugin.MojoFailureException
- * If any of the Maven builds failed.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the goal encountered severe errors.
+ * @throws org.apache.maven.plugin.MojoFailureException If any of the Maven builds failed.
*/
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -662,10 +660,11 @@ public abstract class AbstractInvokerMoj
catch ( IOException e )
{
throw new MojoExecutionException(
- "Failed to discover projectsDirectory from pom File parameter. Reason: " + e.getMessage(), e );
+ "Failed to discover projectsDirectory from pom File parameter. Reason: "
+ + e.getMessage(), e );
}
- buildJobs = new BuildJob[]{ new BuildJob( pom.getName(), BuildJob.Type.NORMAL ) };
+ buildJobs = new BuildJob[] { new BuildJob( pom.getName(), BuildJob.Type.NORMAL ) };
}
else
{
@@ -676,8 +675,8 @@ public abstract class AbstractInvokerMoj
catch ( final IOException e )
{
throw new MojoExecutionException(
- "Error retrieving POM list from includes, excludes, and projects directory. Reason: "
- + e.getMessage(), e );
+ "Error retrieving POM list from includes, excludes, and projects directory. Reason: "
+ + e.getMessage(), e );
}
}
@@ -743,8 +742,8 @@ public abstract class AbstractInvokerMoj
processResults( new InvokerSession( buildJobs ) );
}
-
- protected void doFailIfNoProjects() throws MojoFailureException
+ protected void doFailIfNoProjects()
+ throws MojoFailureException
{
// should only be used during run and verify
}
@@ -783,16 +782,15 @@ public abstract class AbstractInvokerMoj
* Collects all projects locally reachable from the specified project. The method will as such try to read the POM
* and recursively follow its parent/module elements.
*
- * @param projectsDir The base directory of all projects, must not be <code>null</code>.
- * @param projectPath The relative path of the current project, can denote either the POM or its base directory,
- * must not be <code>null</code>.
+ * @param projectsDir The base directory of all projects, must not be <code>null</code>.
+ * @param projectPath The relative path of the current project, can denote either the POM or its base directory,
+ * must not be <code>null</code>.
* @param projectPaths The set of already collected projects to add new projects to, must not be <code>null</code>.
- * This set will hold the relative paths to either a POM file or a project base directory.
- * @param included A flag indicating whether the specified project has been explicitly included via the parameter
- * {@link #pomIncludes}. Such projects will always be added to the result set even if there is no
- * corresponding POM.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the project tree could not be traversed.
+ * This set will hold the relative paths to either a POM file or a project base directory.
+ * @param included A flag indicating whether the specified project has been explicitly included via the parameter
+ * {@link #pomIncludes}. Such projects will always be added to the result set even if there is no
+ * corresponding POM.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the project tree could not be traversed.
*/
private void collectProjects( File projectsDir, String projectPath, Collection<String> projectPaths,
boolean included )
@@ -874,9 +872,8 @@ public abstract class AbstractInvokerMoj
* by a path to a POM file or merely by a path to a base directory. During cloning, the POM files will be filtered.
*
* @param projectPaths The paths to the projects to clone, relative to the projects directory, must not be
- * <code>null</code> nor contain <code>null</code> elements.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the the projects could not be copied/filtered.
+ * <code>null</code> nor contain <code>null</code> elements.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the the projects could not be copied/filtered.
*/
private void cloneProjects( Collection<String> projectPaths )
throws MojoExecutionException
@@ -889,8 +886,8 @@ public abstract class AbstractInvokerMoj
}
catch ( IOException e )
{
- throw new MojoExecutionException(
- "Could not clean the cloneProjectsTo directory. Reason: " + e.getMessage(), e );
+ throw new MojoExecutionException( "Could not clean the cloneProjectsTo directory. Reason: "
+ + e.getMessage(), e );
}
}
@@ -961,9 +958,8 @@ public abstract class AbstractInvokerMoj
}
catch ( IOException e )
{
- throw new MojoExecutionException(
- "Failed to clone projects from: " + projectsDirectory + " to: " + cloneProjectsTo + ". Reason: "
- + e.getMessage(), e );
+ throw new MojoExecutionException( "Failed to clone projects from: " + projectsDirectory + " to: "
+ + cloneProjectsTo + ". Reason: " + e.getMessage(), e );
}
// filter cloned POMs
@@ -997,7 +993,7 @@ public abstract class AbstractInvokerMoj
* Copied a directory structure with deafault exclusions (.svn, CVS, etc)
*
* @param sourceDir The source directory to copy, must not be <code>null</code>.
- * @param destDir The target directory to copy to, must not be <code>null</code>.
+ * @param destDir The target directory to copy to, must not be <code>null</code>.
* @throws java.io.IOException If the directory structure could not be copied.
*/
private void copyDirectoryStructure( File sourceDir, File destDir )
@@ -1033,9 +1029,9 @@ public abstract class AbstractInvokerMoj
* Determines whether the specified sub path has already been cloned, i.e. whether one of its ancestor directories
* was already cloned.
*
- * @param subpath The sub path to check, must not be <code>null</code>.
+ * @param subpath The sub path to check, must not be <code>null</code>.
* @param clonedSubpaths The list of already cloned paths, must not be <code>null</code> nor contain
- * <code>null</code> elements.
+ * <code>null</code> elements.
* @return <code>true</code> if the specified path has already been cloned, <code>false</code> otherwise.
*/
static boolean alreadyCloned( String subpath, List<String> clonedSubpaths )
@@ -1055,9 +1051,8 @@ public abstract class AbstractInvokerMoj
* Runs the specified build jobs.
*
* @param projectsDir The base directory of all projects, must not be <code>null</code>.
- * @param buildJobs The build jobs to run must not be <code>null</code> nor contain <code>null</code> elements.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If any build could not be launched.
+ * @param buildJobs The build jobs to run must not be <code>null</code> nor contain <code>null</code> elements.
+ * @throws org.apache.maven.plugin.MojoExecutionException If any build could not be launched.
*/
private void runBuilds( final File projectsDir, BuildJob[] buildJobs )
throws MojoExecutionException
@@ -1067,9 +1062,9 @@ public abstract class AbstractInvokerMoj
localRepositoryPath.mkdirs();
}
- //-----------------------------------------------
+ // -----------------------------------------------
// interpolate settings file
- //-----------------------------------------------
+ // -----------------------------------------------
File interpolatedSettingsFile = null;
if ( settingsFile != null )
@@ -1086,9 +1081,9 @@ public abstract class AbstractInvokerMoj
buildInterpolatedFile( settingsFile, interpolatedSettingsFile );
}
- //-----------------------------------------------
+ // -----------------------------------------------
// merge settings file
- //-----------------------------------------------
+ // -----------------------------------------------
SettingsXpp3Writer settingsWriter = new SettingsXpp3Writer();
@@ -1101,8 +1096,8 @@ public abstract class AbstractInvokerMoj
// Have to merge the specified settings file (dominant) and the one of the invoking Maven process
try
{
- Settings dominantSettings = settingsBuilder.buildSettings(interpolatedSettingsFile, false);
- Settings recessiveSettings = cloneSettings();
+ Settings dominantSettings = settingsBuilder.buildSettings( interpolatedSettingsFile, false );
+ Settings recessiveSettings = cloneSettings();
SettingsUtils.merge( dominantSettings, recessiveSettings, TrackableBase.USER_LEVEL );
mergedSettings = dominantSettings;
@@ -1141,8 +1136,8 @@ public abstract class AbstractInvokerMoj
if ( getLog().isDebugEnabled() )
{
- getLog().debug(
- "Created temporary file for invoker settings.xml: " + mergedSettingsFile.getAbsolutePath() );
+ getLog().debug( "Created temporary file for invoker settings.xml: "
+ + mergedSettingsFile.getAbsolutePath() );
}
}
catch ( IOException e )
@@ -1151,7 +1146,7 @@ public abstract class AbstractInvokerMoj
}
}
final File finalSettingsFile = mergedSettingsFile;
-
+
if ( mavenHome != null )
{
actualMavenVersion = SelectorUtils.getMavenVersion( mavenHome );
@@ -1161,7 +1156,7 @@ public abstract class AbstractInvokerMoj
actualMavenVersion = SelectorUtils.getMavenVersion();
}
scriptRunner.setGlobalVariable( "mavenVersion", actualMavenVersion );
-
+
if ( javaHome != null )
{
resolveExternalJreVersion();
@@ -1170,7 +1165,7 @@ public abstract class AbstractInvokerMoj
{
actualJreVersion = SelectorUtils.getJreVersion();
}
-
+
try
{
if ( isParallelRun() )
@@ -1259,11 +1254,12 @@ public abstract class AbstractInvokerMoj
try
{
ReflectionUtils.setVariableValueInObject( trackable, "sourceLevelSet", Boolean.FALSE );
- getLog().debug( "sourceLevelSet: " + ReflectionUtils.getValueIncludingSuperclasses( "sourceLevelSet", trackable ) );
+ getLog().debug( "sourceLevelSet: "
+ + ReflectionUtils.getValueIncludingSuperclasses( "sourceLevelSet", trackable ) );
}
catch ( IllegalAccessException e )
{
- //noop
+ // noop
}
}
@@ -1271,14 +1267,14 @@ public abstract class AbstractInvokerMoj
{
Artifact pluginArtifact = mojoExecution.getMojoDescriptor().getPluginDescriptor().getPluginArtifact();
pluginArtifact.getFile();
-
+
Commandline commandLine = new Commandline();
commandLine.setExecutable( new File( javaHome, "bin/java" ).getAbsolutePath() );
commandLine.createArg().setValue( "-cp" );
commandLine.createArg().setFile( pluginArtifact.getFile() );
commandLine.createArg().setValue( SystemPropertyPrinter.class.getName() );
commandLine.createArg().setValue( "java.version" );
-
+
StreamConsumer consumer = new StreamConsumer()
{
public void consumeLine( String line )
@@ -1299,12 +1295,11 @@ public abstract class AbstractInvokerMoj
/**
* Runs the specified project.
*
- * @param projectsDir The base directory of all projects, must not be <code>null</code>.
- * @param buildJob The build job to run, must not be <code>null</code>.
+ * @param projectsDir The base directory of all projects, must not be <code>null</code>.
+ * @param buildJob The build job to run, must not be <code>null</code>.
* @param settingsFile The (already interpolated) user settings file for the build, may be <code>null</code> to use
- * the current user settings.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the project could not be launched.
+ * the current user settings.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the project could not be launched.
*/
private void runBuild( File projectsDir, BuildJob buildJob, File settingsFile )
throws MojoExecutionException
@@ -1353,7 +1348,7 @@ public abstract class AbstractInvokerMoj
try
{
- int selection = getSelection( invokerProperties );
+ int selection = getSelection( invokerProperties );
if ( selection == 0 )
{
long milliseconds = System.currentTimeMillis();
@@ -1417,7 +1412,7 @@ public abstract class AbstractInvokerMoj
{
getLog().info( "..SKIPPED due to " + message.toString() );
}
-
+
// Abuse failureMessage, the field in the report which should contain the reason for skipping
// Consider skipCode + I18N
buildJob.setFailureMessage( "Skipped due to " + message.toString() );
@@ -1459,8 +1454,8 @@ public abstract class AbstractInvokerMoj
* Determines whether selector conditions of the specified invoker properties match the current environment.
*
* @param invokerProperties The invoker properties to check, must not be <code>null</code>.
- * @return <code>0</code> if the job corresponding to the properties should be run,
- * otherwise a bitwise value representing the reason why it should be skipped.
+ * @return <code>0</code> if the job corresponding to the properties should be run, otherwise a bitwise value
+ * representing the reason why it should be skipped.
*/
private int getSelection( InvokerProperties invokerProperties )
{
@@ -1487,8 +1482,7 @@ public abstract class AbstractInvokerMoj
* Writes the XML report for the specified build job unless report generation has been disabled.
*
* @param buildJob The build job whose report should be written, must not be <code>null</code>.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the report could not be written.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the report could not be written.
*/
private void writeBuildReport( BuildJob buildJob )
throws MojoExecutionException
@@ -1540,17 +1534,16 @@ public abstract class AbstractInvokerMoj
/**
* Runs the specified project.
*
- * @param basedir The base directory of the project, must not be <code>null</code>.
- * @param pomFile The (already interpolated) POM file, may be <code>null</code> for a POM-less Maven invocation.
- * @param settingsFile The (already interpolated) user settings file for the build, may be <code>null</code>. Will be
- * merged with the settings file of the invoking Maven process.
+ * @param basedir The base directory of the project, must not be <code>null</code>.
+ * @param pomFile The (already interpolated) POM file, may be <code>null</code> for a POM-less Maven invocation.
+ * @param settingsFile The (already interpolated) user settings file for the build, may be <code>null</code>. Will
+ * be merged with the settings file of the invoking Maven process.
* @param invokerProperties The properties to use.
* @return <code>true</code> if the project was launched or <code>false</code> if the selector script indicated that
* the project should be skipped.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the project could not be launched.
- * @throws org.apache.maven.shared.scriptinterpreter.RunFailureException
- * If either a hook script or the build itself failed.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the project could not be launched.
+ * @throws org.apache.maven.shared.scriptinterpreter.RunFailureException If either a hook script or the build itself
+ * failed.
*/
private boolean runBuild( File basedir, File pomFile, File settingsFile, InvokerProperties invokerProperties )
throws MojoExecutionException, RunFailureException
@@ -1603,7 +1596,7 @@ public abstract class AbstractInvokerMoj
request.setDebug( debug );
request.setShowVersion( showVersion );
-
+
if ( logger != null )
{
request.setErrorHandler( logger );
@@ -1616,7 +1609,7 @@ public abstract class AbstractInvokerMoj
invoker.setMavenHome( mavenHome );
request.addShellEnvironment( "M2_HOME", mavenHome.getAbsolutePath() );
}
-
+
if ( mavenExecutable != null )
{
invoker.setMavenExecutable( new File( mavenExecutable ) );
@@ -1626,7 +1619,7 @@ public abstract class AbstractInvokerMoj
{
request.setJavaHome( javaHome );
}
-
+
if ( environmentVariables != null )
{
for ( Map.Entry<String, String> variable : environmentVariables.entrySet() )
@@ -1635,7 +1628,7 @@ public abstract class AbstractInvokerMoj
}
}
- for ( int invocationIndex = 1; ; invocationIndex++ )
+ for ( int invocationIndex = 1;; invocationIndex++ )
{
if ( invocationIndex > 1 && !invokerProperties.isInvocationDefined( invocationIndex ) )
{
@@ -1713,8 +1706,7 @@ public abstract class AbstractInvokerMoj
*
* @param basedir The base directory of the project, must not be <code>null</code>.
* @return The build logger or <code>null</code> if logging has been disabled.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the log file could not be created.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the log file could not be created.
*/
private FileLogger setupLogger( File basedir )
throws MojoExecutionException
@@ -1749,18 +1741,17 @@ public abstract class AbstractInvokerMoj
/**
* Gets the system properties to use for the specified project.
*
- * @param basedir The base directory of the project, must not be <code>null</code>.
+ * @param basedir The base directory of the project, must not be <code>null</code>.
* @param filename The filename to the properties file to load, may be <code>null</code> to use the default path
- * given by {@link #testPropertiesFile}.
+ * given by {@link #testPropertiesFile}.
* @return The system properties to use, may be empty but never <code>null</code>.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the properties file exists but could not be read.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the properties file exists but could not be read.
*/
private Properties getSystemProperties( final File basedir, final String filename )
throws MojoExecutionException
{
Properties collectedTestProperties = new Properties();
-
+
if ( testProperties != null )
{
collectedTestProperties.putAll( testProperties );
@@ -1815,12 +1806,12 @@ public abstract class AbstractInvokerMoj
/**
* Verifies the invocation result.
*
- * @param result The invocation result to check, must not be <code>null</code>.
- * @param invocationIndex The index of the invocation for which to check the exit code, must not be negative.
+ * @param result The invocation result to check, must not be <code>null</code>.
+ * @param invocationIndex The index of the invocation for which to check the exit code, must not be negative.
* @param invokerProperties The invoker properties used to check the exit code, must not be <code>null</code>.
- * @param logger The build logger, may be <code>null</code> if logging is disabled.
- * @throws org.apache.maven.shared.scriptinterpreter.RunFailureException
- * If the invocation result indicates a build failure.
+ * @param logger The build logger, may be <code>null</code> if logging is disabled.
+ * @throws org.apache.maven.shared.scriptinterpreter.RunFailureException If the invocation result indicates a build
+ * failure.
*/
private void verify( InvocationResult result, int invocationIndex, InvokerProperties invokerProperties,
FileLogger logger )
@@ -1828,8 +1819,8 @@ public abstract class AbstractInvokerMoj
{
if ( result.getExecutionException() != null )
{
- throw new RunFailureException(
- "The Maven invocation failed. " + result.getExecutionException().getMessage(), BuildJob.Result.ERROR );
+ throw new RunFailureException( "The Maven invocation failed. "
+ + result.getExecutionException().getMessage(), BuildJob.Result.ERROR );
}
else if ( !invokerProperties.isExpectedResult( result.getExitCode(), invocationIndex ) )
{
@@ -1854,8 +1845,7 @@ public abstract class AbstractInvokerMoj
*
* @param basedir The base directory of the project, must not be <code>null</code>.
* @return The list of goals to run when building the project, may be empty but never <code>null</code>.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the profile file could not be read.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the profile file could not be read.
*/
List<String> getGoals( final File basedir )
throws MojoExecutionException
@@ -1875,8 +1865,7 @@ public abstract class AbstractInvokerMoj
*
* @param basedir The base directory of the project, must not be <code>null</code>.
* @return The list of profiles to activate when building the project, may be empty but never <code>null</code>.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the profile file could not be read.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the profile file could not be read.
*/
List<String> getProfiles( File basedir )
throws MojoExecutionException
@@ -1904,7 +1893,7 @@ public abstract class AbstractInvokerMoj
if ( ( pom != null ) && pom.exists() )
{
- buildJobs = new BuildJob[]{ new BuildJob( pom.getAbsolutePath(), BuildJob.Type.NORMAL ) };
+ buildJobs = new BuildJob[] { new BuildJob( pom.getAbsolutePath(), BuildJob.Type.NORMAL ) };
}
else if ( invokerTest != null )
{
@@ -1980,7 +1969,7 @@ public abstract class AbstractInvokerMoj
*
* @param includes The include patterns for the scanner, may be <code>null</code>.
* @param excludes The exclude patterns for the scanner, may be <code>null</code> to exclude nothing.
- * @param type The type to assign to the resulting build jobs, must not be <code>null</code>.
+ * @param type The type to assign to the resulting build jobs, must not be <code>null</code>.
* @return The build jobs matching the patterns, never <code>null</code>.
* @throws java.io.IOException If the project directory could not be scanned.
*/
@@ -2035,7 +2024,7 @@ public abstract class AbstractInvokerMoj
* it is returned as is.
*
* @param buildJobs The build jobs whose project paths should be relativized, must not be <code>null</code> nor
- * contain <code>null</code> elements.
+ * contain <code>null</code> elements.
* @throws java.io.IOException If any path could not be relativized.
*/
private void relativizeProjectPaths( BuildJob[] buildJobs )
@@ -2069,7 +2058,7 @@ public abstract class AbstractInvokerMoj
* Relativizes the specified path against the given base directory. Besides relativization, the returned path will
* also be normalized, e.g. directory references like ".." will be removed.
*
- * @param path The path to relativize, must not be <code>null</code>.
+ * @param path The path to relativize, must not be <code>null</code>.
* @param basedir The (canonical path of the) base directory to relativize against, must not be <code>null</code>.
* @return The relative path in normal form or <code>null</code> if the input path does not denote a sub path of the
* base directory.
@@ -2147,11 +2136,11 @@ public abstract class AbstractInvokerMoj
* Gets goal/profile names for the specified project, either directly from the plugin configuration or from an
* external token file.
*
- * @param basedir The base directory of the test project, must not be <code>null</code>.
- * @param filename The (simple) name of an optional file in the project base directory from which to read
- * goals/profiles, may be <code>null</code>.
+ * @param basedir The base directory of the test project, must not be <code>null</code>.
+ * @param filename The (simple) name of an optional file in the project base directory from which to read
+ * goals/profiles, may be <code>null</code>.
* @param defaultTokens The list of tokens to return in case the specified token file does not exist, may be
- * <code>null</code>.
+ * <code>null</code>.
* @return The list of goal/profile names, may be empty but never <code>null</code>.
* @throws java.io.IOException If the token file exists but could not be parsed.
*/
@@ -2233,11 +2222,10 @@ public abstract class AbstractInvokerMoj
* Interpolates the specified POM/settings file to a temporary file. The destination file may be same as the input
* file, i.e. interpolation can be performed in-place.
*
- * @param originalFile The XML file to interpolate, must not be <code>null</code>.
+ * @param originalFile The XML file to interpolate, must not be <code>null</code>.
* @param interpolatedFile The target file to write the interpolated contents of the original file to, must not be
- * <code>null</code>.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If the target file could not be created.
+ * <code>null</code>.
+ * @throws org.apache.maven.plugin.MojoExecutionException If the target file could not be created.
*/
void buildInterpolatedFile( File originalFile, File interpolatedFile )
throws MojoExecutionException
@@ -2286,8 +2274,7 @@ public abstract class AbstractInvokerMoj
*
* @param projectDirectory The base directory of the IT project, must not be <code>null</code>.
* @return The invoker properties, may be empty but never <code>null</code>.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * If an I/O error occurred during reading the properties.
+ * @throws org.apache.maven.plugin.MojoExecutionException If an I/O error occurred during reading the properties.
*/
private InvokerProperties getInvokerProperties( final File projectDirectory )
throws MojoExecutionException
@@ -2325,8 +2312,7 @@ public abstract class AbstractInvokerMoj
}
catch ( InterpolationException e )
{
- throw new MojoExecutionException( "Failed to interpolate invoker properties: " + propertiesFile,
- e );
+ throw new MojoExecutionException( "Failed to interpolate invoker properties: " + propertiesFile, e );
}
props.setProperty( key, value );
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java Fri Jun 27 20:27:03 2014
@@ -60,8 +60,7 @@ import org.codehaus.plexus.util.FileUtil
* @author Benjamin Bentmann
* @version $Id$
*/
-@Mojo( name = "install", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST,
- requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true )
+@Mojo( name = "install", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true )
public class InstallMojo
extends AbstractMojo
{
@@ -444,12 +443,12 @@ public class InstallMojo
ArtifactRepository testRepository )
throws MojoExecutionException
{
- // keep track if we have passed mvnProject in reactorProjects
+ // keep track if we have passed mvnProject in reactorProjects
boolean foundCurrent = false;
// ... into dependencies that were resolved from reactor projects ...
Collection<String> dependencyProjects = new LinkedHashSet<String>();
-
+
// index available reactor projects
Map<String, MavenProject> projects = new HashMap<String, MavenProject>();
for ( MavenProject reactorProject : reactorProjects )
@@ -458,7 +457,7 @@ public class InstallMojo
reactorProject.getGroupId() + ':' + reactorProject.getArtifactId() + ':' + reactorProject.getVersion();
projects.put( projectId, reactorProject );
-
+
// only add projects of reactor build previous to this mvnProject
if ( !( foundCurrent |= ( mvnProject.equals( reactorProject ) ) ) )
{
@@ -470,7 +469,7 @@ public class InstallMojo
Collection<Artifact> artifacts = (Collection<Artifact>) mvnProject.getArtifacts();
// ... and those that were resolved from the (local) repo
Collection<Artifact> dependencyArtifacts = new LinkedHashSet<Artifact>();
-
+
for ( Artifact artifact : artifacts )
{
// workaround for MNG-2961 to ensure the base version does not contain a timestamp
@@ -595,10 +594,12 @@ public class InstallMojo
Artifact originatingArtifact = project.getArtifact();
- for (String extraArtifact : extraArtifacts) {
- String[] gav = extraArtifact.split(":");
- if (gav.length < 3 || gav.length > 5) {
- throw new MojoExecutionException("Invalid artifact " + extraArtifact);
+ for ( String extraArtifact : extraArtifacts )
+ {
+ String[] gav = extraArtifact.split( ":" );
+ if ( gav.length < 3 || gav.length > 5 )
+ {
+ throw new MojoExecutionException( "Invalid artifact " + extraArtifact );
}
String groupId = gav[0];
@@ -606,42 +607,53 @@ public class InstallMojo
String version = gav[2];
String type = "jar";
- if (gav.length > 3) {
+ if ( gav.length > 3 )
+ {
type = gav[3];
}
String classifier = null;
- if (gav.length == 5) {
+ if ( gav.length == 5 )
+ {
classifier = gav[4];
}
List<ArtifactRepository> remoteRepositories;
- if ("maven-plugin".equals(type)) {
+ if ( "maven-plugin".equals( type ) )
+ {
remoteRepositories = this.remotePluginRepositories;
- } else {
+ }
+ else
+ {
remoteRepositories = this.remoteArtifactRepositories;
}
Artifact artifact = null;
- try {
- artifact = artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
+ try
+ {
+ artifact =
+ artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
ArtifactResolutionResult arr =
- resolver.resolveTransitively(Collections.singleton(artifact), originatingArtifact,
- remoteRepositories, localRepository, artifactMetadataSource);
+ resolver.resolveTransitively( Collections.singleton( artifact ), originatingArtifact,
+ remoteRepositories, localRepository, artifactMetadataSource );
- if (!groupId.equals(artifact.getGroupId()) || !artifactId.equals(artifact.getArtifactId())
- || !version.equals(artifact.getVersion())) {
+ if ( !groupId.equals( artifact.getGroupId() ) || !artifactId.equals( artifact.getArtifactId() )
+ || !version.equals( artifact.getVersion() ) )
+ {
artifact =
- artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
- copyPoms(artifact, testRepository);
+ artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
+ copyPoms( artifact, testRepository );
}
- for (Artifact arrArtifact : (Set<Artifact>) arr.getArtifacts()) {
- copyArtifact(arrArtifact, testRepository);
+ for ( Artifact arrArtifact : (Set<Artifact>) arr.getArtifacts() )
+ {
+ copyArtifact( arrArtifact, testRepository );
}
- } catch (Exception e) {
- throw new MojoExecutionException("Unable to resolve dependencies for: " + artifact, e);
+ }
+ catch ( Exception e )
+ {
+ throw new MojoExecutionException( "Unable to resolve dependencies for: " + artifact, e );
}
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/IntegrationTestMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/IntegrationTestMojo.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/IntegrationTestMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/IntegrationTestMojo.java Fri Jun 27 20:27:03 2014
@@ -29,14 +29,12 @@ import org.apache.maven.plugins.annotati
* never fail the build, designed to be used in conjunction with the verify mojo.
*
* @since 1.4
- *
* @author <a href="mailto:stephenconnolly at codehaus">Stephen Connolly</a>
* @version $Id$
*/
-@Mojo( name = "integration-test", defaultPhase = LifecyclePhase.INTEGRATION_TEST,
- requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
+@Mojo( name = "integration-test", defaultPhase = LifecyclePhase.INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
public class IntegrationTestMojo
-extends AbstractInvokerMojo
+ extends AbstractInvokerMojo
{
void processResults( InvokerSession invokerSession )
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java Fri Jun 27 20:27:03 2014
@@ -30,13 +30,11 @@ import org.apache.maven.plugins.annotati
* outputting the results to the command line.
*
* @since 1.0
- *
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
* @author <a href="mailto:jdcasey@apache.org">John Casey</a>
* @version $Id$
*/
-@Mojo( name = "run", defaultPhase = LifecyclePhase.INTEGRATION_TEST,
- requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
+@Mojo( name = "run", defaultPhase = LifecyclePhase.INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true )
public class InvokerMojo
extends AbstractInvokerMojo
{
@@ -57,7 +55,7 @@ public class InvokerMojo
*/
@Parameter( property = "invoker.failIfNoProjects" )
private Boolean failIfNoProjects;
-
+
void processResults( InvokerSession invokerSession )
throws MojoFailureException
{
@@ -68,12 +66,12 @@ public class InvokerMojo
invokerSession.handleFailures( getLog(), ignoreFailures );
}
-
+
@Override
protected void doFailIfNoProjects()
throws MojoFailureException
{
- if( Boolean.TRUE.equals( failIfNoProjects ) )
+ if ( Boolean.TRUE.equals( failIfNoProjects ) )
{
throw new MojoFailureException( "No projects to invoke!" );
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java Fri Jun 27 20:27:03 2014
@@ -41,26 +41,27 @@ class InvokerProperties
PROJECT( "invoker.project" ),
GOALS( "invoker.goals" ),
PROFILES( "invoker.profiles" ),
- MAVEN_OPTS ( "invoker.mavenOpts" ),
+ MAVEN_OPTS( "invoker.mavenOpts" ),
FAILURE_BEHAVIOR( "invoker.failureBehavior" ),
NON_RECURSIVE( "invoker.nonRecursive" ),
OFFLINE( "invoker.offline" ),
SYSTEM_PROPERTIES_FILE( "invoker.systemPropertiesFile" ),
DEBUG( "invoker.debug" );
-
+
private final String key;
-
- private InvocationProperty(final String s)
+
+ private InvocationProperty( final String s )
{
this.key = s;
}
@Override
- public String toString() {
+ public String toString()
+ {
return key;
}
}
-
+
/**
* The invoker properties being wrapped.
*/
@@ -208,19 +209,19 @@ class InvokerProperties
String nonRecursive = get( InvocationProperty.NON_RECURSIVE, index );
if ( nonRecursive != null )
{
- request.setRecursive( !Boolean.valueOf(nonRecursive));
+ request.setRecursive( !Boolean.valueOf( nonRecursive ) );
}
String offline = get( InvocationProperty.OFFLINE, index );
if ( offline != null )
{
- request.setOffline(Boolean.valueOf(offline));
+ request.setOffline( Boolean.valueOf( offline ) );
}
-
+
String debug = get( InvocationProperty.DEBUG, index );
if ( debug != null )
{
- request.setDebug(Boolean.valueOf(debug));
+ request.setDebug( Boolean.valueOf( debug ) );
}
}
@@ -276,6 +277,6 @@ class InvokerProperties
private String get( InvocationProperty prop, int index )
{
- return get( prop.toString(), index);
+ return get( prop.toString(), index );
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java Fri Jun 27 20:27:03 2014
@@ -55,38 +55,38 @@ import org.codehaus.plexus.util.xml.pull
public class InvokerReport
extends AbstractMavenReport
{
-
+
/**
* The Maven Project.
*/
@Component
protected MavenProject project;
-
+
/**
* Doxia Site Renderer component.
*/
@Component
- protected Renderer siteRenderer;
-
+ protected Renderer siteRenderer;
+
/**
* Internationalization component.
*/
@Component
- protected I18N i18n;
-
+ protected I18N i18n;
+
/**
* The output directory for the report. Note that this parameter is only evaluated if the goal is run directly from
* the command line. If the goal is run indirectly as part of a site generation, the output directory configured in
* the Maven Site Plugin is used instead.
*/
@Parameter( defaultValue = "${project.reporting.outputDirectory}", required = true )
- protected File outputDirectory;
-
+ protected File outputDirectory;
+
/**
* Base directory where all build reports have been written to.
*/
@Parameter( defaultValue = "${project.build.directory}/invoker-reports", property = "invoker.reportsDirectory" )
- private File reportsDirectory;
+ private File reportsDirectory;
/**
* The number format used to print percent values in the report locale.
@@ -127,7 +127,7 @@ public class InvokerReport
sink.section1_();
// ----------------------------------
- // build buildJob beans
+ // build buildJob beans
// ----------------------------------
File[] reportFiles = ReportUtils.getReportFiles( reportsDirectory );
if ( reportFiles.length <= 0 )
@@ -155,14 +155,14 @@ public class InvokerReport
}
// ----------------------------------
- // summary
+ // summary
// ----------------------------------
-
+
constructSummarySection( buildJobs, locale );
-
+
+ // ----------------------------------
+ // per file/it detail
// ----------------------------------
- // per file/it detail
- // ----------------------------------
sink.section2();
sink.sectionTitle2();
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java Fri Jun 27 20:27:03 2014
@@ -131,7 +131,7 @@ class InvokerSession
updateStats();
return errorJobs;
- }
+ }
/**
* Gets the skipped build jobs in this session.
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java Fri Jun 27 20:27:03 2014
@@ -98,8 +98,9 @@ class MetadataUtils
{
Xpp3Dom[] children = versions.getChildren( "version" );
- for (Xpp3Dom aChildren : children) {
- allVersions.add(aChildren.getValue());
+ for ( Xpp3Dom aChildren : children )
+ {
+ allVersions.add( aChildren.getValue() );
}
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/ReportUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/ReportUtils.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/ReportUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/ReportUtils.java Fri Jun 27 20:27:03 2014
@@ -32,7 +32,7 @@ class ReportUtils
/**
* Gets the paths to the invoker reports available in the specified directory.
*
- *@param reportsDirectory The base directory where the invoker reports are located in, may be <code>null</code>.
+ * @param reportsDirectory The base directory where the invoker reports are located in, may be <code>null</code>.
* @return The paths to the invoker reports, can be empty but never <code>null</code>.
*/
public static File[] getReportFiles( File reportsDirectory )
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java Fri Jun 27 20:27:03 2014
@@ -46,13 +46,17 @@ class SelectorUtils
{
String[] tokens = ( list != null ) ? StringUtils.split( list, "," ) : new String[0];
- for (String token1 : tokens) {
+ for ( String token1 : tokens )
+ {
String token = token1.trim();
- if (token.startsWith("!")) {
- excludes.add(token.substring(1));
- } else {
- includes.add(token);
+ if ( token.startsWith( "!" ) )
+ {
+ excludes.add( token.substring( 1 ) );
+ }
+ else
+ {
+ includes.add( token );
}
}
}
@@ -88,6 +92,7 @@ class SelectorUtils
/**
* Retrieves the current Maven version.
+ *
* @return The current Maven version.
*/
static String getMavenVersion()
@@ -99,8 +104,7 @@ class SelectorUtils
// and that should have a pom.properties file
// if this ever changes, we will have to revisit this code.
Properties properties = new Properties();
- properties.load( MavenProject.class.getClassLoader().getResourceAsStream(
- "META-INF/maven/org.apache.maven/maven-core/pom.properties" ) );
+ properties.load( MavenProject.class.getClassLoader().getResourceAsStream( "META-INF/maven/org.apache.maven/maven-core/pom.properties" ) );
return StringUtils.trim( properties.getProperty( "version" ) );
}
catch ( Exception e )
@@ -108,7 +112,7 @@ class SelectorUtils
return null;
}
}
-
+
static String getMavenVersion( File mavenHome )
{
File mavenLib = new File( mavenHome, "lib" );
@@ -153,7 +157,7 @@ class SelectorUtils
{
return isMavenVersion( mavenSpec, getMavenVersion() );
}
-
+
static boolean isMavenVersion( String mavenSpec, String actualVersion )
{
List<String> includes = new ArrayList<String>();
@@ -169,10 +173,10 @@ class SelectorUtils
{
return System.getProperty( "java.version", "" );
}
-
+
static String getJreVersion( File javaHome )
{
- //@todo detect actual version
+ // @todo detect actual version
return null;
}
@@ -180,7 +184,7 @@ class SelectorUtils
{
return isJreVersion( jreSpec, getJreVersion() );
}
-
+
static boolean isJreVersion( String jreSpec, String actualJreVersion )
{
List<String> includes = new ArrayList<String>();
@@ -192,7 +196,6 @@ class SelectorUtils
return isJreVersion( jreVersion, includes, true ) && !isJreVersion( jreVersion, excludes, false );
}
-
static boolean isJreVersion( List<Integer> jreVersion, List<String> versionPatterns, boolean defaultMatch )
{
if ( versionPatterns != null && !versionPatterns.isEmpty() )
@@ -230,8 +233,8 @@ class SelectorUtils
else
{
// 1.5 <=> [1.5,1.6)
- return checkVersion.size() <= jreVersion.size() && checkVersion.equals(
- jreVersion.subList( 0, checkVersion.size() ) );
+ return checkVersion.size() <= jreVersion.size()
+ && checkVersion.equals( jreVersion.subList( 0, checkVersion.size() ) );
}
}
@@ -243,8 +246,9 @@ class SelectorUtils
List<Integer> numbers = new ArrayList<Integer>();
- for (String token : tokens) {
- numbers.add(Integer.valueOf(token));
+ for ( String token : tokens )
+ {
+ numbers.add( Integer.valueOf( token ) );
}
return numbers;
@@ -252,7 +256,7 @@ class SelectorUtils
static int compareVersions( List<Integer> version1, List<Integer> version2 )
{
- for ( Iterator<Integer> it1 = version1.iterator(), it2 = version2.iterator(); ; )
+ for ( Iterator<Integer> it1 = version1.iterator(), it2 = version2.iterator();; )
{
if ( !it1.hasNext() )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SystemPropertyPrinter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SystemPropertyPrinter.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SystemPropertyPrinter.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SystemPropertyPrinter.java Fri Jun 27 20:27:03 2014
@@ -20,9 +20,8 @@ package org.apache.maven.plugin.invoker;
*/
/**
- * Print specified system properties to the output stream.
- * Useful to detect certain values from a JVM different to the default JAVA_HOME.
- *
+ * Print specified system properties to the output stream. Useful to detect certain values from a JVM different to the
+ * default JAVA_HOME.
*
* @author Robert Scholte
* @since 1.8
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java Fri Jun 27 20:27:03 2014
@@ -75,7 +75,7 @@ public class VerifyMojo
*/
@Parameter( defaultValue = "false" )
private boolean suppressSummaries;
-
+
/**
* Set this to <code>true</code> to cause a failure if there are no projects to invoke.
*
@@ -96,7 +96,7 @@ public class VerifyMojo
if ( skipInvocation )
{
getLog().info( "Skipping invocation per configuration."
- + " If this is incorrect, ensure the skipInvocation parameter is not set to true." );
+ + " If this is incorrect, ensure the skipInvocation parameter is not set to true." );
return;
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/ExtendedMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/ExtendedMavenProjectStub.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/ExtendedMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/ExtendedMavenProjectStub.java Fri Jun 27 20:27:03 2014
@@ -32,6 +32,7 @@ public class ExtendedMavenProjectStub
extends MavenProjectStub
{
private Scm scm;
+
private Properties properties;
public Scm getScm()
@@ -51,6 +52,6 @@ public class ExtendedMavenProjectStub
public void setProperties( Properties properties )
{
- this.properties= properties;
+ this.properties = properties;
}
}
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=1606207&r1=1606206&r2=1606207&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 Fri Jun 27 20:27:03 2014
@@ -82,8 +82,9 @@ public class InterpolationTest
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";
+ 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 ) );
@@ -105,9 +106,10 @@ public class InterpolationTest
properties.put( "foo", "bar" );
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";
-
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
+ + "resources" + File.separatorChar + "unit" + File.separatorChar + "interpolation";
+
interpolatedPomFile = new File( getBasedir(), "target/interpolated-pom.xml" );
invokerMojo.buildInterpolatedFile( new File( dirPath, "pom.xml" ), interpolatedPomFile );
reader = ReaderFactory.newXmlReader( interpolatedPomFile );
@@ -134,8 +136,9 @@ public class InterpolationTest
setVariableValueToObject( invokerMojo, "project", buildMavenProjectStub() );
setVariableValueToObject( invokerMojo, "profilesFile", "profiles.txt" );
setVariableValueToObject( invokerMojo, "settings", new Settings() );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
- + "resources" + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + "resources"
+ + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
List<String> profiles = invokerMojo.getProfiles( new File( dirPath ) );
assertEquals( 2, profiles.size() );
assertTrue( profiles.contains( "foo" ) );
@@ -147,11 +150,12 @@ public class InterpolationTest
InvokerMojo invokerMojo = new InvokerMojo();
setVariableValueToObject( invokerMojo, "project", buildMavenProjectStub() );
- setVariableValueToObject( invokerMojo, "profiles", Arrays.asList("zloug") );
+ setVariableValueToObject( invokerMojo, "profiles", Arrays.asList( "zloug" ) );
setVariableValueToObject( invokerMojo, "profilesFile", "emptyProfiles.txt" );
setVariableValueToObject( invokerMojo, "settings", new Settings() );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
- + "resources" + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + "resources"
+ + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
List<String> profiles = invokerMojo.getProfiles( new File( dirPath ) );
assertFalse( profiles.contains( "zloug" ) );
assertEquals( 0, profiles.size() );
@@ -163,11 +167,12 @@ public class InterpolationTest
{
InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "profiles", Arrays.asList("zloug") );
+ setVariableValueToObject( invokerMojo, "profiles", Arrays.asList( "zloug" ) );
setVariableValueToObject( invokerMojo, "profilesFile", "zorglubProfiles.txt" );
setVariableValueToObject( invokerMojo, "settings", new Settings() );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
- + "resources" + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + "resources"
+ + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
List<String> profiles = invokerMojo.getProfiles( new File( dirPath ) );
assertTrue( profiles.contains( "zloug" ) );
assertEquals( 1, profiles.size() );
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=1606207&r1=1606206&r2=1606207&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 Fri Jun 27 20:27:03 2014
@@ -104,10 +104,11 @@ public class InvokerMojoTest
public void testAlreadyCloned()
throws Exception
{
- assertFalse( AbstractInvokerMojo.alreadyCloned( "dir", Collections.<String>emptyList() ) );
+ assertFalse( AbstractInvokerMojo.alreadyCloned( "dir", Collections.<String> emptyList() ) );
assertTrue( AbstractInvokerMojo.alreadyCloned( "dir", Collections.singletonList( "dir" ) ) );
- assertTrue( AbstractInvokerMojo.alreadyCloned( "dir" + File.separator + "sub", Collections.singletonList( "dir" ) ) );
+ assertTrue( AbstractInvokerMojo.alreadyCloned( "dir" + File.separator + "sub",
+ Collections.singletonList( "dir" ) ) );
assertFalse( AbstractInvokerMojo.alreadyCloned( "dirs", Collections.singletonList( "dir" ) ) );
- }
+ }
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java?rev=1606207&r1=1606206&r2=1606207&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java Fri Jun 27 20:27:03 2014
@@ -258,15 +258,15 @@ public class InvokerPropertiesTest
{
Properties props = new Properties();
InvokerProperties facade = new InvokerProperties( props );
-
- assertFalse( facade.isInvocationDefined( 1 ));
-
+
+ assertFalse( facade.isInvocationDefined( 1 ) );
+
props.setProperty( "invoker.goals", "install" );
- assertFalse( facade.isInvocationDefined( 1 ));
+ assertFalse( facade.isInvocationDefined( 1 ) );
props.setProperty( "invoker.goals.2", "install" );
- assertFalse( facade.isInvocationDefined( 1 ));
- assertTrue( facade.isInvocationDefined( 2 ));
- assertFalse( facade.isInvocationDefined( 3 ));
+ assertFalse( facade.isInvocationDefined( 1 ) );
+ assertTrue( facade.isInvocationDefined( 2 ) );
+ assertFalse( facade.isInvocationDefined( 3 ) );
}
}