Skip to content

Fix bug by using UTF-8 unconditionally #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elharo wants to merge 2 commits into from
Closed

Fix bug by using UTF-8 unconditionally #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6573a98
Fix bug by using UTF-8 unconditionally
elharo Oct 15, 2025
bc04cb7
Name directory directly
elharo Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...cts/MJAVADOC-679_encoding/module1/pom.xml → ...ects/MJAVADOC-679_encoding/môdülé/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...odule1/src/main/java/com/foo/MyClass.java → ...môdülé/src/main/java/com/foo/MyClass.java
View file
Open in desktop
File renamed without changes.
20 changes: 0 additions & 20 deletions src/it/projects/MJAVADOC-679_encoding/setup.groovy
View file
Open in desktop

This file was deleted.

26 changes: 5 additions & 21 deletions src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
Expand All @@ -31,7 +30,6 @@
import java.util.List;

import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.languages.java.version.JavaVersion;
import org.codehaus.plexus.util.cli.Commandline;

/**
Expand All @@ -41,21 +39,7 @@
public class StaleHelper {

/**
* Compute the encoding of the stale javadoc
*
* @return the encoding of the stale data
*/
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
* Compute the data used to detect a stale javadoc.
*
* @param cmd the command line
* @return the stale data
Expand All @@ -72,7 +56,7 @@ public static List<String> getStaleData(Commandline cmd) throws MavenReportExcep
for (String arg : args) {
if (arg.startsWith("@")) {
String name = arg.substring(1);
options.addAll(Files.readAllLines(dir.resolve(name), getDataCharset()));
options.addAll(Files.readAllLines(dir.resolve(name), StandardCharsets.UTF_8));
ignored.add(name);
}
}
Expand Down Expand Up @@ -113,17 +97,17 @@ public static List<String> getStaleData(Commandline cmd) throws MavenReportExcep
}

/**
* Write the data used to detect a stale javadoc
* Write the data used to detect a stale javadoc.
*
* @param cmd the command line
* @param path the stale data path
* @throws MavenReportException if an error occurs
*/
public static void writeStaleData(Commandline cmd, Path path) throws MavenReportException {
try {
List<String> curdata = getStaleData(cmd);
List<String> currentData = getStaleData(cmd);
Files.createDirectories(path.getParent());
Files.write(path, curdata, getDataCharset());
Files.write(path, currentData, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new MavenReportException("Error checking stale data", e);
}
Expand Down
Loading