You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/03/26 19:13:20 UTC
svn commit: r1085777 - in
/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency:
./ fromConfiguration/ resolvers/ treeSerializers/ utils/ utils/filters/
utils/markers/ utils/resolvers/
Author: hboutemy
Date: Sat Mar 26 18:13:19 2011
New Revision: 1085777
URL: http://svn.apache.org/viewvc?rev=1085777&view=rev
Log:
code formatting and simplification
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/ListMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/treeSerializers/GraphmlDependencyNodeVisitor.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java Sat Mar 26 18:13:19 2011
@@ -184,7 +184,7 @@ public abstract class AbstractAnalyzeMoj
}
catch ( Exception exception )
{
- throw new MojoExecutionException( "Failed to instantiate " + "ProjectDependencyAnalyser with role " + role
+ throw new MojoExecutionException( "Failed to instantiate ProjectDependencyAnalyser with role " + role
+ " / role-hint " + roleHint,exception );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java Sat Mar 26 18:13:19 2011
@@ -254,11 +254,11 @@ public abstract class AbstractDependency
filter.addFilter( new ProjectTransitivityFilter( project.getDependencyArtifacts(), this.excludeTransitive ) );
- filter.addFilter( new ScopeFilter( DependencyUtil.cleanToBeTokenizedString( this.includeScope ), DependencyUtil
- .cleanToBeTokenizedString( this.excludeScope ) ) );
+ filter.addFilter( new ScopeFilter( DependencyUtil.cleanToBeTokenizedString( this.includeScope ),
+ DependencyUtil.cleanToBeTokenizedString( this.excludeScope ) ) );
- filter.addFilter( new TypeFilter( DependencyUtil.cleanToBeTokenizedString( this.includeTypes ), DependencyUtil
- .cleanToBeTokenizedString( this.excludeTypes ) ) );
+ filter.addFilter( new TypeFilter( DependencyUtil.cleanToBeTokenizedString( this.includeTypes ),
+ DependencyUtil.cleanToBeTokenizedString( this.excludeTypes ) ) );
filter.addFilter( new ClassifierFilter( DependencyUtil.cleanToBeTokenizedString( this.includeClassifiers ),
DependencyUtil.cleanToBeTokenizedString( this.excludeClassifiers ) ) );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java Sat Mar 26 18:13:19 2011
@@ -97,7 +97,7 @@ public abstract class AbstractDependency
* @readonly
* @required
*/
- protected List remoteRepos;
+ protected List<ArtifactRepository> remoteRepos;
/**
* To look up Archiver/UnArchiver implementations
@@ -122,7 +122,7 @@ public abstract class AbstractDependency
* @required
* @readonly
*/
- protected List reactorProjects;
+ protected List<MavenProject> reactorProjects;
/**
* If the plugin should be silent.
@@ -149,7 +149,7 @@ public abstract class AbstractDependency
/**
* @return Returns the log.
*/
- public Log getLog ()
+ public Log getLog()
{
if ( silent )
{
@@ -166,7 +166,7 @@ public abstract class AbstractDependency
/**
* @return Returns the archiverManager.
*/
- public ArchiverManager getArchiverManager ()
+ public ArchiverManager getArchiverManager()
{
return this.archiverManager;
}
@@ -180,7 +180,7 @@ public abstract class AbstractDependency
* @throws MojoExecutionException with a message if an
* error occurs.
*/
- protected void copyFile ( File artifact, File destFile )
+ protected void copyFile( File artifact, File destFile )
throws MojoExecutionException
{
Log theLog = this.getLog();
@@ -198,7 +198,7 @@ public abstract class AbstractDependency
}
}
- protected void unpack ( File file, File location )
+ protected void unpack( File file, File location )
throws MojoExecutionException
{
unpack( file, location, null, null );
@@ -217,7 +217,7 @@ public abstract class AbstractDependency
* to exclude i.e. **/*.xml,
* **/*.properties
*/
- protected void unpack ( File file, File location, String includes, String excludes )
+ protected void unpack( File file, File location, String includes, String excludes )
throws MojoExecutionException
{
try
@@ -272,11 +272,9 @@ public abstract class AbstractDependency
}
}
- private void silenceUnarchiver ( UnArchiver unArchiver )
+ private void silenceUnarchiver( UnArchiver unArchiver )
{
- // dangerous but handle any errors. It's the only
- // way to silence the
- // unArchiver.
+ // dangerous but handle any errors. It's the only way to silence the unArchiver.
try
{
Field field = ReflectionUtils.getFieldByNameIncludingSuperclasses( "logger", unArchiver.getClass() );
@@ -287,15 +285,14 @@ public abstract class AbstractDependency
}
catch ( Exception e )
{
- // was a nice try. Don't bother logging because
- // the log is silent.
+ // was a nice try. Don't bother logging because the log is silent.
}
}
/**
* @return Returns the factory.
*/
- public org.apache.maven.artifact.factory.ArtifactFactory getFactory ()
+ public ArtifactFactory getFactory()
{
return this.factory;
}
@@ -303,7 +300,7 @@ public abstract class AbstractDependency
/**
* @param factory The factory to set.
*/
- public void setFactory ( org.apache.maven.artifact.factory.ArtifactFactory factory )
+ public void setFactory( ArtifactFactory factory )
{
this.factory = factory;
}
@@ -311,7 +308,7 @@ public abstract class AbstractDependency
/**
* @return Returns the project.
*/
- public MavenProject getProject ()
+ public MavenProject getProject()
{
return this.project;
}
@@ -319,7 +316,7 @@ public abstract class AbstractDependency
/**
* @return Returns the local.
*/
- protected org.apache.maven.artifact.repository.ArtifactRepository getLocal ()
+ protected ArtifactRepository getLocal()
{
return this.local;
}
@@ -327,7 +324,7 @@ public abstract class AbstractDependency
/**
* @param local The local to set.
*/
- public void setLocal ( org.apache.maven.artifact.repository.ArtifactRepository local )
+ public void setLocal( ArtifactRepository local )
{
this.local = local;
}
@@ -335,7 +332,7 @@ public abstract class AbstractDependency
/**
* @return Returns the remoteRepos.
*/
- public List getRemoteRepos ()
+ public List<ArtifactRepository> getRemoteRepos()
{
return this.remoteRepos;
}
@@ -343,7 +340,7 @@ public abstract class AbstractDependency
/**
* @param remoteRepos The remoteRepos to set.
*/
- public void setRemoteRepos ( List remoteRepos )
+ public void setRemoteRepos( List<ArtifactRepository> remoteRepos )
{
this.remoteRepos = remoteRepos;
}
@@ -351,7 +348,7 @@ public abstract class AbstractDependency
/**
* @return Returns the resolver.
*/
- public org.apache.maven.artifact.resolver.ArtifactResolver getResolver ()
+ public org.apache.maven.artifact.resolver.ArtifactResolver getResolver()
{
return this.resolver;
}
@@ -359,7 +356,7 @@ public abstract class AbstractDependency
/**
* @param resolver The resolver to set.
*/
- public void setResolver ( ArtifactResolver resolver )
+ public void setResolver( ArtifactResolver resolver )
{
this.resolver = resolver;
}
@@ -367,7 +364,7 @@ public abstract class AbstractDependency
/**
* @param archiverManager The archiverManager to set.
*/
- public void setArchiverManager ( ArchiverManager archiverManager )
+ public void setArchiverManager( ArchiverManager archiverManager )
{
this.archiverManager = archiverManager;
}
@@ -375,16 +372,15 @@ public abstract class AbstractDependency
/**
* @return Returns the artifactCollector.
*/
- public ArtifactCollector getArtifactCollector ()
+ public ArtifactCollector getArtifactCollector()
{
return this.artifactCollector;
}
/**
- * @param theArtifactCollector The artifactCollector to
- * set.
+ * @param theArtifactCollector The artifactCollector to set.
*/
- public void setArtifactCollector ( ArtifactCollector theArtifactCollector )
+ public void setArtifactCollector( ArtifactCollector theArtifactCollector )
{
this.artifactCollector = theArtifactCollector;
}
@@ -392,16 +388,15 @@ public abstract class AbstractDependency
/**
* @return Returns the artifactMetadataSource.
*/
- public ArtifactMetadataSource getArtifactMetadataSource ()
+ public ArtifactMetadataSource getArtifactMetadataSource()
{
return this.artifactMetadataSource;
}
/**
- * @param theArtifactMetadataSource The
- * artifactMetadataSource to set.
+ * @param theArtifactMetadataSource The artifactMetadataSource to set.
*/
- public void setArtifactMetadataSource ( ArtifactMetadataSource theArtifactMetadataSource )
+ public void setArtifactMetadataSource( ArtifactMetadataSource theArtifactMetadataSource )
{
this.artifactMetadataSource = theArtifactMetadataSource;
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java Sat Mar 26 18:13:19 2011
@@ -92,7 +92,7 @@ public abstract class AbstractFromDepend
/**
* Place each file in a separate subdirectory. (example
- * /outputDirectory/junit-3.8.1-jar)
+ * <code>/outputDirectory/junit-3.8.1-jar</code>)
*
* @since 2.0-alpha-1
* @parameter expression="${mdep.useSubDirectoryPerArtifact}"
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java Sat Mar 26 18:13:19 2011
@@ -298,8 +298,7 @@ public class AnalyzeDepMgt
}
/**
- * This function returns a string comparable with
- * Dependency.GetManagementKey.
+ * This function returns a string comparable with Dependency.GetManagementKey.
*
* @param artifact
* to gen the key for
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java Sat Mar 26 18:13:19 2011
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.dependen
* under the License.
*/
-import java.io.FileReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.HashSet;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java Sat Mar 26 18:13:19 2011
@@ -39,6 +39,7 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -170,23 +171,8 @@ public class BuildClasspathMojo
}
// initialize the separators.
- if ( StringUtils.isEmpty( fileSeparator ) )
- {
- isFileSepSet = false;
- }
- else
- {
- isFileSepSet = true;
- }
-
- if ( StringUtils.isEmpty( pathSeparator ) )
- {
- isPathSepSet = false;
- }
- else
- {
- isPathSepSet = true;
- }
+ isFileSepSet = StringUtils.isNotEmpty( fileSeparator );
+ isPathSepSet = StringUtils.isNotEmpty( pathSeparator );
//don't allow them to have absolute paths when they attach.
if ( attach && StringUtils.isEmpty( localRepoProperty ) )
@@ -323,44 +309,32 @@ public class BuildClasspathMojo
private void storeClasspathFile( String cpString, File out )
throws MojoExecutionException
{
-
//make sure the parent path exists.
out.getParentFile().mkdirs();
+ Writer w = null;
try
{
-
-
- Writer w = new BufferedWriter( new FileWriter( out ) );
-
- try
- {
- w.write( cpString );
-
- getLog().info( "Wrote classpath file '" + out + "'." );
- }
- catch ( IOException ex )
- {
- throw new MojoExecutionException( "Error while writting to classpath file '" + out + "': "
- + ex.toString(), ex );
- }
- finally
- {
- w.close();
- }
+ w = new BufferedWriter( new FileWriter( out ) );
+ w.write( cpString );
+ getLog().info( "Wrote classpath file '" + out + "'." );
}
catch ( IOException ex )
{
- throw new MojoExecutionException( "Error while opening/closing classpath file '" + out + "': "
+ throw new MojoExecutionException( "Error while writting to classpath file '" + out + "': "
+ ex.toString(), ex );
}
+ finally
+ {
+ IOUtil.close( w );
+ }
}
/**
* Reads into a string the file specified by the mojo param 'outputFile'. Assumes, the instance variable 'outputFile' is not
* null.
*
- * @return the string contained in the classpathFile, if exists, or null ortherwise.
+ * @return the string contained in the classpathFile, if exists, or null otherwise.
* @throws MojoExecutionException
*/
protected String readClasspathFile()
@@ -377,10 +351,11 @@ public class BuildClasspathMojo
return null;
}
StringBuffer sb = new StringBuffer();
- BufferedReader r = new BufferedReader( new FileReader( outputFile ) );
+ BufferedReader r = null;
try
{
+ r = new BufferedReader( new FileReader( outputFile ) );
String l;
while ( ( l = r.readLine() ) != null )
{
@@ -391,7 +366,7 @@ public class BuildClasspathMojo
}
finally
{
- r.close();
+ IOUtil.close( r );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java Sat Mar 26 18:13:19 2011
@@ -169,7 +169,9 @@ public class GetMojo
artifactId = tokens[1];
version = tokens[2];
if ( tokens.length == 4 )
+ {
packaging = tokens[3];
+ }
}
Artifact toDownload = artifactFactory.createBuildArtifact( groupId, artifactId, version, packaging );
Artifact dummyOriginatingArtifact =
@@ -190,6 +192,7 @@ public class GetMojo
List repoList = new ArrayList( pomRemoteRepositories );
if ( remoteRepositories != null )
{
+ // TODO: remote repositories as Strings?
repoList.addAll( Arrays.asList( StringUtils.split( remoteRepositories, "," ) ) );
}
@@ -204,7 +207,7 @@ public class GetMojo
}
else
{
- artifactResolver.resolve ( toDownload, repoList, localRepository );
+ artifactResolver.resolve( toDownload, repoList, localRepository );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/ListMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/ListMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/ListMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/ListMojo.java Sat Mar 26 18:13:19 2011
@@ -30,7 +30,8 @@ import org.apache.maven.plugin.dependenc
* @goal list
* @requiresDependencyResolution test
*/
-public class ListMojo extends ResolveDependenciesMojo
+public class ListMojo
+ extends ResolveDependenciesMojo
{
// alias for dependency:resolve
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java Sat Mar 26 18:13:19 2011
@@ -220,7 +220,7 @@ public class PurgeLocalRepositoryMojo
List<Dependency> dependencies = project.getDependencies();
- List remoteRepositories = Collections.EMPTY_LIST;
+ List<ArtifactRepository> remoteRepositories = Collections.emptyList();
Set<Artifact> dependencyArtifacts = new HashSet<Artifact>();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java Sat Mar 26 18:13:19 2011
@@ -25,7 +25,6 @@ import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -238,7 +237,8 @@ public class TreeMojo extends AbstractMo
/*
* @see org.apache.maven.plugin.Mojo#execute()
*/
- public void execute() throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
{
ArtifactVersion detectedMavenVersion = rti.getApplicationVersion();
@@ -249,12 +249,12 @@ public class TreeMojo extends AbstractMo
if ( !containsVersion( vr, detectedMavenVersion ) )
{
getLog().warn(
- "The tree mojo requires at least Maven 2.0.8 to function properly. You may get eroneous results on earlier versions" );
+ "The tree mojo requires at least Maven 2.0.8 to function properly. You may get erroneous results on earlier versions" );
}
}
catch ( InvalidVersionSpecificationException e )
{
- throw new MojoExecutionException( e.getLocalizedMessage() );
+ throw new MojoExecutionException( e.getLocalizedMessage(), e );
}
@@ -487,27 +487,21 @@ public class TreeMojo extends AbstractMo
*/
public static boolean containsVersion( VersionRange allowedRange, ArtifactVersion theVersion )
{
- boolean matched = false;
ArtifactVersion recommendedVersion = allowedRange.getRecommendedVersion();
if ( recommendedVersion == null )
{
-
- for ( Iterator<Restriction> i = allowedRange.getRestrictions().iterator(); i.hasNext() && !matched; )
+ List<Restriction> restrictions = allowedRange.getRestrictions();
+ for ( Restriction restriction : restrictions )
{
- Restriction restriction = i.next();
if ( restriction.containsVersion( theVersion ) )
{
- matched = true;
+ return true;
}
}
}
- else
- {
- // only singular versions ever have a recommendedVersion
- int compareTo = recommendedVersion.compareTo( theVersion );
- matched = ( compareTo <= 0 );
- }
- return matched;
+
+ // only singular versions ever have a recommendedVersion
+ return recommendedVersion.compareTo( theVersion ) <= 0;
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java Sat Mar 26 18:13:19 2011
@@ -45,7 +45,9 @@ public class UnpackDependenciesMojo
{
/**
* A comma separated list of file patterns to include when unpacking the
- * artifact. i.e. **\/*.xml,**\/*.properties NOTE: Excludes patterns override the includes. (component code = return isIncluded( name ) AND !isExcluded( name );)
+ * artifact. i.e. <code>**\/*.xml,**\/*.properties</code>
+ * NOTE: Excludes patterns override the includes.
+ * (component code = <code>return isIncluded( name ) AND !isExcluded( name );</code>)
* @since 2.0
* @parameter expression="${mdep.unpack.includes}"
*/
@@ -53,7 +55,9 @@ public class UnpackDependenciesMojo
/**
* A comma separated list of file patterns to exclude when unpacking the
- * artifact. i.e. **\/*.xml,**\/*.properties. NOTE: Excludes patterns override the includes. (component code = return isIncluded( name ) AND !isExcluded( name );)
+ * artifact. i.e. <code>**\/*.xml,**\/*.properties</code>
+ * NOTE: Excludes patterns override the includes.
+ * (component code = <code>return isIncluded( name ) AND !isExcluded( name );</code>)
* @since 2.0
* @parameter expression="${mdep.unpack.excludes}"
*/
@@ -101,7 +105,7 @@ public class UnpackDependenciesMojo
/**
* @return Returns a comma separated list of excluded items
*/
- public String getExcludes ()
+ public String getExcludes()
{
return DependencyUtil.cleanToBeTokenizedString( this.excludes );
}
@@ -109,9 +113,9 @@ public class UnpackDependenciesMojo
/**
* @param excludes
* A comma separated list of items to exclude
- * i.e. **\/*.xml, **\/*.properties
+ * i.e. <code>**\/*.xml, **\/*.properties</code>
*/
- public void setExcludes ( String excludes )
+ public void setExcludes( String excludes )
{
this.excludes = excludes;
}
@@ -127,9 +131,9 @@ public class UnpackDependenciesMojo
/**
* @param includes
* A comma separated list of items to include
- * i.e. **\/*.xml, **\/*.properties
+ * i.e. <code>**\/*.xml, **\/*.properties</code>
*/
- public void setIncludes ( String includes )
+ public void setIncludes( String includes )
{
this.includes = includes;
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java Sat Mar 26 18:13:19 2011
@@ -197,7 +197,7 @@ public abstract class AbstractFromConfig
}
/**
- * Resolves the Artifact from the remote repository if nessessary. If no version is specified, it will be retrieved
+ * Resolves the Artifact from the remote repository if necessary. If no version is specified, it will be retrieved
* from the dependency list or from the DependencyManagement section of the pom.
*
* @param artifactItem containing information about artifact from plugin configuration.
@@ -239,8 +239,7 @@ public abstract class AbstractFromConfig
try
{
- // mdep-50 - rolledback for now because it's breaking some
- // functionality.
+ // mdep-50 - rolledback for now because it's breaking some functionality.
/*
* List listeners = new ArrayList(); Set theSet = new HashSet(); theSet.add( artifact );
* ArtifactResolutionResult artifactResolutionResult = artifactCollector.collect( theSet, project
@@ -275,14 +274,13 @@ public abstract class AbstractFromConfig
private void fillMissingArtifactVersion( ArtifactItem artifact )
throws MojoExecutionException
{
- if ( !findDependencyVersion( artifact, project.getDependencies(), false )
- && ( project.getDependencyManagement() == null || !findDependencyVersion( artifact,
- project.getDependencyManagement().getDependencies(),
- false ) )
- && !findDependencyVersion( artifact, project.getDependencies(), true )
- && ( project.getDependencyManagement() == null || !findDependencyVersion( artifact,
- project.getDependencyManagement().getDependencies(),
- true ) ) )
+ List<Dependency> deps = project.getDependencies();
+ List<Dependency> depMngt = project.getDependencyManagement().getDependencies();
+
+ if ( !findDependencyVersion( artifact, deps, false )
+ && ( project.getDependencyManagement() == null || !findDependencyVersion( artifact, depMngt, false ) )
+ && !findDependencyVersion( artifact, deps, true )
+ && ( project.getDependencyManagement() == null || !findDependencyVersion( artifact, depMngt, true ) ) )
{
throw new MojoExecutionException( "Unable to find artifact version of " + artifact.getGroupId() + ":"
+ artifact.getArtifactId() + " in either dependency list or in project's dependency management." );
@@ -300,8 +298,6 @@ public abstract class AbstractFromConfig
*/
private boolean findDependencyVersion( ArtifactItem artifact, List<Dependency> dependencies, boolean looseMatch )
{
- boolean result = false;
-
for ( Dependency dependency : dependencies )
{
if ( StringUtils.equals( dependency.getArtifactId(), artifact.getArtifactId() )
@@ -309,15 +305,13 @@ public abstract class AbstractFromConfig
&& ( looseMatch || StringUtils.equals( dependency.getClassifier(), artifact.getClassifier() ) )
&& ( looseMatch || StringUtils.equals( dependency.getType(), artifact.getType() ) ) )
{
-
artifact.setVersion( dependency.getVersion() );
- result = true;
- break;
+ return true;
}
}
- return result;
+ return false;
}
/*
@@ -344,21 +338,22 @@ public abstract class AbstractFromConfig
return this.overrideLocalRepository;
}
+ ArtifactRepository local = super.getLocal();
+
if ( this.localRepositoryDirectory != null )
{
// create a new local repo using existing layout, snapshots, and releases policy
+ String url = "file://" + this.localRepositoryDirectory.getAbsolutePath();
this.overrideLocalRepository =
- artifactRepositoryManager.createArtifactRepository( super.getLocal().getId(), "file://"
- + this.localRepositoryDirectory.getAbsolutePath(), super.getLocal().getLayout(),
- super.getLocal().getSnapshots(),
- super.getLocal().getReleases() );
+ artifactRepositoryManager.createArtifactRepository( local.getId(), url, local.getLayout(),
+ local.getSnapshots(), local.getReleases() );
this.getLog().debug( "Execution local repository is at: " + this.overrideLocalRepository.getBasedir() );
-
- return this.overrideLocalRepository;
}
-
- this.overrideLocalRepository = super.getLocal();
+ else
+ {
+ this.overrideLocalRepository = local;
+ }
return this.overrideLocalRepository;
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java Sat Mar 26 18:13:19 2011
@@ -131,14 +131,11 @@ public class ArtifactItem
private String filterEmptyString( String in )
{
- if ( in == null || in.equals( "" ) )
+ if ( "".equals( in ) )
{
return null;
}
- else
- {
- return in;
- }
+ return in;
}
/**
@@ -334,8 +331,8 @@ public class ArtifactItem
/**
* @param excludes
- * A comma seperated list of items to exclude
- * i.e. **\/*.xml, **\/*.properties
+ * A comma separated list of items to exclude
+ * i.e. <code>**\/*.xml, **\/*.properties</code>
*/
public void setExcludes ( String excludes )
{
@@ -343,7 +340,7 @@ public class ArtifactItem
}
/**
- * @return Returns a comma seperated list of included items
+ * @return Returns a comma separated list of included items
*/
public String getIncludes()
{
@@ -352,8 +349,8 @@ public class ArtifactItem
/**
* @param includes
- * A comma seperated list of items to inmclude
- * i.e. **\/*.xml, **\/*.properties
+ * A comma separated list of items to include
+ * i.e. <code>**\/*.xml, **\/*.properties</code>
*/
public void setIncludes ( String includes )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java Sat Mar 26 18:13:19 2011
@@ -59,19 +59,21 @@ public class CopyMojo
public void execute()
throws MojoExecutionException
{
- if ( !isSkip() )
+ if ( isSkip() )
{
- List<ArtifactItem> theArtifactItems = getProcessedArtifactItems( this.stripVersion );
- for ( ArtifactItem artifactItem : theArtifactItems )
+ return;
+ }
+
+ List<ArtifactItem> theArtifactItems = getProcessedArtifactItems( this.stripVersion );
+ for ( ArtifactItem artifactItem : theArtifactItems )
+ {
+ if ( artifactItem.isNeedsProcessing() )
+ {
+ copyArtifact( artifactItem );
+ }
+ else
{
- if ( artifactItem.isNeedsProcessing() )
- {
- copyArtifact( artifactItem );
- }
- else
- {
- this.getLog().info( artifactItem + " already exists in " + artifactItem.getOutputDirectory() );
- }
+ this.getLog().info( artifactItem + " already exists in " + artifactItem.getOutputDirectory() );
}
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java Sat Mar 26 18:13:19 2011
@@ -81,19 +81,21 @@ public final class UnpackMojo
public void execute()
throws MojoExecutionException
{
- if ( !isSkip() )
+ if ( isSkip() )
{
- List<ArtifactItem> processedItems = getProcessedArtifactItems( false );
- for ( ArtifactItem artifactItem : processedItems )
+ return;
+ }
+
+ List<ArtifactItem> processedItems = getProcessedArtifactItems( false );
+ for ( ArtifactItem artifactItem : processedItems )
+ {
+ if ( artifactItem.isNeedsProcessing() )
+ {
+ unpackArtifact( artifactItem );
+ }
+ else
{
- if ( artifactItem.isNeedsProcessing() )
- {
- unpackArtifact( artifactItem );
- }
- else
- {
- this.getLog().info( artifactItem.getArtifact().getFile().getName() + " already unpacked." );
- }
+ this.getLog().info( artifactItem.getArtifact().getFile().getName() + " already unpacked." );
}
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java Sat Mar 26 18:13:19 2011
@@ -66,7 +66,6 @@ public class GoOfflineMojo
protected ArtifactsFilter getMarkedArtifactFilter()
{
- // TODO Auto-generated method stub
return null;
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java Sat Mar 26 18:13:19 2011
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.dependen
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -55,15 +56,14 @@ public class ListRepositoriesMojo
{
try
{
- ArtifactResolutionResult result = this.artifactCollector.collect(
- project.getArtifacts(), project.getArtifact(), this.getLocal(),
- this.remoteRepos, this.artifactMetadataSource,
- new ScopeArtifactFilter( Artifact.SCOPE_TEST ),
- new ArrayList() );
- HashSet repos = new HashSet();
- for ( Iterator<ResolutionNode> i = result.getArtifactResolutionNodes().iterator(); i.hasNext(); )
+ ArtifactResolutionResult result =
+ this.artifactCollector.collect( project.getArtifacts(), project.getArtifact(), this.getLocal(),
+ this.remoteRepos, this.artifactMetadataSource,
+ new ScopeArtifactFilter( Artifact.SCOPE_TEST ), new ArrayList() );
+ Set repos = new HashSet();
+ Set<ResolutionNode> nodes = result.getArtifactResolutionNodes();
+ for ( ResolutionNode node : nodes )
{
- ResolutionNode node = i.next();
repos.addAll( node.getRemoteRepositories() );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java Sat Mar 26 18:13:19 2011
@@ -187,7 +187,6 @@ public class ResolvePluginsMojo
protected ArtifactsFilter getMarkedArtifactFilter()
{
- // TODO Auto-generated method stub
return null;
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/treeSerializers/GraphmlDependencyNodeVisitor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/treeSerializers/GraphmlDependencyNodeVisitor.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/treeSerializers/GraphmlDependencyNodeVisitor.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/treeSerializers/GraphmlDependencyNodeVisitor.java Sat Mar 26 18:13:19 2011
@@ -39,7 +39,8 @@ public class GraphmlDependencyNodeVisito
* Graphml xml file header. Define Schema and root element. We also define 2 key as meta data.
*/
private static final String GRAPHML_HEADER =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?> " + "<graphml xmlns=\"http://graphml.graphdrawing.org/xmlns\" "
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?> "
+ + "<graphml xmlns=\"http://graphml.graphdrawing.org/xmlns\" "
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
+ "xmlns:y=\"http://www.yworks.com/xml/graphml\" "
+ "xsi:schemaLocation=\"http://graphml.graphdrawing.org/xmlns "
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java Sat Mar 26 18:13:19 2011
@@ -100,85 +100,61 @@ public class DependencySilentLog
public void debug( String message )
{
- // TODO Auto-generated method stub
-
}
public void debug( String message, Throwable throwable )
{
- // TODO Auto-generated method stub
-
}
public void info( String message )
{
- // TODO Auto-generated method stub
-
}
public void info( String message, Throwable throwable )
{
- // TODO Auto-generated method stub
-
}
public void warn( String message )
{
- // TODO Auto-generated method stub
-
}
public void warn( String message, Throwable throwable )
{
- // TODO Auto-generated method stub
-
}
public void error( String message )
{
- // TODO Auto-generated method stub
-
}
public void error( String message, Throwable throwable )
{
- // TODO Auto-generated method stub
-
}
public void fatalError( String message )
{
- // TODO Auto-generated method stub
-
}
public void fatalError( String message, Throwable throwable )
{
- // TODO Auto-generated method stub
-
}
public boolean isFatalErrorEnabled()
{
- // TODO Auto-generated method stub
return false;
}
public Logger getChildLogger( String name )
{
- // TODO Auto-generated method stub
return null;
}
public int getThreshold()
{
- // TODO Auto-generated method stub
return 0;
}
public String getName()
{
- // TODO Auto-generated method stub
return null;
}
@@ -187,7 +163,5 @@ public class DependencySilentLog
*/
public void setThreshold( int theThreshold )
{
- // TODO Auto-generated method stub
-
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java Sat Mar 26 18:13:19 2011
@@ -27,6 +27,7 @@ import java.io.StringReader;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -47,8 +48,9 @@ public final class DependencyUtil
* @return Formatted file name in the format artifactId-[version]-[classifier].[type]
* @see {@link #getFormattedFileName(Artifact, boolean, boolean)}.
*/
- public static String getFormattedFileName( Artifact artifact, boolean removeVersion ) {
- return getFormattedFileName( artifact, removeVersion , false);
+ public static String getFormattedFileName( Artifact artifact, boolean removeVersion )
+ {
+ return getFormattedFileName( artifact, removeVersion, false );
}
/**
@@ -66,13 +68,13 @@ public final class DependencyUtil
* @return Formatted file name in the format
* [groupId].artifactId-[version]-[classifier].[type]
*/
- public static String getFormattedFileName( Artifact artifact, boolean removeVersion,
- boolean prependGroupId)
+ public static String getFormattedFileName( Artifact artifact, boolean removeVersion, boolean prependGroupId )
{
StringBuffer destFileName = new StringBuffer();
- if (prependGroupId) {
- destFileName.append(artifact.getGroupId()).append(".");
+ if ( prependGroupId )
+ {
+ destFileName.append( artifact.getGroupId() ).append( "." );
}
String versionString = null;
@@ -91,9 +93,9 @@ public final class DependencyUtil
{
classifierString = "-" + artifact.getClassifier();
}
- destFileName.append(artifact.getArtifactId()).append(versionString);
- destFileName.append(classifierString).append(".");
- destFileName.append(artifact.getArtifactHandler().getExtension());
+ destFileName.append( artifact.getArtifactId() ).append( versionString );
+ destFileName.append( classifierString ).append( "." );
+ destFileName.append( artifact.getArtifactHandler().getExtension() );
return destFileName.toString();
}
@@ -103,7 +105,7 @@ public final class DependencyUtil
*
* @param useSubdirsPerType if a new sub directory should be used for each type.
* @param useSubdirPerArtifact if a new sub directory should be used for each artifact.
- * @param useRepositoryLayout if dependendies must be moved into a Maven repository layout, if set, other settings
+ * @param useRepositoryLayout if dependencies must be moved into a Maven repository layout, if set, other settings
* will be ignored.
* @param removeVersion if the version must not be mentioned in the filename
* @param outputDirectory base outputDirectory.
@@ -198,17 +200,7 @@ public final class DependencyUtil
}
finally
{
- if ( writer != null )
- {
- try
- {
- writer.close();
- }
- catch ( IOException exception )
- {
- log.error( "Cannot close file", exception );
- }
- }
+ IOUtil.close( writer );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java Sat Mar 26 18:13:19 2011
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.dependen
import java.io.File;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -94,13 +93,11 @@ public class DestFileFilter
public Set filter( Set artifacts )
throws ArtifactFilterException
{
+ Set<Artifact> artifacts_ = artifacts;
Set<Artifact> result = new HashSet<Artifact>();
-
- Iterator<Artifact> iter = artifacts.iterator();
- while ( iter.hasNext() )
+ for( Artifact artifact : artifacts_ )
{
- Artifact artifact = iter.next();
if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
result.add( artifact );
@@ -249,15 +246,11 @@ public class DestFileFilter
public boolean isArtifactIncluded( ArtifactItem item )
{
- boolean overWrite = false;
- boolean result = false;
Artifact artifact = item.getArtifact();
- if ( ( artifact.isSnapshot() && this.overWriteSnapshots )
- || ( !artifact.isSnapshot() && this.overWriteReleases ) )
- {
- overWrite = true;
- }
+ boolean overWrite =
+ ( artifact.isSnapshot() && this.overWriteSnapshots )
+ || ( !artifact.isSnapshot() && this.overWriteReleases );
File destFolder = item.getOutputDirectory();
if ( destFolder == null )
@@ -277,12 +270,8 @@ public class DestFileFilter
destFile = new File( destFolder, item.getDestFileName() );
}
- if ( overWrite
- || ( !destFile.exists() || ( overWriteIfNewer && artifact.getFile().lastModified() > destFile
- .lastModified() ) ) )
- {
- result = true;
- }
- return result;
+ return overWrite
+ || ( !destFile.exists()
+ || ( overWriteIfNewer && artifact.getFile().lastModified() > destFile.lastModified() ) );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java Sat Mar 26 18:13:19 2011
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.dependen
*/
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -65,13 +64,11 @@ public class MarkerFileFilter
public Set filter( Set artifacts )
throws ArtifactFilterException
{
+ Set<Artifact> artifacts_ = artifacts;
Set<Artifact> result = new HashSet<Artifact>();
-
- Iterator<Artifact> iter = artifacts.iterator();
-
- while ( iter.hasNext() )
+
+ for( Artifact artifact : artifacts_ )
{
- Artifact artifact = iter.next();
if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
result.add( artifact );
@@ -84,29 +81,20 @@ public class MarkerFileFilter
throws ArtifactFilterException
{
Artifact artifact = item.getArtifact();
- boolean overWrite = false;
- boolean result = false;
- if ( ( artifact.isSnapshot() && this.overWriteSnapshots )
- || ( !artifact.isSnapshot() && this.overWriteReleases ) )
- {
- overWrite = true;
- }
+
+ boolean overWrite = ( artifact.isSnapshot() && this.overWriteSnapshots )
+ || ( !artifact.isSnapshot() && this.overWriteReleases );
handler.setArtifact( artifact );
try
{
- if ( overWrite || ( !handler.isMarkerSet() || ( overWriteIfNewer && handler.isMarkerOlder( artifact ) ) ) )
- {
- result = true;
- }
+ return overWrite || ( !handler.isMarkerSet() || ( overWriteIfNewer && handler.isMarkerOlder( artifact ) ) );
}
catch ( MojoExecutionException e )
{
throw new ArtifactFilterException( e.getMessage(), e );
}
-
- return result;
}
/**
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java Sat Mar 26 18:13:19 2011
@@ -37,7 +37,8 @@ public class ResolveFileFilter
super( true, true, true, handler );
}
- public boolean isArtifactIncluded( ArtifactItem item ) throws ArtifactFilterException
+ public boolean isArtifactIncluded( ArtifactItem item )
+ throws ArtifactFilterException
{
handler.setArtifact( item.getArtifact() );
try
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java Sat Mar 26 18:13:19 2011
@@ -87,7 +87,7 @@ public class DefaultFileMarkerHandler
else
{
// if the marker doesn't exist, we want to copy so assume it is
- // infinately older
+ // infinitely older
return true;
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java Sat Mar 26 18:13:19 2011
@@ -118,7 +118,7 @@ public class SourcesFileMarkerHandler
else
{
// if the marker doesn't exist, we want to copy so assume it is
- // infinately older
+ // infinitely older
return true;
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java?rev=1085777&r1=1085776&r2=1085777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java Sat Mar 26 18:13:19 2011
@@ -42,12 +42,12 @@ public class DefaultArtifactsResolver
ArtifactRepository local;
- List remoteRepositories;
+ List<ArtifactRepository> remoteRepositories;
boolean stopOnFailure;
public DefaultArtifactsResolver( ArtifactResolver theResolver, ArtifactRepository theLocal,
- List theRemoteRepositories, boolean theStopOnFailure )
+ List<ArtifactRepository> theRemoteRepositories, boolean theStopOnFailure )
{
this.resolver = theResolver;
this.local = theLocal;