update some module-info classes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903003 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index b3db7068a3b2d189b2ab7cdfaf027021d094aaef..1896cc41f329d02a42c041480f895d2b92a3a748 100644 (file)
--- 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 271b567453affe97d9dd6768cdd2550a29e5991f..95b0590d80e5f25cafab86a7ee0f9845e0d66315 100644 (file)
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 bc5c4be45ea8a67f04ec4d26a72a894ec9de6555..281315a4d42f27a1dcffaa20eb202f81637936f8 100644 (file)
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 25db90320c40bc0e8b1946f59a2798531c23d9b7..d445b14e8af144ec4261ddb4cd9efcccb7e8bc6c 100644 (file)
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 81a57f1fdf368d9cc4c2a37f98721de2788b06b3..61cdb0a1b8ed9ad1d72863186c161d73fa319cde 100644 (file)
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 090dc1e6d60c02850a9136d8365e87b9bedaede8..d845bb4ddbed99cf258c78419cdb483bada488f0 100644 (file)
--- 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 e6ae9b24f192466de10635727015e9eb8f51dd13..f4de282d8f41ca5b369c7fae640da7e5c782375d 100644 (file)
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 51533acbd6ae422268845a6a265adebd2d29e48f..69636d8960d9a545c329c89592829a8f037c95bc 100644 (file)
--- 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 48fd3276288b4ec91caf4c4fbccad4ed39a2eade..7c96479a4509662fe931ca55a1c0468a98bf7a93 100644 (file)
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 a6a78d6e4e388a2656a6593486ad3079826ee62f..7ed78a0e75b41181d1e7c2fb39f395ebb2dad02a 100644 (file)
--- 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 559f2cc250f86106811fc4dbe76fc4787dbee327..9a3a927772b8f5de3a9b219c58fbbe6387a97ed6 100644 (file)
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 385430d0919e062d86108372150f9de0218441a5..21de811871ea20a71217f15ffa83ca3e2aa73a97 100644 (file)
Binary files a/poi-scratchpad/src/test/java9/module-info.class and b/poi-scratchpad/src/test/java9/module-info.class differ