Skip to content

Commit c6973da

Browse files
committed
[MDEP-832] - Remove commons-collections-4
1 parent 0243c41 commit c6973da

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,6 @@ under the License.
260260
<artifactId>commons-collections4</artifactId>
261261
<version>4.4</version>
262262
</dependency>
263-
<dependency>
264-
<groupId>org.apache.commons</groupId>
265-
<artifactId>commons-lang3</artifactId>
266-
<version>3.12.0</version>
267-
</dependency>
268263

269264
<!-- dependencies to annotations -->
270265
<dependency>

src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
import java.io.IOException;
2222
import java.io.Reader;
23-
import java.util.ArrayList;
2423
import java.util.Collections;
24+
import java.util.HashSet;
2525
import java.util.Iterator;
2626
import java.util.LinkedHashSet;
2727
import java.util.List;
2828
import java.util.Set;
29+
import java.util.stream.Collectors;
2930

30-
import org.apache.commons.collections4.CollectionUtils;
3131
import org.apache.maven.model.Dependency;
3232
import org.apache.maven.model.Model;
3333
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -131,14 +131,11 @@ private void createMessage(
131131
}
132132

133133
private Set<String> findDuplicateDependencies(List<Dependency> modelDependencies) {
134-
List<String> modelDependencies2 = new ArrayList<>();
135-
for (Dependency dep : modelDependencies) {
136-
modelDependencies2.add(dep.getManagementKey());
137-
}
138-
139-
// @formatter:off
140-
return new LinkedHashSet<>(
141-
CollectionUtils.disjunction(modelDependencies2, new LinkedHashSet<>(modelDependencies2)));
142-
// @formatter:on
134+
List<String> modelDependencies2 =
135+
modelDependencies.stream().map(Dependency::getManagementKey).collect(Collectors.toList());
136+
// remove one instance of each element from the list
137+
modelDependencies2.removeIf(new HashSet<>(modelDependencies2)::remove);
138+
// keep a single instance of each duplicate
139+
return new LinkedHashSet<>(modelDependencies2);
143140
}
144141
}

0 commit comments

Comments
 (0)