This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bdf3a60560a93430148c20b92f100fdc8c8664ba Author: opencode <[email protected]> AuthorDate: Wed Oct 14 16:05:20 2026 +0200 Java compatibility --- test/org/apache/jasper/compiler/TestTldCache.java | 6 ++++-- test/org/apache/jasper/servlet/TestTldScanner.java | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/org/apache/jasper/compiler/TestTldCache.java b/test/org/apache/jasper/compiler/TestTldCache.java index 8b89a4ad06..9c2c56dc68 100644 --- a/test/org/apache/jasper/compiler/TestTldCache.java +++ b/test/org/apache/jasper/compiler/TestTldCache.java @@ -17,9 +17,9 @@ package org.apache.jasper.compiler; import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.net.URL; -import java.nio.file.Files; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -63,7 +63,9 @@ public class TestTldCache { + "<short-name>tester</short-name>" + "<uri>" + uri + "</uri>" + "</taglib>"; - Files.writeString(file.toPath(), content); + try (FileWriter writer = new FileWriter(file)) { + writer.write(content); + } file.deleteOnExit(); return file; } diff --git a/test/org/apache/jasper/servlet/TestTldScanner.java b/test/org/apache/jasper/servlet/TestTldScanner.java index ef5b8cda95..40dbfc7b4a 100644 --- a/test/org/apache/jasper/servlet/TestTldScanner.java +++ b/test/org/apache/jasper/servlet/TestTldScanner.java @@ -17,10 +17,10 @@ package org.apache.jasper.servlet; import java.io.File; +import java.io.FileWriter; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.net.URL; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Collections; import java.util.HashMap; @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletContext; import org.junit.Assert; import org.junit.Test; @@ -153,7 +153,9 @@ public class TestTldScanner extends TomcatBaseTest { content.append(" ").append(extraElements).append('\n'); } content.append("</taglib>\n"); - Files.writeString(implicitTld.toPath(), content, StandardCharsets.UTF_8); + try (FileWriter writer = new FileWriter(implicitTld)) { + writer.write(content.toString()); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
