From 85f3f94e6f200f35fe7d1caf19bc5ead28f78826 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Tue, 10 Oct 2023 11:14:01 +0200 Subject: [PATCH 1/3] Revert "Replaced deprecated and now broken `ReaderInputStream` constructor call." This reverts commit 59f5929b498b54fc4d80d784d754ab49c7676b36. --- src/main/java/edu/hm/hafner/util/SecureXmlParserFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/hm/hafner/util/SecureXmlParserFactory.java b/src/main/java/edu/hm/hafner/util/SecureXmlParserFactory.java index f87d512e..b50492a2 100644 --- a/src/main/java/edu/hm/hafner/util/SecureXmlParserFactory.java +++ b/src/main/java/edu/hm/hafner/util/SecureXmlParserFactory.java @@ -306,9 +306,8 @@ public Document readDocument(final Reader reader, final Charset charset) { } } - private InputSource createInputSource(final Reader reader, final Charset charset) throws IOException { - var inputStream = ReaderInputStream.builder().setCharset(charset).setReader(reader).get(); - return new InputSource(inputStream); + private InputSource createInputSource(final Reader reader, final Charset charset) { + return new InputSource(new ReaderInputStream(reader, charset)); } /** From ffc445c99be6473c84a1d00ba30f1075d97bc591 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Tue, 10 Oct 2023 11:37:40 +0200 Subject: [PATCH 2/3] Revert commons-io to 2.11.0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4cd090e..ef157c07 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 4.7.3 3.13.0 - 2.14.0 + 2.11.0 1.3.2 1.14.8 From 51c88020bcf1808272a129aab54e445ff5b2da60 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Tue, 10 Oct 2023 11:38:16 +0200 Subject: [PATCH 3/3] Remove PMD rule `LocalVariableNamingConventions`. --- etc/pmd-configuration.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/pmd-configuration.xml b/etc/pmd-configuration.xml index 9fe395f7..f1342ecc 100644 --- a/etc/pmd-configuration.xml +++ b/etc/pmd-configuration.xml @@ -31,6 +31,7 @@ +