You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/04/14 22:55:17 UTC
svn commit: r1326204 - in
/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker:
AbstractInvokerMojo.java CompositeMap.java FileLogger.java InstallMojo.java
Author: olamy
Date: Sat Apr 14 20:55:16 2012
New Revision: 1326204
URL: http://svn.apache.org/viewvc?rev=1326204&view=rev
Log:
[MINVOKER-129] Code cleanups
Submitted by Anders Hammar.
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/CompositeMap.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.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=1326204&r1=1326203&r2=1326204&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Sat Apr 14 20:55:16 2012
@@ -771,11 +771,11 @@ public abstract class AbstractInvokerMoj
Collection<String> modulePaths = new LinkedHashSet<String>();
- modulePaths.addAll( model.getModules() );
+ modulePaths.addAll( (List<String>) model.getModules() );
for ( Profile profile : (List<Profile>) model.getProfiles() )
{
- modulePaths.addAll( profile.getModules() );
+ modulePaths.addAll( (List<String>) profile.getModules() );
}
for ( String modulePath : modulePaths )
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java?rev=1326204&r1=1326203&r2=1326204&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java Sat Apr 14 20:55:16 2012
@@ -20,8 +20,8 @@ package org.apache.maven.plugin.invoker;
*/
import java.util.Collection;
+import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import org.apache.maven.project.MavenProject;
@@ -62,7 +62,7 @@ class CompositeMap
throw new IllegalArgumentException( "no project specified" );
}
this.mavenProject = mavenProject;
- this.properties = properties == null ? (Map) new Properties() : properties;
+ this.properties = properties == null ? new HashMap<String, Object>() : properties;
}
/**
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java?rev=1326204&r1=1326203&r2=1326204&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java Sat Apr 14 20:55:16 2012
@@ -19,15 +19,12 @@ package org.apache.maven.plugin.invoker;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.shared.invoker.InvocationOutputHandler;
import org.apache.maven.shared.scriptinterpreter.ExecutionLogger;
-import org.codehaus.plexus.util.IOUtil;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
/**
* @version $Id$
@@ -37,7 +34,6 @@ class FileLogger
implements InvocationOutputHandler, ExecutionLogger
{
-
/**
* Creates a new logger that writes to the specified file.
*
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=1326204&r1=1326203&r2=1326204&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 Sat Apr 14 20:55:16 2012
@@ -369,7 +369,7 @@ public class InstallMojo
}
// Install any attached project artifacts
- Collection<Artifact> attachedArtifacts = mvnProject.getAttachedArtifacts();
+ Collection<Artifact> attachedArtifacts = (Collection<Artifact>) mvnProject.getAttachedArtifacts();
for ( Artifact attachedArtifact : attachedArtifacts )
{
installArtifact( attachedArtifact.getFile(), attachedArtifact, testRepository );
@@ -465,7 +465,7 @@ public class InstallMojo
}
// group transitive dependencies (even those that don't contribute to the class path like POMs) ...
- Collection<Artifact> artifacts = mvnProject.getArtifacts();
+ Collection<Artifact> artifacts = (Collection<Artifact>) mvnProject.getArtifacts();
// ... into dependencies that were resolved from reactor projects ...
Collection<String> dependencyProjects = new LinkedHashSet<String>();
// ... and those that were resolved from the (local) repo