53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
--- maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java 2023-09-14 14:20:14.049981880 +0200
|
|
+++ maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java 2023-09-14 14:25:18.258705774 +0200
|
|
@@ -41,6 +41,19 @@
|
|
*/
|
|
public class StaleHelper {
|
|
|
|
+ private static Charset getDataCharset()
|
|
+ {
|
|
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast( "9" )
|
|
+ && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
|
|
+ {
|
|
+ return StandardCharsets.UTF_8;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ return Charset.defaultCharset();
|
|
+ }
|
|
+ }
|
|
+
|
|
/**
|
|
* Compute the data used to detect a stale javadoc
|
|
*
|
|
@@ -56,13 +69,7 @@
|
|
String[] args = cmd.getArguments();
|
|
Collections.addAll(options, args);
|
|
|
|
- final Charset cs;
|
|
- if (JavaVersion.JAVA_SPECIFICATION_VERSION.isAtLeast("9")
|
|
- && JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore("12")) {
|
|
- cs = StandardCharsets.UTF_8;
|
|
- } else {
|
|
- cs = Charset.defaultCharset();
|
|
- }
|
|
+ final Charset cs = getDataCharset();
|
|
|
|
for (String arg : args) {
|
|
if (arg.startsWith("@")) {
|
|
@@ -116,9 +123,11 @@
|
|
*/
|
|
public static void writeStaleData(Commandline cmd, Path path) throws MavenReportException {
|
|
try {
|
|
+ final Charset cs = getDataCharset();
|
|
+
|
|
String curdata = getStaleData(cmd);
|
|
Files.createDirectories(path.getParent());
|
|
- Files.write(path, Collections.singleton(curdata), Charset.defaultCharset());
|
|
+ Files.write(path, Collections.singleton(curdata), cs);
|
|
} catch (IOException e) {
|
|
throw new MavenReportException("Error checking stale data", e);
|
|
}
|
|
Only in maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc: StaleHelper.java.orig
|
|
Only in maven-javadoc-plugin-3.5.0/src/main/java/org/apache/maven/plugins/javadoc: StaleHelper.java.rej
|