khmarbaise commented on a change in pull request #423:
URL: https://github.com/apache/maven/pull/423#discussion_r550321423



##########
File path: 
maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
##########
@@ -105,6 +106,20 @@ public MavenExecutionPlan resolveBuildPlan( MavenSession 
session, MavenProject p
 
         lifecycleDebugLogger.debugProjectPlan( project, executionPlan );
 
+        // With Maven 4's build/consumer the POM will always rewrite during 
distribution.
+        // 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() ) )
+                .findAny();
+
+        if ( gpgMojo.isPresent() )
+        {

Review comment:
       What about adding a predicate:
   ```java
   private Predicate<MojoExecution> isMavenGpgPlugin = m -> 
m.getArtifactId().equals(
               "maven-gpg-plugin" ) && m.getGroupId().equals( 
"org.apache.maven.plugins" );
   ```
   Then you can change the whole filter via the following:
   ```java
           boolean gpgMojo = 
executionPlan.getMojoExecutions().stream().anyMatch(isMavenGpgPlugin);
   
           if ( gpgMojo )
           {
               throw new LifecycleExecutionException( "The maven-gpg-plugin is 
not supported by Maven 4."
                   + " Verify if there is a compatible signing solution or use 
Maven 3" );
           }
   ```
   because the optional is only used as boolean.




----------------------------------------------------------------
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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


Reply via email to