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/08/17 20:01:43 UTC
[maven-javadoc-plugin] branch MJAVADOC-679 updated: also fix
@argfile
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-679
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/MJAVADOC-679 by this push:
new 7eb7cfd also fix @argfile
7eb7cfd is described below
commit 7eb7cfdce69c65ad3d1e75655df8ca15a8c88733
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Aug 17 22:01:33 2021 +0200
also fix @argfile
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 26 +++++++++++++++++-----
.../apache/maven/plugins/javadoc/StaleHelper.java | 5 ++---
2 files changed, 22 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 05dfe49..dce501d 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -114,6 +114,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -4822,15 +4823,18 @@ public abstract class AbstractJavadocMojo
options.append( StringUtils.join( arguments.iterator(),
SystemUtils.LINE_SEPARATOR ) );
- /* default to platform encoding */
- String outputFileEncoding = null;
+ Charset outputFileEncoding;
if ( JAVA_VERSION.isAtLeast( "9" ) && JAVA_VERSION.isBefore( "12" ) )
{
- outputFileEncoding = StandardCharsets.UTF_8.name();
+ outputFileEncoding = StandardCharsets.UTF_8;
+ }
+ else
+ {
+ outputFileEncoding = Charset.defaultCharset();
}
try
{
- FileUtils.fileWrite( optionsFile.getAbsolutePath(), outputFileEncoding, options.toString() );
+ Files.writeString( optionsFile.toPath(), options.toString(), outputFileEncoding );
}
catch ( IOException e )
{
@@ -4880,10 +4884,20 @@ public abstract class AbstractJavadocMojo
quotedFiles.add( JavadocUtil.quotedPathArgument( file ) );
}
+ Charset cs;
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
+ && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
+ {
+ cs = StandardCharsets.UTF_8;
+ }
+ else
+ {
+ cs = Charset.defaultCharset();
+ }
+
try
{
- FileUtils.fileWrite( argfileFile.getAbsolutePath(), null /* platform encoding */,
- StringUtils.join( quotedFiles.iterator(), SystemUtils.LINE_SEPARATOR ) );
+ Files.write( argfileFile.toPath(), quotedFiles, cs );
}
catch ( IOException e )
{
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java b/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
index cd20abb..5030917 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
@@ -33,7 +33,6 @@ import java.util.List;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.languages.java.version.JavaVersion;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.Commandline;
@@ -62,7 +61,7 @@ public class StaleHelper
String[] args = cmd.getArguments();
Collections.addAll( options, args );
- Charset cs;
+ final Charset cs;
if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
&& JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
{
@@ -144,7 +143,7 @@ public class StaleHelper
{
String curdata = getStaleData( cmd );
Files.createDirectories( path.getParent() );
- FileUtils.fileWrite( path.toFile(), null /* platform encoding */, curdata );
+ Files.writeString( path, curdata, Charset.defaultCharset() );
}
catch ( IOException e )
{