You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2022/10/20 12:25:25 UTC
[GitHub] [maven-dependency-plugin] khmarbaise opened a new pull request, #255: [MDEP-832] - Remove commons-collections-4
khmarbaise opened a new pull request, #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255
Following this checklist to help us incorporate your
contribution quickly and easily:
- [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MDEP) filed
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
- [ ] Each commit in the pull request should have a meaningful subject line and body.
- [ ] Format the pull request title like `[MDEP-XXX] - Fixes bug in ApproximateQuantiles`,
where you replace `MDEP-XXX` with the appropriate JIRA issue. Best practice
is to use the JIRA issue title in the pull request title and in the first line of the
commit message.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will
be performed on your pull request automatically.
- [ ] You have run the integration tests successfully (`mvn -Prun-its clean verify`).
If your pull request is about ~20 lines of code you don't need to sign an
[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
you have to acknowledge this by using the following check-box.
- [ ] I hereby declare this contribution to be licensed under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
- [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [MDEP-832] - Remove commons-collections-4 [maven-dependency-plugin]
Posted by "elharo (via GitHub)" <gi...@apache.org>.
elharo commented on PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#issuecomment-1780955284
There were a number of pom changes in flight so it looks like some of the PRs got a little mixed up when resolving merge conflicts, but I think it is removed at HEAD.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1001874458
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
I struggled on that one a few weeks ago.
Given the two sets are the same, I think the result will always be an empty set.
So I would just simply remove that call.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] asfgit merged pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by "asfgit (via GitHub)" <gi...@apache.org>.
asfgit merged PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1002059135
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
The shortest form could be:
```
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
List<String> modelDependencies2 = modelDependencies.stream()
.map( Dependency::getManagementKey ).collect( Collectors.toList() );
// remove one instance of each element from the list
modelDependencies2.removeIf( new HashSet<>( modelDependencies2 )::remove );
// keep a single instance of each duplicate
return new LinkedHashSet<>( modelDependencies2 );
}
```
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
The shortest form could be:
```
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
List<String> modelDependencies2 = modelDependencies.stream()
.map( Dependency::getManagementKey ).collect( Collectors.toList() );
// remove one instance of each element from the list
modelDependencies2.removeIf( new HashSet<>( modelDependencies2 )::remove );
// keep a single instance of each duplicate
return new LinkedHashSet<>( modelDependencies2 );
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1001931149
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
Ah, got it. But then, wouldn't it be simpler and more understandable :
```
/**
* Remove exactly one instance of each element from the give list.
*/
static <O> List<O> symmetricDifference( Collection<O> elements )
{
List<O> list = new ArrayList<>( elements );
Set<O> set = new HashSet<>( elements );
list.removeIf( set::remove );
return list;
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] khmarbaise commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
khmarbaise commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1001889182
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
No they are not the same. The first list (modelDependencies2) contains two entries (junit) while the hashset contains only a single entry of that and the result must be the single junit-jar difference. Check the unit test: `TestAnalyzeDuplicateMojo` testcase `testDuplicate` and `testDuplicate2` which references `src/test/resources/unit/duplicate-dependencies/plugin-config.xml` and the `src/test/resources/unit/duplicate-dependencies/plugin-config2.xml` which contains exactly those cases.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] elharo commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
elharo commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1033010371
##########
pom.xml:
##########
@@ -273,6 +267,12 @@ under the License.
<version>4.13.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
Review Comment:
can we stick to pure JUnit 4.x only? Test library proliferation is simply confusing
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/Util.java:
##########
@@ -0,0 +1,58 @@
+package org.apache.maven.plugins.dependency.analyze;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.summingInt;
+import static java.util.stream.Collectors.toList;
+
+class Util
Review Comment:
This needs a more specific name. Arguably this can be a private method in the class that uses it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1002052466
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
It could even be inlined with a simple comment...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1001874458
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
I struggled on that one a few weeks ago.
Given the two sets are the same, I think the result will always be an empty set.
So I would just simply remove that call and the two added classes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1001874458
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
I struggled on that one.
Given the two sets are the same, I think the result will always be an empty set.
So I would just simply remove that call.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1001931149
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
Ah, got it. But then, wouldn't it be simpler and more understandable :
```
/**
* Remove exactly one instance of each element from the given list.
*/
static <O> List<O> symmetricDifference( Collection<O> elements )
{
List<O> list = new ArrayList<>( elements );
Set<O> set = new HashSet<>( elements );
list.removeIf( set::remove );
return list;
}
```
It passes the slightly adapted tests in the `UtilTest` (the two last ones).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven-dependency-plugin] gnodet commented on a diff in pull request #255: [MDEP-832] - Remove commons-collections-4
Posted by GitBox <gi...@apache.org>.
gnodet commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1001931149
##########
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java:
##########
@@ -151,15 +150,9 @@ private void createMessage( Set<String> duplicateDependencies, StringBuilder sb,
private Set<String> findDuplicateDependencies( List<Dependency> modelDependencies )
{
- List<String> modelDependencies2 = new ArrayList<>();
- for ( Dependency dep : modelDependencies )
- {
- modelDependencies2.add( dep.getManagementKey() );
- }
-
- // @formatter:off
+ List<String> modelDependencies2 =
+ modelDependencies.stream().map( Dependency::getManagementKey ).collect( Collectors.toList() );
return new LinkedHashSet<>(
- CollectionUtils.disjunction( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
- // @formatter:on
+ Util.symmetricDifference( modelDependencies2, new LinkedHashSet<>( modelDependencies2 ) ) );
Review Comment:
Ah, got it. But then, wouldn't it be simpler and more understandable :
```
/**
* Remove exactly one instance of each element from the give list.
*/
static <O> List<O> symmetricDifference( Collection<O> elements )
{
List<O> list = new ArrayList<>( elements );
Set<O> set = new HashSet<>( elements );
list.removeIf( set::remove );
return list;
}
```
It passes the slightly adapted tests in the `UtilTest` (the two last ones).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [MDEP-832] - Remove commons-collections-4 [maven-dependency-plugin]
Posted by "vtintillier (via GitHub)" <gi...@apache.org>.
vtintillier commented on code in PR #255:
URL: https://github.com/apache/maven-dependency-plugin/pull/255#discussion_r1372695195
##########
pom.xml:
##########
@@ -260,11 +260,6 @@ under the License.
<artifactId>commons-collections4</artifactId>
Review Comment:
didn't you mean to remove this one?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org