commit 1a1baf62515d823ab272427fc973075569620ceb
author rfscholte <rfscholte@apache.org> Sat Jul 17 18:17:51 2021 +0200
committer rfscholte <rfscholte@apache.org> Fri Jul 30 16:45:04 2021 +0200
tree 49aadcc10c2a0fb5e16cedb6a283c0935d532c38
parent c63a305cb9c085a1c465026cafa29344eba0940a

[MJAVADOC-683] Reimplement failOnWarning

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 6c513a2..05dfe49 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -6057,22 +6057,41 @@
         // Handle Javadoc warnings
         // ----------------------------------------------------------------------
 
-        if ( StringUtils.isNotEmpty( err.getOutput() ) && getLog().isWarnEnabled() )
+        if ( containsWarnings( err.getOutput() ) )
         {
-            getLog().warn( "Javadoc Warnings" );
-
-            StringTokenizer token = new StringTokenizer( err.getOutput(), "\n" );
-            while ( token.hasMoreTokens() )
+            if ( getLog().isWarnEnabled() )
             {
-                String current = token.nextToken().trim();
+                getLog().warn( "Javadoc Warnings" );
 
-                getLog().warn( current );
+                StringTokenizer token = new StringTokenizer( err.getOutput(), "\n" );
+                while ( token.hasMoreTokens() )
+                {
+                    String current = token.nextToken().trim();
+
+                    getLog().warn( current );
+                }
+            }
+
+            if ( failOnWarnings )
+            {
+                throw new MavenReportException( "Project contains Javadoc Warnings" );
             }
         }
+    }
 
-        if ( StringUtils.isNotEmpty( err.getOutput() ) && failOnWarnings )
+    private boolean containsWarnings( String output )
+    {
+        // JDK-8268774 / JDK-8270831
+        if ( this.javadocRuntimeVersion.isBefore( "17" ) )
         {
-            throw new MavenReportException( "Project contains Javadoc Warnings" );
+            return StringUtils.isNotEmpty( output );
+        }
+        else
+        {
+            return Arrays.stream( output.split( "\\R" ) )
+                            .reduce( ( first, second ) -> second ) // last line
+                            .filter( line -> line.matches( "\\d+ warnings?" ) )
+                            .isPresent();
         }
     }