You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/26 17:49:35 UTC
svn commit: r1517569 [3/3] - in /maven/plugins/trunk:
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/
maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/arc...
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ import org.apache.maven.plugin.testing.s
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.artifact.Artifact;
import org.codehaus.plexus.util.ReaderFactory;
import java.util.List;
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java Mon Aug 26 15:49:32 2013
@@ -23,7 +23,6 @@ import org.apache.maven.plugin.testing.s
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.artifact.Artifact;
import org.codehaus.plexus.util.ReaderFactory;
import java.util.List;
Modified: maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project009Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project009Stub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project009Stub.java (original)
+++ maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project009Stub.java Mon Aug 26 15:49:32 2013
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.source.s
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java Mon Aug 26 15:49:32 2013
@@ -57,7 +57,6 @@ import java.io.Writer;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
Modified: maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java Mon Aug 26 15:49:32 2013
@@ -116,7 +116,7 @@ public class ToolchainMojo
buff.append(" [");
while (it2.hasNext()) {
String string = (String) it2.next();
- buff.append(" " + string + "='" + params.get(string) + "' ");
+ buff.append(" ").append(string).append("='").append(params.get(string)).append("' ");
}
buff.append(']');
}
Modified: maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java (original)
+++ maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java Mon Aug 26 15:49:32 2013
@@ -21,8 +21,6 @@ package org.apache.maven.plugin.verifier
import org.apache.maven.plugin.logging.Log;
-import java.util.Iterator;
-
public class ConsoleVerificationResultPrinter
implements VerificationResultPrinter
{
Modified: maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java (original)
+++ maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java Mon Aug 26 15:49:32 2013
@@ -109,21 +109,14 @@ public class VerifierMojo
VerificationsXpp3Reader xppReader = new VerificationsXpp3Reader();
Verifications verifications = xppReader.read( reader );
- for ( Iterator i = verifications.getFiles().iterator(); i.hasNext(); )
- {
- org.apache.maven.plugin.verifier.model.File file =
- (org.apache.maven.plugin.verifier.model.File) i.next();
-
+ for (org.apache.maven.plugin.verifier.model.File file : verifications.getFiles()) {
// Transform the file to check into an absolute path prefixing the basedir if
// the location is relative
- if ( file.getLocation() != null )
- {
- file.setLocation( getAbsoluteFileToCheck( new File( file.getLocation() ) ).getPath() );
- verifyFile( file, results );
- }
- else
- {
- throw new MojoExecutionException( "Missing <location> element" );
+ if (file.getLocation() != null) {
+ file.setLocation(getAbsoluteFileToCheck(new File(file.getLocation())).getPath());
+ verifyFile(file, results);
+ } else {
+ throw new MojoExecutionException("Missing <location> element");
}
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Mon Aug 26 15:49:32 2013
@@ -373,7 +373,7 @@ public abstract class AbstractWarMojo
excludeList.add( "**/" + META_INF + "/" + containerConfigXML.getName() );
}
- return (String[]) excludeList.toArray(new String[excludeList.size()]);
+ return excludeList.toArray(new String[excludeList.size()]);
}
/**
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java Mon Aug 26 15:49:32 2013
@@ -124,7 +124,7 @@ public class OverlayManager
final ListIterator<Overlay> it = overlays.listIterator();
while ( it.hasNext() )
{
- Overlay overlay = (Overlay) it.next();
+ Overlay overlay = it.next();
if ( overlay == null )
{
throw new InvalidOverlayConfigurationException( "overlay could not be null." );
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java Mon Aug 26 15:49:32 2013
@@ -24,8 +24,6 @@ import org.apache.maven.model.Dependency
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-import java.util.Iterator;
-
/**
*
* @author Stephane Nicoll
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java Mon Aug 26 15:49:32 2013
@@ -286,7 +286,7 @@ public class WebappStructure
*/
public PathSet getStructure( String id )
{
- PathSet pathSet = (PathSet) registeredFiles.get( id );
+ PathSet pathSet = registeredFiles.get( id );
if ( pathSet == null )
{
pathSet = new PathSet();
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java Mon Aug 26 15:49:32 2013
@@ -32,8 +32,6 @@ import org.codehaus.plexus.util.FileUtil
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
public abstract class AbstractWarMojoTest
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java?rev=1517569&r1=1517568&r2=1517569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java Mon Aug 26 15:49:32 2013
@@ -24,7 +24,6 @@ import org.apache.maven.model.Dependency
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;