From: PJ Fanning <fanningpj@apache.org>
Date: Tue, 6 Jul 2021 16:47:59 +0000 (+0000)
Subject: add explicit commons-io dependency to poi-ooxml. This closes #237
X-Git-Tag: REL_5_1_0~166
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6c1bd2816814705917e7d62ce3e708faf29b0bf6;p=poi.git

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 ec4519ccea..05581f8867 100644
--- 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 a11cdf5a28..f6e5ef2e31 100644
--- 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 f8e193e41e..33b80813cb 100644
--- 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 8800b475e6..b8a3941b32 100644
--- 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 a94109211a..7be1fee10b 100644
--- 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 0157ce5e97..343df0bcd8 100644
--- 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>