This is an automated email from the ASF dual-hosted git repository. ottlinger pushed a commit to branch fix/updateSpotbugsUseUTF8EncodingByDefault in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
commit 9cf7f0ee2ee5e2d9ce7cd921e50e9148a2b8707b Author: P. Ottlinger <[email protected]> AuthorDate: Fri Jun 12 11:16:45 2026 +0200 RAT-532: Update spotbugs and use UTF-8 encoding in LicenseAppender and XmlWriter --- .../main/java/org/apache/rat/annotation/AbstractLicenseAppender.java | 2 +- .../src/main/java/org/apache/rat/report/xml/writer/XmlWriter.java | 3 ++- pom.xml | 2 +- src/changes/changes.xml | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java index 3444676a..c865bd54 100644 --- a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java +++ b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java @@ -308,7 +308,7 @@ public abstract class AbstractLicenseAppender { // for Java just place the license at the front, for XML add // an XML decl first - don't know how to handle PHP if (expectsPackage || expectsXMLDecl) { - try (FileWriter writer2 = new FileWriter(newDocument)) { + try (FileWriter writer2 = new FileWriter(newDocument, StandardCharsets.UTF_8)) { if (expectsXMLDecl) { writer2.write("<?xml version='1.0'?>"); writer2.write(LINE_SEP); diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriter.java b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriter.java index 3cb591ef..9a49fbdd 100644 --- a/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriter.java +++ b/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/XmlWriter.java @@ -21,6 +21,7 @@ package org.apache.rat.report.xml.writer; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayDeque; import java.util.HashSet; import java.util.Objects; @@ -327,7 +328,7 @@ public final class XmlWriter implements IXmlWriter { ByteArrayOutputStream baos = new ByteArrayOutputStream(); transformer.transform(new DOMSource(document), new StreamResult(baos)); - appendable.append(baos.toString()); + appendable.append(baos.toString(StandardCharsets.UTF_8)); } catch (TransformerException e) { throw new IOException(e); } diff --git a/pom.xml b/pom.xml index 1bfe0314..06d9ca4b 100644 --- a/pom.xml +++ b/pom.xml @@ -538,7 +538,7 @@ agnostic home for software distribution comprehension and audit tools. <plugin> <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-maven-plugin</artifactId> - <version>4.9.8.3</version> + <version>4.10.2.0</version> <configuration> <maxAllowedViolations>46</maxAllowedViolations> <failOnError>true</failOnError> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 1d9683f3..87722539 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -68,6 +68,9 @@ in order to be properly linked in site reports. </release> --> <release version="1.0.0-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done"> + <action issue="RAT-532" type="update" dev="pottlinger" due-to="dependabot"> + Update to spotbugs-maven-plugin to 4.10.2.0 and use UTF-8 as fallback encoding in LicenseAppender and XmlWriter. + </action> <action issue="RAT-558" type="add" dev="pottlinger"> Add a basic security and agents configuration to Apache RAT. </action>
