You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/07/17 16:18:05 UTC

[maven-javadoc-plugin] branch MJAVADOC-683 created (now be377f2)

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

rfscholte pushed a change to branch MJAVADOC-683
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


      at be377f2  [MJAVADOC-683] Reimplement failOnWarning

This branch includes the following new commits:

     new be377f2  [MJAVADOC-683] Reimplement failOnWarning

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[maven-javadoc-plugin] 01/01: [MJAVADOC-683] Reimplement failOnWarning

Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MJAVADOC-683
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit be377f2660f73ac1091b4212d38dba62d6942285
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Jul 17 18:17:51 2021 +0200

    [MJAVADOC-683] Reimplement failOnWarning
---
 .../maven/plugins/javadoc/AbstractJavadocMojo.java | 37 ++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

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 0655f8a..c3e923a 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -6063,22 +6063,41 @@ public abstract class AbstractJavadocMojo
         // 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" );
+
+                StringTokenizer token = new StringTokenizer( err.getOutput(), "\n" );
+                while ( token.hasMoreTokens() )
+                {
+                    String current = token.nextToken().trim();
 
-                getLog().warn( current );
+                    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" ) )
+        {
+            return StringUtils.isNotEmpty( output );
+        }
+        else
         {
-            throw new MavenReportException( "Project contains Javadoc Warnings" );
+            return Arrays.stream( output.split( "\\R" ) )
+                            .reduce( ( first, second ) -> second ) // last line
+                            .filter( line -> line.matches( "\\d+ warnings?" ) )
+                            .isPresent();
         }
     }