diff --git a/build.gradle b/build.gradle
index 132390111d..b7fa2ac7d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -647,8 +647,7 @@ rat {
         "poi/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml",
         "poi-ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml",
         "poi-ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml",
-        "poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdES*.xsd",
-        "poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd",
+        "poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/*.xsd",
         "poi-ooxml-full/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd",
         "osgi/README.md",
         "src/resources/ooxml-lite-report.*",
diff --git a/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
index 8f4c89587f..88b269b687 100644
--- a/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
@@ -57,11 +57,8 @@ public final class POIXMLDocumentHandler {
      * @param base the entry point
      */
     protected static void cursorRecursive(XmlObject base) {
-        XmlCursor cur = base.newCursor();
-        try {
+        try (XmlCursor cur = base.newCursor()) {
             cursorRecursive(cur);
-        } finally {
-            cur.dispose();
         }
     }