Update release notes, fix a merge issue with tests

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

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