[MJAVADOC-614] - "No source files for package" in a directory with ac…

…cent characters (#30)
apache · Mar 28, 2020 · e7b6114 · e7b6114
1 parent 3725fcf
commit e7b6114
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -4655,7 +4655,7 @@ private void addCommandLineOptions( Commandline cmd, List<String> arguments, Fil
 
         /* 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
@@ -572,7 +572,7 @@ public void testOptionsUmlautEncoding()
         // 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;