diff --git a/build.xml b/build.xml
index b3db7068a3..1896cc41f3 100644
--- a/build.xml
+++ b/build.xml
@@ -1074,8 +1074,10 @@ under the License.
                 </filterchain>
             </loadresource>
 
+            <echo message="Building classes for @{module}"/>
+
             <!-- compile the sources -->
-            <javac release="8"
+            <javac
                    target="${jdk.version.class}"
                    source="${jdk.version.source}"
                    destdir="@{classes}"
@@ -1097,6 +1099,8 @@ under the License.
                 </filterchain>
             </loadresource>
 
+            <echo message="Building java9+ classes for @{module}"/>
+
             <!-- compile jigsaw files to sources, so we don't forget to update/provide them for Java 8 builds -->
             <javac release="9"
                    srcdir="${basedir}/@{module}/src/main/java9"
diff --git a/poi-excelant/src/main/java9/module-info.class b/poi-excelant/src/main/java9/module-info.class
index 271b567453..95b0590d80 100644
Binary files a/poi-excelant/src/main/java9/module-info.class and b/poi-excelant/src/main/java9/module-info.class differ
diff --git a/poi-excelant/src/test/java9/module-info.class b/poi-excelant/src/test/java9/module-info.class
index bc5c4be45e..281315a4d4 100644
Binary files a/poi-excelant/src/test/java9/module-info.class and b/poi-excelant/src/test/java9/module-info.class differ
diff --git a/poi-ooxml-lite-agent/src/main/java9/module-info.class b/poi-ooxml-lite-agent/src/main/java9/module-info.class
index 25db90320c..d445b14e8a 100644
Binary files a/poi-ooxml-lite-agent/src/main/java9/module-info.class and b/poi-ooxml-lite-agent/src/main/java9/module-info.class differ
diff --git a/poi-ooxml-lite/src/main/java9/module-info.class b/poi-ooxml-lite/src/main/java9/module-info.class
index 81a57f1fdf..61cdb0a1b8 100644
Binary files a/poi-ooxml-lite/src/main/java9/module-info.class and b/poi-ooxml-lite/src/main/java9/module-info.class differ
diff --git a/poi-ooxml-lite/src/main/java9/module-info.java b/poi-ooxml-lite/src/main/java9/module-info.java
index 090dc1e6d6..d845bb4ddb 100644
--- a/poi-ooxml-lite/src/main/java9/module-info.java
+++ b/poi-ooxml-lite/src/main/java9/module-info.java
@@ -23,8 +23,6 @@ open module org.apache.poi.ooxml.schemas {
     requires java.xml;
 
 
-
-
     exports com.microsoft.schemas.compatibility;
     exports com.microsoft.schemas.office.drawing.x2008.diagram;
     exports com.microsoft.schemas.office.excel;
diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class
index e6ae9b24f1..f4de282d8f 100644
Binary files a/poi-ooxml/src/main/java9/module-info.class and b/poi-ooxml/src/main/java9/module-info.class differ
diff --git a/poi-ooxml/src/main/java9/module-info.java b/poi-ooxml/src/main/java9/module-info.java
index 51533acbd6..69636d8960 100644
--- a/poi-ooxml/src/main/java9/module-info.java
+++ b/poi-ooxml/src/main/java9/module-info.java
@@ -91,7 +91,6 @@ module org.apache.poi.ooxml {
     requires static org.apache.santuario.xmlsec;
     requires static org.bouncycastle.provider;
     requires static org.bouncycastle.pkix;
-    requires static org.codehaus.stax2;
 
     /* optional dependencies for slideshow rendering via PPTX2PNG */
     requires static batik.anim;
diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
index 48fd327628..7c96479a45 100644
Binary files a/poi-ooxml/src/test/java9/module-info.class and b/poi-ooxml/src/test/java9/module-info.class differ
diff --git a/poi-ooxml/src/test/java9/module-info.java b/poi-ooxml/src/test/java9/module-info.java
index a6a78d6e4e..7ed78a0e75 100644
--- a/poi-ooxml/src/test/java9/module-info.java
+++ b/poi-ooxml/src/test/java9/module-info.java
@@ -89,7 +89,6 @@ module org.apache.poi.ooxml {
     requires static org.apache.santuario.xmlsec;
     requires static org.bouncycastle.provider;
     requires static org.bouncycastle.pkix;
-    requires static org.codehaus.stax2;
 
 
     /* optional dependencies for slideshow rendering via PPTX2PNG */
diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class
index 559f2cc250..9a3a927772 100644
Binary files a/poi-scratchpad/src/main/java9/module-info.class and b/poi-scratchpad/src/main/java9/module-info.class differ
diff --git a/poi-scratchpad/src/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class
index 385430d091..21de811871 100644
Binary files a/poi-scratchpad/src/test/java9/module-info.class and b/poi-scratchpad/src/test/java9/module-info.class differ