diff --git a/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/DefaultStatefulSingleton.java b/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/DefaultStatefulSingleton.java index b75ed83236..6c41bf78e5 100644 --- a/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/DefaultStatefulSingleton.java +++ b/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/DefaultStatefulSingleton.java @@ -24,6 +24,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.Properties; +/** + * + */ public class DefaultStatefulSingleton implements StatefulSingleton { diff --git a/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java b/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java index c87f49d53d..b63f954e1c 100644 --- a/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java +++ b/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java @@ -22,6 +22,9 @@ package org.apache.maven.coreit.component; import java.io.File; import java.io.IOException; +/** + * + */ public interface StatefulSingleton { diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java index f459eb4ce0..c45a708592 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckThreadSafetyMojo.java @@ -21,7 +21,6 @@ package org.apache.maven.plugin.coreit; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import java.io.File; import java.io.FileOutputStream; @@ -111,7 +110,7 @@ public class CheckThreadSafetyMojo { // wait for start } - for ( int j = 0; j < 10000; j++ ) + for ( int j = 0; j < 10 * 1000; j++ ) { try { diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java index f6b21a1cfc..5865be4513 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallArtifactsMojo.java @@ -1,4 +1,5 @@ package org.apache.maven.plugin.coreit; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -33,7 +34,6 @@ import org.apache.maven.plugin.MojoFailureException; import java.io.File; import java.util.Iterator; import java.util.List; -import java.util.Map; /** * @author Olivier Lamy @@ -114,6 +114,9 @@ public class InstallArtifactsMojo } } + /** + * + */ public static class FlatRepositoryLayout implements ArtifactRepositoryLayout { diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveTransitiveMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveTransitiveMojo.java index ac33d69e52..d842f47441 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveTransitiveMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveTransitiveMojo.java @@ -128,7 +128,8 @@ public class ResolveTransitiveMojo if ( thread.error != null ) { - throw new MojoExecutionException( "Failed to resolve artifacts: " + thread.error.getMessage(), thread.error ); + throw new MojoExecutionException( "Failed to resolve artifacts: " + thread.error.getMessage(), + thread.error ); } if ( propertiesFile != null ) @@ -187,7 +188,8 @@ public class ResolveTransitiveMojo dependency.getVersion(), dependency.getType(), dependency.getClassifier() ); - getLog().info( "[MAVEN-CORE-IT-LOG] Resolving " + ResolveTransitiveMojo.this.getId( artifact ) ); + getLog().info( "[MAVEN-CORE-IT-LOG] Resolving " + + ResolveTransitiveMojo.this.getId( artifact ) ); artifacts.add( artifact ); } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java index 0988254264..21667ecff1 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java @@ -21,7 +21,6 @@ package org.apache.maven.plugin.coreit; import java.io.File; import java.util.List; -import java.util.Map; import java.util.Properties; import java.util.Set; diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java index 15ac122b4f..cd891ad779 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java @@ -89,6 +89,7 @@ public class CatchMojo } catch ( IOException e ) { + // ignore } } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java index 76f2a020a1..54844db9a7 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java @@ -76,7 +76,8 @@ public class AggregateTestMojo writeArtifacts( filter( projectArtifacts, project ), project.getArtifacts() ); - // NOTE: We can't make any assumptions about the class path but as a minimum it must not cause an exception + // NOTE: We can't make any assumptions about the class path but as a minimum it must not cause an + // exception project.getTestClasspathElements(); } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java index 566c1d4993..9d585d269c 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java @@ -295,6 +295,7 @@ public abstract class AbstractDependencyMojo for ( int i = 0; i < digest.length; i++ ) { + @SuppressWarnings( "checkstyle:magicnumber" ) int b = digest[i] & 0xFF; if ( b < 0x10 ) diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java index 1b42d54fe0..ae4e9b421f 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java @@ -94,7 +94,8 @@ public class AggregateTestMojo writeArtifacts( filter( projectArtifacts, project ), project.getArtifacts() ); writeClassPath( filter( testClassPath, project ), project.getTestClasspathElements() ); - writeClassPathChecksums( filter( testClassPathChecksums, project ), project.getTestClasspathElements() ); + writeClassPathChecksums( filter( testClassPathChecksums, project ), + project.getTestClasspathElements() ); } } catch ( DependencyResolutionRequiredException e ) diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java index 5375856f29..9a9e9d7880 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java @@ -143,7 +143,8 @@ public class ResolveOneDependencyMojo } Set depArtifacts = new HashSet(); - Artifact artifact = artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier ); + Artifact artifact = + artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier ); depArtifacts.add( artifact ); ScopeArtifactFilter scopeFilter = new ScopeArtifactFilter( scope ); @@ -193,7 +194,7 @@ public class ResolveOneDependencyMojo return; } } - getLog().info(" RESOLVE-ONE-DEPENDENCY " + artifact.toString() + " $ NOT-RESOLVED" ); + getLog().info( " RESOLVE-ONE-DEPENDENCY " + artifact.toString() + " $ NOT-RESOLVED" ); } } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java index 307d54b5d8..48c7486bc2 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java @@ -31,7 +31,8 @@ public class MojoFailureExceptionMojo { /** * Message used in {@link MojoFailureException#MojoFailureException(String)}, unless longMessage - * is supplied; then, this becomes the short message in {@link MojoFailureException#MojoFailureException(Object, String, String)}. + * is supplied; then, this becomes the short message in + * {@link MojoFailureException#MojoFailureException(Object, String, String)}. * * @parameter property="error.message" default-value="Planned MojoExecutionException." * @required diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java index 45c253798a..5f74d1a6ea 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java @@ -19,12 +19,14 @@ package org.apache.maven.plugin.coreit; * under the License. */ -import java.util.*; +import java.util.List; -import org.apache.maven.artifact.*; -import org.apache.maven.artifact.factory.*; -import org.apache.maven.artifact.resolver.*; -import org.apache.maven.artifact.repository.*; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.factory.ArtifactFactory; +import org.apache.maven.artifact.resolver.ArtifactNotFoundException; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.ArtifactResolver; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java index 1b95cd4b81..5f2b014761 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java @@ -26,6 +26,8 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.interpolation.ModelInterpolationException; import org.apache.maven.project.interpolation.ModelInterpolator; +import java.util.Properties; + /** * @goal path-interpolation * @phase validate @@ -44,9 +46,11 @@ public class PathInterpolationMojo { try { + Properties props = project.getProperties(); + modelInterpolator.interpolate( project.getOriginalModel(), project.getBasedir(), - new DefaultProjectBuilderConfiguration().setExecutionProperties( project.getProperties() ), + new DefaultProjectBuilderConfiguration().setExecutionProperties( props ), true ); } catch ( ModelInterpolationException e ) diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java index de0dc495ed..752686c82b 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java @@ -25,7 +25,6 @@ import org.apache.maven.plugin.MojoExecutionException; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.util.Map; /** * Mojo which touches a file without requiring a project. diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-component-api/src/main/java/org/apache/maven/its/plugins/VelocityMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-component-api/src/main/java/org/apache/maven/its/plugins/VelocityMojo.java index 988b58b62a..fa1b403d91 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-component-api/src/main/java/org/apache/maven/its/plugins/VelocityMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-component-api/src/main/java/org/apache/maven/its/plugins/VelocityMojo.java @@ -45,7 +45,8 @@ public class VelocityMojo try { // velocityComponent engine should not be null - // this is the real test to check that we got the right Initializable interface in both Plexus and the component + // this is the real test to check that we got the right Initializable interface in both Plexus and the + // component /* * NOTE: There's a bug in the plexus-velocity:1.1.7 component that fails to transform "/template.vm" into * a proper resource name before searching the context class loader so we avoid the leading slash here. diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java index d59822a23a..6179bf4920 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/DefaultFakeComponent.java @@ -1,4 +1,5 @@ package org.apache.maven.its.plugins.plexuslifecycle; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/FakeComponent.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/FakeComponent.java index 98ebec4a0c..cea4bedc82 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/FakeComponent.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/FakeComponent.java @@ -1,4 +1,5 @@ package org.apache.maven.its.plugins.plexuslifecycle; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/MojoWithPlexusLifecycle.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/MojoWithPlexusLifecycle.java index 8cf7f9d9fc..b9f319562a 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/MojoWithPlexusLifecycle.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-lifecycle/src/main/java/org/apache/maven/its/plugins/plexuslifecycle/MojoWithPlexusLifecycle.java @@ -1,4 +1,5 @@ package org.apache.maven.its.plugins.plexuslifecycle; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java index bd72c3a373..b2d1f548e5 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java @@ -23,6 +23,9 @@ import java.io.IOException; import org.codehaus.plexus.util.xml.pull.XmlSerializer; +/** + * + */ public class Xpp3Dom { diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java index 3f15517e1d..52f482ce5f 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java @@ -23,6 +23,9 @@ import java.io.IOException; import java.io.OutputStream; import java.io.Writer; +/** + * + */ public class MXSerializer implements XmlSerializer { diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java index 120bfc4b54..e8c8be5b42 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java @@ -23,6 +23,9 @@ import java.io.IOException; import java.io.OutputStream; import java.io.Writer; +/** + * + */ public interface XmlSerializer { diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java index 63e6cab1bc..39428a9dcf 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java @@ -47,7 +47,9 @@ public class PluginParamInterpolationMojo if ( !myDirectory.equals( value ) ) { - throw new MojoExecutionException( "Directory supplied: " + myDirectory + " is not the same as the project build directory: " + project.getBuild().getDirectory() + " + '/foo'" ); + throw new MojoExecutionException( "Directory supplied: " + myDirectory + + " is not the same as the project build directory: " + project.getBuild().getDirectory() + + " + '/foo'" ); } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java index 5221fb56c7..2676488be2 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java @@ -45,7 +45,8 @@ public class PropertyInterpolationMojo if ( !value.equals( targetValue ) ) { - throw new MojoExecutionException( "Property value of 'myDirectory': " + value + " should equal the 'foo' subpath of the project build directory: " + targetValue ); + throw new MojoExecutionException( "Property value of 'myDirectory': " + value + + " should equal the 'foo' subpath of the project build directory: " + targetValue ); } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java index 906d39de0c..3741ce3145 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java @@ -101,7 +101,8 @@ public class CoreItMojo } else { - getLog().warn( "[MAVEN-CORE-IT-LOG] Toolchain #" + selected + " can't be selected, found only " + tcs.length ); + getLog().warn( "[MAVEN-CORE-IT-LOG] Toolchain #" + selected + " can't be selected, found only " + + tcs.length ); } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CopyPomMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CopyPomMojo.java index 578422a537..eddef2bbd7 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CopyPomMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CopyPomMojo.java @@ -52,28 +52,28 @@ public class CopyPomMojo { try { - File dest = new File( outputFile ); - File dir = dest.getParentFile(); - - if ( !dir.exists() ) - { - dir.mkdirs(); - } + File dest = new File( outputFile ); + File dir = dest.getParentFile(); - getLog().info( "Copying POM to file: " + dest.getAbsolutePath() ); + if ( !dir.exists() ) + { + dir.mkdirs(); + } - FileInputStream in = new FileInputStream( pomFile ); - FileOutputStream out = new FileOutputStream( dest ); + getLog().info( "Copying POM to file: " + dest.getAbsolutePath() ); - int read = -1; - byte[] buf = new byte[4096]; - while( ( read = in.read( buf ) ) > -1 ) - { - out.write( buf, 0, read ); - } - - in.close(); - out.close(); + FileInputStream in = new FileInputStream( pomFile ); + FileOutputStream out = new FileOutputStream( dest ); + + int read = -1; + byte[] buf = new byte[4 * 1024]; + while ( ( read = in.read( buf ) ) > -1 ) + { + out.write( buf, 0, read ); + } + + in.close(); + out.close(); } catch ( IOException e ) { diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java index ea51d08712..460e9c8c2f 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java @@ -98,7 +98,8 @@ public class CoreItTouchMojo { if ( fail ) { - throw new MojoExecutionException( "Failing per \'fail\' parameter (specified in pom or system properties)" ); + throw new MojoExecutionException( "Failing per \'fail\' parameter" + + " (specified in pom or system properties)" ); } File outDir = new File( outputDirectory ); diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java index 258f079a72..c10e1ffda0 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java @@ -52,9 +52,10 @@ public class UsesPropertiesMojo file.getParentFile().mkdirs(); FileOutputStream fos = new FileOutputStream( file ); - properties.store( fos, "# Properties generated by the execution of a mojo that uses interpolated POM values for configuration." ); + properties.store( fos, "# Properties generated by the execution of a mojo that uses" + + " interpolated POM values for configuration." ); } - catch( Exception e ) + catch ( Exception e ) { getLog().error( "Error creating mojo generated properties.", e ); } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java index 60b2aa1525..34427dbc0f 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java @@ -48,7 +48,7 @@ public class UsesWagonMojo getLog().info( "[MAVEN-CORE-IT-LOG] Looking up wagon for protocol file" ); fileWagon = wagonManager.getWagon( "file" ); } - catch( Exception e ) + catch ( Exception e ) { throw new MojoExecutionException( e.getMessage(), e ); } @@ -56,7 +56,7 @@ public class UsesWagonMojo { FileWagon theWagon = (FileWagon) fileWagon; } - catch( ClassCastException e ) + catch ( ClassCastException e ) { getLog().error( "", e ); getLog().error( "Plugin Class Loaded by " + FileWagon.class.getClassLoader() ); @@ -71,7 +71,7 @@ public class UsesWagonMojo getLog().info( "[MAVEN-CORE-IT-LOG] Looking up wagon for protocol scp" ); scpWagon = wagonManager.getWagon( "scp" ); } - catch( Exception e ) + catch ( Exception e ) { throw new MojoExecutionException( e.getMessage(), e ); } @@ -79,7 +79,7 @@ public class UsesWagonMojo { ScpWagon theWagon = (ScpWagon) scpWagon; } - catch( ClassCastException e ) + catch ( ClassCastException e ) { getLog().error( "", e ); getLog().error( "Plugin Class Loaded by " + ScpWagon.class.getClassLoader() ); diff --git a/its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java b/its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java index 698c294062..5c03d7fd02 100644 --- a/its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java +++ b/its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java @@ -122,7 +122,7 @@ public class CoreItWagon throws TransferFailedException, ResourceDoesNotExistException { String resName = inputData.getResource().getName(); - if ( resName.endsWith( ".xml" ) ||resName.endsWith( ".md5" ) || resName.endsWith( ".sha1" ) ) + if ( resName.endsWith( ".xml" ) || resName.endsWith( ".md5" ) || resName.endsWith( ".sha1" ) ) { throw new ResourceDoesNotExistException( resName ); } diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java index e8ac3c4361..1b1b7f4b95 100644 --- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java +++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java @@ -86,9 +86,9 @@ public abstract class AbstractMavenIntegrationTestCase { versionRange = VersionRange.createFromVersionSpec( versionRangeStr ); } - catch ( InvalidVersionSpecificationException e) + catch ( InvalidVersionSpecificationException e ) { - throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRangeStr ).initCause( e ); + throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRangeStr, e ); } ArtifactVersion version = getMavenVersion(); @@ -177,9 +177,9 @@ public abstract class AbstractMavenIntegrationTestCase { versionRange = VersionRange.createFromVersionSpec( versionRangeStr ); } - catch ( InvalidVersionSpecificationException e) + catch ( InvalidVersionSpecificationException e ) { - throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRangeStr ).initCause( e ); + throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRangeStr, e ); } ArtifactVersion version = getMavenVersion(); @@ -256,7 +256,7 @@ public abstract class AbstractMavenIntegrationTestCase } catch ( InvalidVersionSpecificationException e ) { - throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRange ).initCause( e ); + throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRange, e ); } ArtifactVersion version = getJavaVersion(); @@ -283,7 +283,7 @@ public abstract class AbstractMavenIntegrationTestCase } catch ( InvalidVersionSpecificationException e ) { - throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRange ).initCause( e ); + throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRange, e ); } ArtifactVersion version = getMavenVersion(); @@ -304,9 +304,10 @@ public abstract class AbstractMavenIntegrationTestCase private class UnsupportedJavaVersionException extends RuntimeException { - + @SuppressWarnings( "checkstyle:visibilitymodifier" ) public ArtifactVersion javaVersion; + @SuppressWarnings( "checkstyle:visibilitymodifier" ) public VersionRange supportedRange; public UnsupportedJavaVersionException( ArtifactVersion javaVersion, VersionRange supportedRange ) @@ -320,9 +321,10 @@ public abstract class AbstractMavenIntegrationTestCase private class UnsupportedMavenVersionException extends RuntimeException { - + @SuppressWarnings( "checkstyle:visibilitymodifier" ) public ArtifactVersion mavenVersion; + @SuppressWarnings( "checkstyle:visibilitymodifier" ) public VersionRange supportedRange; public UnsupportedMavenVersionException( ArtifactVersion mavenVersion, VersionRange supportedRange ) @@ -444,7 +446,8 @@ public abstract class AbstractMavenIntegrationTestCase else { // - // Make is easier to run ITs from m2e in Maven IT mode without having to set any additional properties. + // Make is easier to run ITs from m2e in Maven IT mode without having to set any additional + // properties. // settingsFile = new File( "target/test-classes", settingsFile.getPath() ); } @@ -479,25 +482,25 @@ public abstract class AbstractMavenIntegrationTestCase return verifier; } - static public void assertCanonicalFileEquals( String message, File expected, File actual ) + public static void assertCanonicalFileEquals( String message, File expected, File actual ) throws IOException { assertEquals( message, expected.getCanonicalFile(), actual.getCanonicalFile() ); } - static public void assertCanonicalFileEquals( File expected, File actual ) + public static void assertCanonicalFileEquals( File expected, File actual ) throws IOException { assertCanonicalFileEquals( null, expected, actual ); } - static public void assertCanonicalFileEquals( String message, String expected, String actual ) + public static void assertCanonicalFileEquals( String message, String expected, String actual ) throws IOException { assertCanonicalFileEquals( message, new File( expected ), new File( actual ) ); } - static public void assertCanonicalFileEquals( String expected, String actual ) + public static void assertCanonicalFileEquals( String expected, String actual ) throws IOException { assertCanonicalFileEquals( null, new File( expected ), new File( actual ) ); diff --git a/its/pom.xml b/its/pom.xml index b6d0f9226d..ff0ff5374b 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven-parent - 22 + 26 ../pom/maven/pom.xml @@ -62,6 +62,7 @@ under the License. core-its ${user.home}/maven-sites + true @@ -79,37 +80,6 @@ under the License. - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.13 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 1.0 - - ${maven.site.cache}/${maven.site.path} - true - - - - - - apache.snapshots