Author: hboutemy
Date: Sun Nov 16 22:10:23 2014
New Revision: 1640038
URL: http://svn.apache.org/r1640038
Log:
updated parent pom and fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
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/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.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/ProcessArtifactItemsRequest.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.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/tree/DOTDependencyNodeVisitor.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.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
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sun Nov 16 22:10:23 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -81,7 +81,6 @@ under the License.
<mavenVersion>2.2.1</mavenVersion>
<doxiaVersion>1.4</doxiaVersion>
<pluginTestingVersion>2.1</pluginTestingVersion>
- <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
</properties>
<dependencies>
@@ -217,7 +216,6 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <scope>provided</scope>
</dependency>
<!-- test -->
@@ -265,23 +263,6 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginPluginVersion}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <phase>process-classes</phase>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
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=1640038&r1=1640037&r2=1640038&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
Sun Nov 16 22:10:23 2014
@@ -48,8 +48,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Resolves a single artifact, eventually transitively, from the specified
remote repositories. Caveat: will always check the
- * central repository defined in the super pom. You could use a mirror entry
in your settings.xml
+ * Resolves a single artifact, eventually transitively, from the specified
remote repositories.
+ * Caveat: will always check thecentral repository defined in the super pom.
You could use a mirror entry in your
+ * <code>settings.xml</code>
*/
@Mojo( name = "get", requiresProject = false, threadSafe = true )
public class GetMojo
@@ -320,7 +321,7 @@ public class GetMojo
String url = repo;
// if it's an extended repo URL of the form id::layout::url
- if (repo.contains("::"))
+ if ( repo.contains( "::" ) )
{
Matcher matcher = ALT_REPO_SYNTAX_PATTERN.matcher( repo );
if ( !matcher.matches() )
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=1640038&r1=1640037&r2=1640038&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
Sun Nov 16 22:10:23 2014
@@ -421,7 +421,7 @@ public class PurgeLocalRepositoryMojo
for ( int i = 1; i < pathComponents.length; ++i )
{
- path.append("/").append(pathComponents[i]);
+ path.append( "/" ).append( pathComponents[i] );
}
return path.toString();
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
Sun Nov 16 22:10:23 2014
@@ -377,7 +377,10 @@ public abstract class AbstractAnalyzeMoj
// called because artifact will set the version to -SNAPSHOT
only if I do this. MNG-2961
artifact.isSnapshot();
-
buf.append(scriptableFlag).append(":").append(pomFile).append(":").append(artifact.getDependencyConflictId()).append(":").append(artifact.getClassifier()).append(":").append(artifact.getBaseVersion()).append(":").append(artifact.getScope()).append("\n");
+ buf.append( scriptableFlag ).append( ":" ).append( pomFile
).append( ":" )
+ .append( artifact.getDependencyConflictId() ).append( ":"
).append( artifact.getClassifier() )
+ .append( ":" ).append( artifact.getBaseVersion() ).append(
":" ).append( artifact.getScope() )
+ .append( "\n" );
}
getLog().info( "\n" + buf );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
Sun Nov 16 22:10:23 2014
@@ -117,7 +117,7 @@ public class AnalyzeDuplicateMojo
{
String dup = it.next();
- sb.append("\to ").append(dup);
+ sb.append( "\to " ).append( dup );
if ( it.hasNext() )
{
sb.append( "\n" );
@@ -131,13 +131,12 @@ public class AnalyzeDuplicateMojo
{
sb.append( "\n" );
}
- sb.append(
- "List of duplicate dependencies defined in
<dependencyManagement/> in " + "your pom.xml:\n" );
+ sb.append( "List of duplicate dependencies defined in
<dependencyManagement/> in your pom.xml:\n" );
for ( Iterator<String> it =
duplicateDependenciesManagement.iterator(); it.hasNext(); )
{
String dup = it.next();
- sb.append("\to ").append(dup);
+ sb.append( "\to " ).append( dup );
if ( it.hasNext() )
{
sb.append( "\n" );
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=1640038&r1=1640037&r2=1640038&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
Sun Nov 16 22:10:23 2014
@@ -102,8 +102,9 @@ public class CopyMojo
{
verifyRequirements();
- List<ArtifactItem> theArtifactItems = getProcessedArtifactItems(
- new ProcessArtifactItemsRequest( this.stripVersion,
this.prependGroupId, this.useBaseVersion, this.stripClassifier ) );
+ List<ArtifactItem> theArtifactItems =
+ getProcessedArtifactItems( new ProcessArtifactItemsRequest(
stripVersion, prependGroupId,
+
useBaseVersion, stripClassifier ) );
for ( ArtifactItem artifactItem : theArtifactItems )
{
if ( artifactItem.isNeedsProcessing() )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ProcessArtifactItemsRequest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ProcessArtifactItemsRequest.java?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ProcessArtifactItemsRequest.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ProcessArtifactItemsRequest.java
Sun Nov 16 22:10:23 2014
@@ -50,7 +50,8 @@ public class ProcessArtifactItemsRequest
// no op
}
- public ProcessArtifactItemsRequest( boolean removeVersion, boolean
prependGroupId, boolean useBaseVersion, boolean removeClassifier )
+ public ProcessArtifactItemsRequest( boolean removeVersion, boolean
prependGroupId, boolean useBaseVersion,
+ boolean removeClassifier )
{
this.removeVersion = removeVersion;
this.prependGroupId = prependGroupId;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
Sun Nov 16 22:10:23 2014
@@ -230,7 +230,7 @@ public class BuildClasspathMojo
while ( i.hasNext() )
{
sb.append( isPathSepSet ? this.pathSeparator :
File.pathSeparator );
- appendArtifactPath(i.next(), sb );
+ appendArtifactPath( i.next(), sb );
}
}
@@ -313,7 +313,8 @@ public class BuildClasspathMojo
// TODO: add param for prepending groupId and version.
sb.append( prefix );
sb.append( File.separator );
- sb.append( DependencyUtil.getFormattedFileName( art,
this.stripVersion, this.prependGroupId, this.useBaseVersion,
this.stripClassifier ) );
+ sb.append( DependencyUtil.getFormattedFileName( art,
this.stripVersion, this.prependGroupId,
+
this.useBaseVersion, this.stripClassifier ) );
}
}
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=1640038&r1=1640037&r2=1640038&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
Sun Nov 16 22:10:23 2014
@@ -180,20 +180,19 @@ public class ResolvePluginsMojo
// final ArtifactFilter filter = getPluginFilter();
for ( final Artifact artifact : new HashSet<Artifact>( artifacts ) )
{
- // if ( !filter.include( artifact ) )
- // {
- // final String logStr =
- // String.format( " Plugin SKIPPED: %s",
DependencyUtil.getFormattedFileName( artifact, false ) );
+ // if ( !filter.include( artifact ) )
+ // {
+ // final String logStr =
+ // String.format( " Plugin SKIPPED: %s",
DependencyUtil.getFormattedFileName( artifact, false ) );
//
- // if ( !silent )
- // {
- // this.getLog()
- // .info( logStr );
- // }
+ // if ( !silent )
+ // {
+ // this.getLog().info( logStr );
+ // }
//
- // artifacts.remove( artifact );
- // continue;
- // }
+ // artifacts.remove( artifact );
+ // continue;
+ // }
// resolve the new artifact
this.resolver.resolve( artifact, this.remotePluginRepositories,
this.getLocal() );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
Sun Nov 16 22:10:23 2014
@@ -64,7 +64,7 @@ public class DOTDependencyNodeVisitor
for ( DependencyNode child : children )
{
- writer.println("\t\"" + node.toNodeString() + "\" -> \"" +
child.toNodeString() + "\" ; ");
+ writer.println( "\t\"" + node.toNodeString() + "\" -> \"" +
child.toNodeString() + "\" ; " );
}
return true;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
Sun Nov 16 22:10:23 2014
@@ -390,14 +390,16 @@ public class TreeMojo
{
StringWriter writer = new StringWriter();
+ final TreeTokens treeTokens = toTreeTokens( tokens );
org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor visitor
=
new
org.apache.maven.shared.dependency.tree.traversal.SerializingDependencyNodeVisitor(
writer,
-
toTreeTokens( tokens ) );
+
treeTokens );
// TODO: remove the need for this when the serializer can calculate
last nodes from visitor calls only
visitor = new
org.apache.maven.shared.dependency.tree.traversal.BuildingDependencyNodeVisitor(
visitor );
- org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter
filter = createVerboseDependencyNodeFilter();
+ org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter
filter =
+ createVerboseDependencyNodeFilter();
if ( filter != null )
{
@@ -408,11 +410,12 @@ public class TreeMojo
filter );
rootNode.accept( firstPassVisitor );
-
org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter
secondPassFilter =
- new
org.apache.maven.shared.dependency.tree.filter.AncestorOrSelfDependencyNodeFilter(
collectingVisitor.getNodes() );
+ final List<org.apache.maven.shared.dependency.tree.DependencyNode>
nodes = collectingVisitor.getNodes();
+
org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter secondPass =
+ new
org.apache.maven.shared.dependency.tree.filter.AncestorOrSelfDependencyNodeFilter(
nodes );
visitor =
new
org.apache.maven.shared.dependency.tree.traversal.FilteringDependencyNodeVisitor(
visitor,
-
secondPassFilter );
+
secondPass );
}
rootNode.accept( visitor );
@@ -546,6 +549,7 @@ public class TreeMojo
{
List<org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter>
filters =
new
ArrayList<org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter>();
+ org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter
filter;
// filter includes
if ( includes != null )
@@ -555,8 +559,8 @@ public class TreeMojo
getLog().debug( "+ Filtering dependency tree by artifact include
patterns: " + patterns );
ArtifactFilter artifactFilter = new
StrictPatternIncludesArtifactFilter( patterns );
- filters.add( new
org.apache.maven.shared.dependency.tree.filter.ArtifactDependencyNodeFilter(
-
artifactFilter ) );
+ filter = new
org.apache.maven.shared.dependency.tree.filter.ArtifactDependencyNodeFilter(
artifactFilter );
+ filters.add( filter );
}
// filter excludes
@@ -567,8 +571,8 @@ public class TreeMojo
getLog().debug( "+ Filtering dependency tree by artifact exclude
patterns: " + patterns );
ArtifactFilter artifactFilter = new
StrictPatternExcludesArtifactFilter( patterns );
- filters.add( new
org.apache.maven.shared.dependency.tree.filter.ArtifactDependencyNodeFilter(
-
artifactFilter ) );
+ filter = new
org.apache.maven.shared.dependency.tree.filter.ArtifactDependencyNodeFilter(
artifactFilter );
+ filters.add( filter );
}
return filters.isEmpty() ? null
@@ -616,7 +620,7 @@ public class TreeMojo
return !canFindCoreClass(
"org.apache.maven.project.DependencyResolutionRequest" ); // Maven 3 specific
}
- private static boolean canFindCoreClass( String className)
+ private static boolean canFindCoreClass( String className )
{
try
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java?rev=1640038&r1=1640037&r2=1640038&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
Sun Nov 16 22:10:23 2014
@@ -144,7 +144,7 @@ public class DependencyStatusSets
public String getOutput( boolean outputAbsoluteArtifactFilename, boolean
outputScope )
{
- return getOutput(outputAbsoluteArtifactFilename, outputScope, false);
+ return getOutput( outputAbsoluteArtifactFilename, outputScope, false );
}
public String getOutput( boolean outputAbsoluteArtifactFilename, boolean
outputScope, boolean sort )
@@ -158,7 +158,8 @@ public class DependencyStatusSets
}
else
{
- sb.append( buildArtifactListOutput( resolvedDependencies,
outputAbsoluteArtifactFilename, outputScope, sort ) );
+ sb.append( buildArtifactListOutput( resolvedDependencies,
outputAbsoluteArtifactFilename,
+ outputScope, sort ) );
}
if ( this.skippedDependencies != null &&
!this.skippedDependencies.isEmpty() )
@@ -167,7 +168,8 @@ public class DependencyStatusSets
sb.append( "The following files were skipped:\n" );
Set<Artifact> skippedDependencies = new LinkedHashSet<Artifact>();
skippedDependencies.addAll( this.skippedDependencies );
- sb.append( buildArtifactListOutput( skippedDependencies,
outputAbsoluteArtifactFilename, outputScope, sort ) );
+ sb.append( buildArtifactListOutput( skippedDependencies,
outputAbsoluteArtifactFilename,
+ outputScope, sort ) );
}
if ( this.unResolvedDependencies != null &&
!this.unResolvedDependencies.isEmpty() )
@@ -176,14 +178,16 @@ public class DependencyStatusSets
sb.append( "The following files have NOT been resolved:\n" );
Set<Artifact> unResolvedDependencies = new
LinkedHashSet<Artifact>();
unResolvedDependencies.addAll( this.unResolvedDependencies );
- sb.append( buildArtifactListOutput( unResolvedDependencies,
outputAbsoluteArtifactFilename, outputScope, sort ) );
+ sb.append( buildArtifactListOutput( unResolvedDependencies,
outputAbsoluteArtifactFilename,
+ outputScope, sort ) );
}
sb.append( "\n" );
return sb.toString();
}
- private StringBuilder buildArtifactListOutput(Set<Artifact> artifacts,
boolean outputAbsoluteArtifactFilename, boolean outputScope, boolean sort )
+ private StringBuilder buildArtifactListOutput( Set<Artifact> artifacts,
boolean outputAbsoluteArtifactFilename,
+ boolean outputScope,
boolean sort )
{
StringBuilder sb = new StringBuilder();
List<String> artifactStringList = new ArrayList<String>();
@@ -206,13 +210,14 @@ public class DependencyStatusSets
String id = outputScope ? artifact.toString() : artifact.getId();
- artifactStringList.add( " " + id + (
outputAbsoluteArtifactFilename ? ":" + artifactFilename : "" ) + "\n" );
+ artifactStringList.add( " " + id + (
outputAbsoluteArtifactFilename ? ":" + artifactFilename : "" )
+ + "\n" );
}
if ( sort )
{
Collections.sort( artifactStringList );
}
- for (String artifactString : artifactStringList)
+ for ( String artifactString : artifactStringList )
{
sb.append( artifactString );
}
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=1640038&r1=1640037&r2=1640038&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
Sun Nov 16 22:10:23 2014
@@ -96,10 +96,9 @@ public class DestFileFilter
public Set filter( Set artifacts )
throws ArtifactFilterException
{
- Set<Artifact> artifacts_ = artifacts;
Set<Artifact> result = new HashSet<Artifact>();
- for ( Artifact artifact : artifacts_ )
+ for ( Artifact artifact : (Set<Artifact>) artifacts )
{
if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
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=1640038&r1=1640037&r2=1640038&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
Sun Nov 16 22:10:23 2014
@@ -64,10 +64,9 @@ public class MarkerFileFilter
public Set filter( Set artifacts )
throws ArtifactFilterException
{
- Set<Artifact> artifacts_ = artifacts;
Set<Artifact> result = new HashSet<Artifact>();
- for ( Artifact artifact : artifacts_ )
+ for ( Artifact artifact : (Set<Artifact>) artifacts )
{
if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
