From f48afbb29ce8a6a9dd8fbd66a30eb9d5812f87af Mon Sep 17 00:00:00 2001 From: Alexis Jehan Date: Tue, 3 Sep 2019 23:39:46 +0200 Subject: [PATCH] [MJAVADOC-614] - "No source files for package" in a directory with accent characters --- .../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 2 +- .../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 9250cd05..02a34630 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -4642,7 +4642,7 @@ private void addCommandLineOptions( Commandline cmd, List 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 index 4e014105..110bc008 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -571,7 +571,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;