From 2301785a0e1b67b010721f7af1476160cab128f8 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 24 Oct 2022 16:32:10 -0700
Subject: [PATCH] Update release notes, fix a merge issue with tests

---
 release-notes/VERSION                    |  5 +++++
 src/test/java/wstxtest/BaseWstxTest.java | 23 -----------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/release-notes/VERSION b/release-notes/VERSION
index 56d0dec0..1ba09a2c 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -4,6 +4,11 @@ Project: woodstox
 === Releases ===
 ------------------------------------------------------------------------
 
+6.4.0 (not yet released)
+
+#160: Add limit and configuration setting for maximum nesting for DTD subsets
+ (contributed by @pjfanning)
+
 6.3.1 (13-Aug-2022)
 
 #155: Declare `osgi.serviceloader.registrar` requirement as optional
diff --git a/src/test/java/wstxtest/BaseWstxTest.java b/src/test/java/wstxtest/BaseWstxTest.java
index 2e79d01c..8bcb5966 100644
--- a/src/test/java/wstxtest/BaseWstxTest.java
+++ b/src/test/java/wstxtest/BaseWstxTest.java
@@ -494,29 +494,6 @@ protected static String getAndVerifyText(XMLStreamReader sr)
         return text;
     }
 
-    protected byte[] readResource(String ref)
-    {
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        final byte[] buf = new byte[4000];
-
-        InputStream in = getClass().getResourceAsStream(ref);
-        if (in != null) {
-            try {
-                int len;
-                while ((len = in.read(buf)) > 0) {
-                    bytes.write(buf, 0, len);
-                }
-                in.close();
-            } catch (IOException e) {
-                throw new RuntimeException("Failed to read resource '"+ref+"': "+e);
-            }
-        }
-        if (bytes.size() == 0) {
-            throw new IllegalArgumentException("Failed to read resource '"+ref+"': empty resource?");
-        }
-        return bytes.toByteArray();
-    }
-
     /*
     //////////////////////////////////////////////////
     // Misc other helpers