[tomcat] branch 10.1.x updated: Fix some deprecation warnings when building with newer versions of Java

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 1006b3ba4d Fix some deprecation warnings when building with newer 
versions of Java
1006b3ba4d is described below

commit 1006b3ba4db03c47b966af1440cd3fb20af6d382
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 21 09:31:29 2022 +0100

    Fix some deprecation warnings when building with newer versions of Java
---
 test/org/apache/catalina/connector/TestResponse.java   | 2 +-
 test/org/apache/tomcat/util/res/TestStringManager.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/catalina/connector/TestResponse.java 
b/test/org/apache/catalina/connector/TestResponse.java
index b4924921c0..73ee4674f1 100644
--- a/test/org/apache/catalina/connector/TestResponse.java
+++ b/test/org/apache/catalina/connector/TestResponse.java
@@ -645,7 +645,7 @@ public class TestResponse extends TomcatBaseTest {
     private static final String TEXT_ISO_8859_1 = TEXT + ";charset=" + 
ISO_8859_1;
     private static final String TEXT_UTF_8 = TEXT + ";charset=" + UTF_8;
     private static final String TEXT_UNKNOWN = TEXT + ";charset=" + UNKNOWN;
-    private static final Locale UNDETERMINED = new Locale("und");
+    private static final Locale UNDETERMINED = Locale.forLanguageTag("xxx");
 
     @Test
     public void testSetCharacterEncoding01() {
diff --git a/test/org/apache/tomcat/util/res/TestStringManager.java 
b/test/org/apache/tomcat/util/res/TestStringManager.java
index 4b01db8779..289d3973df 100644
--- a/test/org/apache/tomcat/util/res/TestStringManager.java
+++ b/test/org/apache/tomcat/util/res/TestStringManager.java
@@ -31,8 +31,9 @@ public class TestStringManager {
     private static final StringManager sm = 
StringManager.getManager(PACKAGE_NAME);
 
     private static final Locale[] ALL_LOCALES = new Locale[] {
-            Locale.ENGLISH, new Locale("cs"), Locale.GERMAN, new Locale("es"), 
Locale.FRENCH, Locale.JAPANESE,
-            Locale.KOREAN, new Locale("pt_BR"), new Locale("ru"), 
Locale.SIMPLIFIED_CHINESE };
+            Locale.ENGLISH, Locale.forLanguageTag("cs"), Locale.GERMAN, 
Locale.forLanguageTag("es"), Locale.FRENCH,
+            Locale.JAPANESE, Locale.KOREAN, Locale.forLanguageTag("pt_BR"), 
Locale.forLanguageTag("ru"),
+            Locale.SIMPLIFIED_CHINESE };
     private static final Set<Locale> CJK_LOCALES;
 
     static {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org