[maven-javadoc-plugin] branch master updated: [MJAVADOC-614] - "No source files for package" in a directory with accent characters (#30)

[el...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e7b6114  [MJAVADOC-614] - "No source files for package" in a directory with accent characters (#30)
e7b6114 is described below

commit e7b61147916a3b803fac3ce56f2ce11e5149b4aa
Author: Alexis <al...@users.noreply.github.com>
AuthorDate: Sat Mar 28 11:21:29 2020 +0100

    [MJAVADOC-614] - "No source files for package" in a directory with accent characters (#30)
---
 src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 2 +-
 src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 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 83c3bd0..a5bec36 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4655,7 +4655,7 @@ public abstract class AbstractJavadocMojo
 
         /* default to platform encoding */
         String outputFileEncoding = null;
-        if ( JAVA_VERSION.isAtLeast( "9" ) )
+        if ( JAVA_VERSION.isAtLeast( "9" ) && JAVA_VERSION.isBefore( "12" ) )
         {
             outputFileEncoding = StandardCharsets.UTF_8.name();
         }
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 5f2b358..393e66e 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -572,7 +572,7 @@ public class JavadocReportTest
         // check for a part of the window title
         String content;
         String expected;
-        if ( JavaVersion.JAVA_VERSION.isAtLeast( "9" ) )
+        if ( JavaVersion.JAVA_VERSION.isAtLeast( "9" ) && JavaVersion.JAVA_VERSION.isBefore( "12" ) )
         {
             content = readFile( optionsFile, StandardCharsets.UTF_8 );
             expected = OPTIONS_UMLAUT_ENCODING;