diff --git a/config/suppressions.xml b/config/suppressions.xml index b8204d3a6..347590eca 100644 --- a/config/suppressions.xml +++ b/config/suppressions.xml @@ -34,7 +34,7 @@ + lines="44"/> de.thetaphi forbiddenapis - 2.0 + 2.1 ${java.version} - true false jdk-unsafe jdk-deprecated jdk-system-out + jdk-non-portable diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java index 1fd69d78a..ed6fbb784 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java @@ -24,6 +24,7 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.StringWriter; import java.nio.charset.StandardCharsets; +import java.util.Locale; import java.util.ResourceBundle; import com.puppycrawl.tools.checkstyle.api.AuditEvent; @@ -84,7 +85,7 @@ public class XMLLogger writer.println(""); final ResourceBundle compilationProperties = - ResourceBundle.getBundle("checkstylecompilation"); + ResourceBundle.getBundle("checkstylecompilation", Locale.ROOT); final String version = compilationProperties.getString("checkstyle.compile.version"); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java b/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java index 0478dacf7..b3d507258 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTask.java @@ -283,7 +283,7 @@ public class CheckstyleAntTask extends Task { try { // output version info in debug mode final ResourceBundle compilationProperties = ResourceBundle - .getBundle("checkstylecompilation"); + .getBundle("checkstylecompilation", Locale.ROOT); final String version = compilationProperties .getString("checkstyle.compile.version"); final String compileTimestamp = compilationProperties diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtils.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtils.java index f1594b4be..13b39a18d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtils.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtils.java @@ -20,6 +20,7 @@ package com.puppycrawl.tools.checkstyle.utils; import java.lang.reflect.Field; +import java.util.Locale; import java.util.ResourceBundle; import com.google.common.collect.ImmutableMap; @@ -150,7 +151,7 @@ public final class TokenUtils { final String tokenTypes = "com.puppycrawl.tools.checkstyle.api.tokentypes"; - final ResourceBundle bundle = ResourceBundle.getBundle(tokenTypes); + final ResourceBundle bundle = ResourceBundle.getBundle(tokenTypes, Locale.ROOT); return bundle.getString(name); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java index c6f349e23..fb6bf6f6c 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java @@ -235,7 +235,7 @@ public class MainTest { public void checkAssertion() throws IOException { final String expectedPath = getFilePath("InputMain.java"); final ResourceBundle compilationProperties = - ResourceBundle.getBundle("checkstylecompilation"); + ResourceBundle.getBundle("checkstylecompilation", Locale.ROOT); final String version = compilationProperties .getString("checkstyle.compile.version"); assertEquals(String.format(Locale.ROOT,