add explicit commons-io dependency to poi-ooxml. This closes #237

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

diff --git a/build.gradle b/build.gradle
index ec4519cceab6e4edba541d2a6eb5c1c44e04f751..05581f8867789618a18f961e9b5375ea4c508e92 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -210,6 +210,7 @@ subprojects {
         exclude '**/BaseTestCellUtil.class'
         exclude '**/TestUnfixedBugs.class'
         exclude '**/TestOneFile.class'
+        include '**/TestSig*.class'
 
         // Exclude Test Suites
         exclude '**/All*Tests.class'

diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index a11cdf5a282e244e6a89dcfccbd9883f274763b7..f6e5ef2e31fcf9899325aef658956acaebda3b5d 100644 (file)
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -71,6 +71,11 @@
             <artifactId>commons-compress</artifactId>
             <version>1.20</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.10.0</version>
+        </dependency>
         <dependency>
             <groupId>com.github.virtuald</groupId>
             <artifactId>curvesapi</artifactId>

diff --git a/poi-ooxml-lite/src/main/java9/module-info.java b/poi-ooxml-lite/src/main/java9/module-info.java
index f8e193e41eb3c31e7bfd1dfa2c32174435a6fe46..33b80813cb1ade72f77670fc68a7fa3fb8389dcd 100644 (file)
--- a/poi-ooxml-lite/src/main/java9/module-info.java
+++ b/poi-ooxml-lite/src/main/java9/module-info.java
@@ -25,28 +25,20 @@ open module org.apache.poi.ooxml.schemas {
 
 
 
-    exports com.microsoft.schemas.compatibility;
     exports com.microsoft.schemas.office.excel;
     exports com.microsoft.schemas.office.office;
-    exports com.microsoft.schemas.office.visio.x2012.main;
-    exports com.microsoft.schemas.office.word;
     exports com.microsoft.schemas.office.x2006.digsig;
     exports com.microsoft.schemas.vml;
     exports org.apache.poi.schemas.ooxml.system.ooxml;
     exports org.apache.poi.schemas.vmldrawing;
     exports org.etsi.uri.x01903.v13;
-    exports org.openxmlformats.schemas.drawingml.x2006.chart;
     exports org.openxmlformats.schemas.drawingml.x2006.main;
     exports org.openxmlformats.schemas.drawingml.x2006.picture;
     exports org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing;
-    exports org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing;
     exports org.openxmlformats.schemas.officeDocument.x2006.customProperties;
-    exports org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes;
     exports org.openxmlformats.schemas.officeDocument.x2006.extendedProperties;
-    exports org.openxmlformats.schemas.officeDocument.x2006.math;
     exports org.openxmlformats.schemas.officeDocument.x2006.relationships;
     exports org.openxmlformats.schemas.officeDocument.x2006.sharedTypes;
-    exports org.openxmlformats.schemas.presentationml.x2006.main;
     exports org.openxmlformats.schemas.spreadsheetml.x2006.main;
     exports org.openxmlformats.schemas.wordprocessingml.x2006.main;
     exports org.openxmlformats.schemas.xpackage.x2006.digitalSignature;

diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 8800b475e66315cc6ad2c8210df5373197a255fd..b8a3941b32badb7b9308a480e50da0c7476c5072 100644 (file)
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -50,6 +50,7 @@ dependencies {
 
     implementation 'org.apache.commons:commons-collections4:4.4'
     api "org.apache.commons:commons-compress:${commonsCompressVersion}"
+    api "commons-io:commons-io:${commonsIoVersion}"
     api 'org.apache.santuario:xmlsec:2.2.2'
     api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
     api "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}"

diff --git a/poi/src/main/java9/module-info.java b/poi/src/main/java9/module-info.java
index a94109211a93c3a2b126cbef8bba996c7d779598..7be1fee10b133274d1704458e1d3ff91eec1cf1b 100644 (file)
--- a/poi/src/main/java9/module-info.java
+++ b/poi/src/main/java9/module-info.java
@@ -18,6 +18,8 @@
 module org.apache.poi.poi {
     requires org.apache.commons.collections4;
     requires org.apache.commons.codec;
+    requires org.apache.commons.compress;
+    requires org.apache.commons.io;
     requires commons.math3;
     requires SparseBitSet;
     requires org.apache.logging.log4j;

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 0157ce5e970cfcf872d70e9fcd4232873d2ca1dd..343df0bcd8e262c23f8a09b19e262d7f18803f10 100644 (file)
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -151,6 +151,11 @@
             <artifactId>commons-compress</artifactId>
             <version>1.20</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.10.0</version>
+        </dependency>
         <dependency>
             <groupId>com.github.virtuald</groupId>
             <artifactId>curvesapi</artifactId>