[maven] branch MNG-7060 updated: Use just 1 filter

[rf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-7060
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/MNG-7060 by this push:
     new 77d8d97  Use just 1 filter
77d8d97 is described below

commit 77d8d9719e038152dfffdb5dee15da01156b4d8f
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Dec 30 22:43:38 2020 +0100

    Use just 1 filter
---
 .../org/apache/maven/lifecycle/internal/builder/BuilderCommon.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
index 70a97ad..b22bc94 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -110,8 +109,8 @@ public class BuilderCommon
         // The maven-gpg-plugin uses the original POM, causing an invalid signature.
         // Fail as long as there's no solution available yet
         Optional<MojoExecution> gpgMojo = executionPlan.getMojoExecutions().stream()
-                .filter( m -> "org.apache.maven.plugins".equals( m.getGroupId() ) )
-                .filter( m -> "maven-gpg-plugin".equals( m.getArtifactId() ) )
+                .filter( m -> "maven-gpg-plugin".equals( m.getArtifactId() ) 
+                           && "org.apache.maven.plugins".equals( m.getGroupId() ) )
                 .findAny();
 
         if ( gpgMojo.isPresent() )