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 2021/08/16 03:29:45 UTC
[maven-dependency-plugin] branch master updated: [MDEP-760] Java
1.8 as minimum (#150)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new ca75de7 [MDEP-760] Java 1.8 as minimum (#150)
ca75de7 is described below
commit ca75de71acece195ba1a15113a230e3ff9eb39fc
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Aug 16 13:29:40 2021 +1000
[MDEP-760] Java 1.8 as minimum (#150)
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
pom.xml | 2 +-
.../maven/plugins/dependency/ListClassesMojo.java | 35 +++++++++++-----------
.../dependency/analyze/AbstractAnalyzeMojo.java | 9 +-----
.../plugins/dependency/analyze/AnalyzeDepMgt.java | 26 +++++-----------
.../dependency/analyze/AnalyzeDuplicateMojo.java | 4 +--
.../AbstractFromConfigurationMojo.java | 2 +-
.../fromDependencies/BuildClasspathMojo.java | 2 +-
.../fromDependencies/CopyDependenciesMojo.java | 8 ++---
.../ExcludeReactorProjectsDependencyFilter.java | 10 +++----
.../dependency/resolvers/GoOfflineMojo.java | 34 ++++++++++-----------
.../resolvers/ResolveDependenciesMojo.java | 25 ++--------------
.../tree/AbstractVerboseGraphSerializer.java | 2 +-
.../maven/plugins/dependency/tree/ArtifactKey.java | 8 ++---
.../maven/plugins/dependency/tree/TreeMojo.java | 2 +-
.../tree/VerboseDependencyGraphBuilder.java | 26 +++++++---------
.../plugins/dependency/utils/DependencyUtil.java | 1 -
.../dependency/utils/filters/MarkerFileFilter.java | 1 +
17 files changed, 73 insertions(+), 124 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5a87aad..3f74110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@ under the License.
<doxiaSitetoolsVersion>1.10</doxiaSitetoolsVersion>
<jettyVersion>9.2.28.v20190418</jettyVersion>
<pluginTestingVersion>3.1.0</pluginTestingVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2021-06-07T12:17:08Z</project.build.outputTimestamp>
<slf4j.version>1.7.30</slf4j.version>
</properties>
diff --git a/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java
index deee164..250806c 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java
@@ -217,26 +217,25 @@ public class ListClassesMojo
throw new MojoFailureException( "You must specify an artifact, "
+ "e.g. -Dartifact=org.apache.maven.plugins:maven-downloader-plugin:1.0" );
}
- if ( artifact != null )
+
+ String[] tokens = artifact.split( ":" );
+ if ( tokens.length < 3 || tokens.length > 5 )
{
- String[] tokens = artifact.split( ":" );
- if ( tokens.length < 3 || tokens.length > 5 )
- {
- throw new MojoFailureException( "Invalid artifact, you must specify "
- + "groupId:artifactId:version[:packaging[:classifier]] " + artifact );
- }
- coordinate.setGroupId( tokens[0] );
- coordinate.setArtifactId( tokens[1] );
- coordinate.setVersion( tokens[2] );
- if ( tokens.length >= 4 )
- {
- coordinate.setType( tokens[3] );
- }
- if ( tokens.length == 5 )
- {
- coordinate.setClassifier( tokens[4] );
- }
+ throw new MojoFailureException( "Invalid artifact, you must specify "
+ + "groupId:artifactId:version[:packaging[:classifier]] " + artifact );
+ }
+ coordinate.setGroupId( tokens[0] );
+ coordinate.setArtifactId( tokens[1] );
+ coordinate.setVersion( tokens[2] );
+ if ( tokens.length >= 4 )
+ {
+ coordinate.setType( tokens[3] );
}
+ if ( tokens.length == 5 )
+ {
+ coordinate.setClassifier( tokens[4] );
+ }
+
ArtifactRepositoryPolicy always =
new ArtifactRepositoryPolicy( true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
index 0f735ae..d2bb601 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
@@ -415,14 +415,7 @@ public abstract class AbstractAnalyzeMojo
private void filterArtifactsByScope( Set<Artifact> artifacts, String scope )
{
- for ( Iterator<Artifact> iterator = artifacts.iterator(); iterator.hasNext(); )
- {
- Artifact artifact = iterator.next();
- if ( artifact.getScope().equals( scope ) )
- {
- iterator.remove();
- }
- }
+ artifacts.removeIf( artifact -> artifact.getScope().equals( scope ) );
}
private void logArtifacts( Set<Artifact> artifacts, boolean warn )
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
index b6c1264..cdc7b96 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDepMgt.java
@@ -19,12 +19,13 @@ package org.apache.maven.plugins.dependency.analyze;
* under the License.
*/
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
@@ -193,15 +194,12 @@ public class AnalyzeDepMgt
*/
public Map<String, Exclusion> addExclusions( List<Exclusion> exclusionList )
{
- Map<String, Exclusion> exclusions = new HashMap<>();
if ( exclusionList != null )
{
- for ( Exclusion exclusion : exclusionList )
- {
- exclusions.put( getExclusionKey( exclusion ), exclusion );
- }
+ return exclusionList.stream()
+ .collect( Collectors.toMap( this::getExclusionKey, exclusion -> exclusion ) );
}
- return exclusions;
+ return Collections.emptyMap();
}
/**
@@ -214,17 +212,9 @@ public class AnalyzeDepMgt
*/
public List<Artifact> getExclusionErrors( Map<String, Exclusion> exclusions, Set<Artifact> allDependencyArtifacts )
{
- List<Artifact> list = new ArrayList<>();
-
- for ( Artifact artifact : allDependencyArtifacts )
- {
- if ( exclusions.containsKey( getExclusionKey( artifact ) ) )
- {
- list.add( artifact );
- }
- }
-
- return list;
+ return allDependencyArtifacts.stream()
+ .filter( artifact -> exclusions.containsKey( getExclusionKey( artifact ) ) )
+ .collect( Collectors.toList( ) );
}
/**
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
index be1735d..552f498 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
@@ -85,7 +85,7 @@ public class AnalyzeDuplicateMojo
}
MavenXpp3Reader pomReader = new MavenXpp3Reader();
- Model model = null;
+ Model model;
try ( Reader reader = ReaderFactory.newXmlReader( project.getFile() ) )
{
model = pomReader.read( reader );
@@ -158,7 +158,7 @@ public class AnalyzeDuplicateMojo
}
// @formatter:off
- return new LinkedHashSet<String>(
+ return new LinkedHashSet<>(
CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
// @formatter:on
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
index b41a428..eed7621 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
@@ -272,7 +272,7 @@ public abstract class AbstractFromConfigurationMojo
{
MavenProject project = getProject();
List<Dependency> deps = project.getDependencies();
- List<Dependency> depMngt = project.getDependencyManagement() == null ? Collections.<Dependency>emptyList()
+ List<Dependency> depMngt = project.getDependencyManagement() == null ? Collections.emptyList()
: project.getDependencyManagement().getDependencies();
if ( !findDependencyVersion( artifact, deps, false )
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
index b391fdd..0e543af 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
@@ -315,7 +315,7 @@ public class BuildClasspathMojo
try
{
String oldCp = readClasspathFile();
- return ( cpString == null ? oldCp == null : cpString.equals( oldCp ) );
+ return Objects.equals( cpString, oldCp );
}
catch ( IOException ex )
{
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
index 5b11cb9..04c2818 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
@@ -131,10 +131,7 @@ public class CopyDependenciesMojo
getRepositoryManager().setLocalRepositoryBasedir( session.getProjectBuildingRequest(),
outputDirectory );
- for ( Artifact artifact : artifacts )
- {
- installArtifact( artifact, buildingRequest );
- }
+ artifacts.forEach( artifact -> installArtifact( artifact, buildingRequest ) );
}
Set<Artifact> skippedArtifacts = dss.getSkippedDependencies();
@@ -240,8 +237,7 @@ public class CopyDependenciesMojo
String destFileName = DependencyUtil.getFormattedFileName( artifact, removeVersion, prependGroupId,
theUseBaseVersion, removeClassifier );
- File destDir;
- destDir = DependencyUtil.getFormattedOutputDirectory( useSubDirectoryPerScope, useSubDirectoryPerType,
+ File destDir = DependencyUtil.getFormattedOutputDirectory( useSubDirectoryPerScope, useSubDirectoryPerType,
useSubDirectoryPerArtifact, useRepositoryLayout,
stripVersion, outputDirectory, artifact );
File destFile = new File( destDir, destFileName );
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilter.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilter.java
index e5d90ca..b429a3e 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilter.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsDependencyFilter.java
@@ -27,9 +27,9 @@ import org.apache.maven.shared.artifact.filter.resolve.AbstractFilter;
import org.apache.maven.shared.artifact.filter.resolve.Node;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* {@link TransformableFilter} implementation that excludes artifacts found in the Reactor.
@@ -44,11 +44,9 @@ public class ExcludeReactorProjectsDependencyFilter extends AbstractFilter
public ExcludeReactorProjectsDependencyFilter( final List<MavenProject> reactorProjects, final Log log )
{
this.log = log;
- this.reactorArtifactKeys = new HashSet<>( reactorProjects.size() );
- for ( final MavenProject project : reactorProjects )
- {
- this.reactorArtifactKeys.add( ArtifactUtils.key( project.getArtifact() ) );
- }
+ this.reactorArtifactKeys = reactorProjects.stream()
+ .map( project -> ArtifactUtils.key( project.getArtifact() ) )
+ .collect( Collectors.toSet() );
}
@Override
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
index 4145b45..a91bd89 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojo.java
@@ -37,6 +37,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* Goal that resolves all project dependencies, including plugins and reports and their dependencies.
@@ -98,15 +99,13 @@ public class GoOfflineMojo
protected Set<Artifact> resolveDependencyArtifacts()
throws DependencyResolverException
{
- final Collection<Dependency> dependencies = getProject().getDependencies();
- final Set<DependableCoordinate> dependableCoordinates = new HashSet<>();
+ Collection<Dependency> dependencies = getProject().getDependencies();
- final ProjectBuildingRequest buildingRequest = newResolveArtifactProjectBuildingRequest();
+ Set<DependableCoordinate> dependableCoordinates = dependencies.stream()
+ .map( this::createDependendableCoordinateFromDependency )
+ .collect( Collectors.toSet() );
- for ( Dependency dependency : dependencies )
- {
- dependableCoordinates.add( createDependendableCoordinateFromDependency( dependency ) );
- }
+ ProjectBuildingRequest buildingRequest = newResolveArtifactProjectBuildingRequest();
return resolveDependableCoordinate( buildingRequest, dependableCoordinates, "dependencies" );
}
@@ -118,14 +117,14 @@ public class GoOfflineMojo
{
final TransformableFilter filter = getTransformableFilter();
- final Set<Artifact> results = new HashSet<>();
-
this.getLog().debug( "Resolving '" + type + "' with following repositories:" );
for ( ArtifactRepository repo : buildingRequest.getRemoteRepositories() )
{
getLog().debug( repo.getId() + " (" + repo.getUrl() + ")" );
}
+ final Set<Artifact> results = new HashSet<>();
+
for ( DependableCoordinate dependableCoordinate : dependableCoordinates )
{
final Iterable<ArtifactResult> artifactResults = getDependencyResolver().resolveDependencies(
@@ -161,21 +160,20 @@ public class GoOfflineMojo
protected Set<Artifact> resolvePluginArtifacts()
throws DependencyResolverException
{
- final Set<DependableCoordinate> dependableCoordinates = new HashSet<>();
- final Set<Artifact> plugins = getProject().getPluginArtifacts();
- final Set<Artifact> reports = getProject().getReportArtifacts();
+ Set<Artifact> plugins = getProject().getPluginArtifacts();
+ Set<Artifact> reports = getProject().getReportArtifacts();
- final Set<Artifact> artifacts = new LinkedHashSet<>();
+ Set<Artifact> artifacts = new LinkedHashSet<>();
artifacts.addAll( reports );
artifacts.addAll( plugins );
- final ProjectBuildingRequest buildingRequest = newResolvePluginProjectBuildingRequest();
+ Set<DependableCoordinate> dependableCoordinates = artifacts.stream()
+ .map( this::createDependendableCoordinateFromArtifact )
+ .collect( Collectors.toSet() );
- for ( Artifact artifact : artifacts )
- {
- dependableCoordinates.add( createDependendableCoordinateFromArtifact( artifact ) );
- }
+
+ ProjectBuildingRequest buildingRequest = newResolvePluginProjectBuildingRequest();
return resolveDependableCoordinate( buildingRequest, dependableCoordinates, "plugins" );
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
index 7a6addd..73e4c05 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
@@ -166,8 +166,7 @@ public class ResolveDependenciesMojo
sb.append( System.lineSeparator() );
sb.append( "The following files were skipped:" );
sb.append( System.lineSeparator() );
- Set<Artifact> skippedDependencies = new LinkedHashSet<>();
- skippedDependencies.addAll( results.getSkippedDependencies() );
+ Set<Artifact> skippedDependencies = new LinkedHashSet<>( results.getSkippedDependencies() );
sb.append( buildArtifactListOutput( skippedDependencies, outputAbsoluteArtifactFilename, theOutputScope,
theSort ) );
}
@@ -177,8 +176,7 @@ public class ResolveDependenciesMojo
sb.append( System.lineSeparator() );
sb.append( "The following files have NOT been resolved:" );
sb.append( System.lineSeparator() );
- Set<Artifact> unResolvedDependencies = new LinkedHashSet<>();
- unResolvedDependencies.addAll( results.getUnResolvedDependencies() );
+ Set<Artifact> unResolvedDependencies = new LinkedHashSet<>( results.getUnResolvedDependencies() );
sb.append( buildArtifactListOutput( unResolvedDependencies, outputAbsoluteArtifactFilename, theOutputScope,
theSort ) );
}
@@ -297,11 +295,8 @@ public class ResolveDependenciesMojo
{
if ( artifactFile.isFile() )
{
- JarFile jarFile = null;
- try
+ try ( JarFile jarFile = new JarFile( artifactFile ) )
{
- jarFile = new JarFile( artifactFile );
-
Manifest manifest = jarFile.getManifest();
if ( manifest != null
@@ -318,20 +313,6 @@ public class ResolveDependenciesMojo
{
// noop
}
- finally
- {
- if ( jarFile != null )
- {
- try
- {
- jarFile.close();
- }
- catch ( IOException e )
- {
- // noop
- }
- }
- }
}
}
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/AbstractVerboseGraphSerializer.java b/src/main/java/org/apache/maven/plugins/dependency/tree/AbstractVerboseGraphSerializer.java
index 82ed864..2c3abd7 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/tree/AbstractVerboseGraphSerializer.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/tree/AbstractVerboseGraphSerializer.java
@@ -171,7 +171,7 @@ abstract class AbstractVerboseGraphSerializer
ignoreNode = true;
nodeErrors.put( node, "omitted for introducing a cycle with "
+ getDependencyCoordinate( child ) );
- node.setChildren( new ArrayList<DependencyNode>() );
+ node.setChildren( new ArrayList<>() );
break;
}
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/ArtifactKey.java b/src/main/java/org/apache/maven/plugins/dependency/tree/ArtifactKey.java
index f9346eb..01ea4cd 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/tree/ArtifactKey.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/tree/ArtifactKey.java
@@ -21,6 +21,8 @@ package org.apache.maven.plugins.dependency.tree;
import org.apache.maven.project.MavenProject;
+import java.util.Objects;
+
/**
* Uniquely defines an artifact by groupId, artifactId and version.
*/
@@ -63,10 +65,6 @@ final class ArtifactKey
@Override
public int hashCode()
{
- final int hashPrime = 31;
- int result = groupId.hashCode();
- result = hashPrime * result + artifactId.hashCode();
- result = hashPrime * result + version.hashCode();
- return result;
+ return Objects.hash( groupId, artifactId, version );
}
}
diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
index e2073c1..f9555a0 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
@@ -400,7 +400,7 @@ public class TreeMojo
child.getArtifact().getProperties().get( "preManagedScope" ), null,
child.getDependency().isOptional() );
- newChild.setChildren( new ArrayList<DependencyNode>() );
+ newChild.setChildren( new ArrayList<>() );
for ( org.eclipse.aether.graph.DependencyNode grandChild : child.getChildren() )
{
diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseDependencyGraphBuilder.java b/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseDependencyGraphBuilder.java
index ed43cd4..68ef53b 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseDependencyGraphBuilder.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/tree/VerboseDependencyGraphBuilder.java
@@ -53,6 +53,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* Builds the VerboseDependencyGraph
@@ -149,11 +150,9 @@ class VerboseDependencyGraphBuilder
{
org.apache.maven.model.Dependency manager = dependencyManagementMap.get(
getDependencyManagementCoordinate( node.getArtifact() ) );
- Map<String, String> artifactProperties = new HashMap<>();
- for ( Map.Entry<String, String> entry : node.getArtifact().getProperties().entrySet() )
- {
- artifactProperties.put( entry.getKey(), entry.getValue() );
- }
+ Map<String, String> artifactProperties = node.getArtifact().getProperties().entrySet()
+ .stream()
+ .collect( Collectors.toMap( Map.Entry::getKey, Map.Entry::getValue ) );
if ( !manager.getVersion().equals( node.getArtifact().getVersion() ) )
{
@@ -182,16 +181,13 @@ class VerboseDependencyGraphBuilder
private static Map<String, org.apache.maven.model.Dependency> createDependencyManagementMap(
DependencyManagement dependencyManagement )
{
- Map<String, org.apache.maven.model.Dependency> dependencyManagementMap = new HashMap<>();
if ( dependencyManagement == null )
{
- return dependencyManagementMap;
- }
- for ( org.apache.maven.model.Dependency dependency : dependencyManagement.getDependencies() )
- {
- dependencyManagementMap.put( getDependencyManagementCoordinate( dependency ), dependency );
+ return new HashMap<>();
}
- return dependencyManagementMap;
+ return dependencyManagement.getDependencies().stream()
+ .collect( Collectors.toMap( VerboseDependencyGraphBuilder::getDependencyManagementCoordinate,
+ dependency -> dependency ) );
}
private static String getDependencyManagementCoordinate( org.apache.maven.model.Dependency dependency )
@@ -230,7 +226,7 @@ class VerboseDependencyGraphBuilder
{
Set<DependencyNode> visitedNodes = new HashSet<>();
DependencyNode newRoot = new DefaultDependencyNode( getProjectDependency( project ) );
- newRoot.setChildren( new ArrayList<DependencyNode>() );
+ newRoot.setChildren( new ArrayList<>() );
for ( int i = 0; i < rootNode.getChildren().size(); i++ )
{
@@ -286,13 +282,13 @@ class VerboseDependencyGraphBuilder
private List<Dependency> getReactorDependencies( Collection<MavenProject> reactorProjects, List<?> dependencies )
{
- Set<ArtifactKey> reactorProjectsIds = new HashSet<ArtifactKey>();
+ Set<ArtifactKey> reactorProjectsIds = new HashSet<>();
for ( MavenProject project : reactorProjects )
{
reactorProjectsIds.add( new ArtifactKey( project ) );
}
- List<Dependency> reactorDeps = new ArrayList<Dependency>();
+ List<Dependency> reactorDeps = new ArrayList<>();
for ( Object untypedDependency : dependencies )
{
Dependency dependency = (Dependency) untypedDependency;
diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
index 4c6b528..80cbcb3 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
@@ -37,7 +37,6 @@ import org.codehaus.plexus.util.StringUtils;
* Utility class with static helper methods.
*
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @version $Id$
*/
public final class DependencyUtil
{
diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/MarkerFileFilter.java b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/MarkerFileFilter.java
index b3148af..6aa4934 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/utils/filters/MarkerFileFilter.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/utils/filters/MarkerFileFilter.java
@@ -81,6 +81,7 @@ public class MarkerFileFilter
result.add( artifact );
}
}
+
return result;
}