From 6fcdcde885d074c97c39bc088dcbdb9592c2bc75 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Mon, 28 Mar 2022 14:02:05 -0400
Subject: [PATCH] poi fix

---
 CoreLibs/ivy.xml                      |  7 +--
 CoreLibs/nbproject/project.properties |  1 -
 CoreLibs/nbproject/project.xml        | 35 ---------------
 Tika/ivy.xml                          |  2 +
 Tika/nbproject/project.properties     |  3 ++
 Tika/nbproject/project.xml            | 61 ++++++++++++++++++++++++++-
 6 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index d2465abdfc..099c816fe1 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -5,9 +5,7 @@
         <conf name="autopsy_core"/>
         
     </configurations>
-    <dependencies>       
-        <!-- <dependency conf="autopsy_core->default" org="com.google.code.gson" name="gson" rev="2.9.0"/>      -->
-        
+    <dependencies>              
         <dependency conf="autopsy_core->default" org="org.apache.ant" name="ant-launcher" rev="1.10.12"/>
         <dependency conf="autopsy_core->default" org="org.apache.ant" name="ant" rev="1.10.12"/>
 
@@ -37,9 +35,6 @@
         <dependency conf="autopsy_core->default" org="commons-logging" name="commons-logging" rev="1.2"/>
         <dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.11.0"/>
         <dependency conf="autopsy_core->default" org="log4j" name="log4j" rev="1.2.17"/>
-        <dependency conf="autopsy_core->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
-        <!-- <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-excelant" rev="5.2.2"/>
-        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-scratchpad" rev="5.2.2"/> -->
         <dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.7"/>
         <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.4"/>
         <dependency conf="autopsy_core->default" org="commons-collections" name="commons-collections" rev="3.2.2"/>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 1d3b05115d..6735014d44 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -114,7 +114,6 @@ file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
 file.reference.slf4j-reload4j-1.7.36.jar=release/modules/ext/slf4j-reload4j-1.7.36.jar
 file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar
 file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar
-file.reference.xmlbeans-3.0.1.jar=release/modules/ext/xmlbeans-3.0.1.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 nbm.needs.restart=true
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index a98aadce8e..bc6d1351a8 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -201,12 +201,6 @@
                 <package>com.google.rpc.context</package>
                 <package>com.google.thirdparty.publicsuffix</package>
                 <package>com.google.type</package>
-                <package>com.microsoft.schemas.office.excel</package>
-                <package>com.microsoft.schemas.office.excel.impl</package>
-                <package>com.microsoft.schemas.office.office</package>
-                <package>com.microsoft.schemas.office.office.impl</package>
-                <package>com.microsoft.schemas.office.visio.x2012.main</package>
-                <package>com.microsoft.schemas.office.visio.x2012.main.impl</package>
                 <package>com.microsoft.schemas.vml</package>
                 <package>com.microsoft.schemas.vml.impl</package>
                 <package>com.sun.jna</package>
@@ -464,36 +458,11 @@
                 <package>org.opencv.photo</package>
                 <package>org.opencv.utils</package>
                 <package>org.opencv.video</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.chart</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.chart.impl</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.main</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.main.impl</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.picture</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.picture.impl</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing</package>
-                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships</package>
-                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships.impl</package>
-                <package>org.openxmlformats.schemas.presentationml.x2006.main</package>
-                <package>org.openxmlformats.schemas.presentationml.x2006.main.impl</package>
-                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main</package>
-                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main.impl</package>
-                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main</package>
-                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main.impl</package>
                 <package>org.sleuthkit.autopsy.corelibs</package>
                 <package>org.slf4j</package>
                 <package>org.slf4j.event</package>
                 <package>org.slf4j.helpers</package>
                 <package>org.slf4j.spi</package>
-                <package>schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443</package>
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/animal-sniffer-annotations-1.21.jar</runtime-relative-path>
@@ -959,10 +928,6 @@
                 <runtime-relative-path>ext/webp-imageio-sejda-0.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/webp-imageio-sejda-0.1.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-3.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlbeans-3.0.1.jar</binary-origin>
-            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/Tika/ivy.xml b/Tika/ivy.xml
index a67016df6e..096749a5e2 100755
--- a/Tika/ivy.xml
+++ b/Tika/ivy.xml
@@ -5,6 +5,8 @@
     </configurations>
     <dependencies >
         <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers" rev="1.28.1"/>
+        <dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
+        
         <override org="org.jsoup" module="jsoup" rev="1.14.3"/>
         <override org="org.apache.poi" module="poi-ooxml-schemas" rev="4.1.2"/>
         <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index 95a5a15c7d..f040facd2f 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -67,6 +67,7 @@ file.reference.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar
 file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar
 file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
 file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
+file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
 file.reference.jul-to-slf4j-1.7.36.jar=release/modules/ext/jul-to-slf4j-1.7.36.jar
 file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
 file.reference.junrar-7.4.1.jar=release/modules/ext/junrar-7.4.1.jar
@@ -74,6 +75,7 @@ file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=re
 file.reference.mchange-commons-java-0.2.19.jar=release/modules/ext/mchange-commons-java-0.2.19.jar
 file.reference.metadata-extractor-2.15.0.1.jar=release/modules/ext/metadata-extractor-2.15.0.1.jar
 file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar
+file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar
 file.reference.openjson-1.0.12.jar=release/modules/ext/openjson-1.0.12.jar
 file.reference.opennlp-tools-1.9.4.jar=release/modules/ext/opennlp-tools-1.9.4.jar
 file.reference.parso-2.0.14.jar=release/modules/ext/parso-2.0.14.jar
@@ -95,6 +97,7 @@ file.reference.sis-netcdf-1.1.jar=release/modules/ext/sis-netcdf-1.1.jar
 file.reference.sis-referencing-1.1.jar=release/modules/ext/sis-referencing-1.1.jar
 file.reference.sis-storage-1.1.jar=release/modules/ext/sis-storage-1.1.jar
 file.reference.sis-utility-1.1.jar=release/modules/ext/sis-utility-1.1.jar
+file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
 file.reference.SparseBitSet-1.2.jar=release/modules/ext/SparseBitSet-1.2.jar
 file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar
 file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index b3e31e51de..9dc448105e 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -17,6 +17,12 @@
                 </dependency>
             </module-dependencies>
             <public-packages>
+                <package>com.microsoft.schemas.office.excel</package>
+                <package>com.microsoft.schemas.office.excel.impl</package>
+                <package>com.microsoft.schemas.office.office</package>
+                <package>com.microsoft.schemas.office.office.impl</package>
+                <package>com.microsoft.schemas.office.visio.x2012.main</package>
+                <package>com.microsoft.schemas.office.visio.x2012.main.impl</package>
                 <package>org.apache.james.mime4j</package>
                 <package>org.apache.james.mime4j.dom</package>
                 <package>org.apache.james.mime4j.dom.address</package>
@@ -138,9 +144,9 @@
                 <package>org.apache.poi.ss.formula.ptg</package>
                 <package>org.apache.poi.ss.formula.udf</package>
                 <package>org.apache.poi.ss.usermodel</package>
+                <package>org.apache.poi.ss.usermodel.charts</package>
                 <package>org.apache.poi.ss.usermodel.helpers</package>
                 <package>org.apache.poi.ss.util</package>
-                <package>org.apache.poi.ss.usermodel.charts</package>
                 <package>org.apache.poi.ss.util.cellwalk</package>
                 <package>org.apache.poi.util</package>
                 <package>org.apache.poi.wp.usermodel</package>
@@ -281,7 +287,19 @@
                 <package>org.apache.xmlbeans.impl.config</package>
                 <package>org.apache.xmlbeans.impl.inst2xsd</package>
                 <package>org.apache.xmlbeans.impl.inst2xsd.util</package>
+                <package>org.apache.xmlbeans.impl.jam</package>
+                <package>org.apache.xmlbeans.impl.jam.annotation</package>
+                <package>org.apache.xmlbeans.impl.jam.internal</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.classrefs</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.elements</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.javadoc</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.parser</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.reflect</package>
+                <package>org.apache.xmlbeans.impl.jam.provider</package>
+                <package>org.apache.xmlbeans.impl.jam.visitor</package>
+                <package>org.apache.xmlbeans.impl.jam.xml</package>
                 <package>org.apache.xmlbeans.impl.regex</package>
+                <package>org.apache.xmlbeans.impl.repackage</package>
                 <package>org.apache.xmlbeans.impl.richParser</package>
                 <package>org.apache.xmlbeans.impl.schema</package>
                 <package>org.apache.xmlbeans.impl.soap</package>
@@ -302,11 +320,40 @@
                 <package>org.apache.xmlbeans.impl.xb.xsdownload.impl</package>
                 <package>org.apache.xmlbeans.impl.xb.xsdschema</package>
                 <package>org.apache.xmlbeans.impl.xb.xsdschema.impl</package>
+                <package>org.apache.xmlbeans.impl.xpath.saxon</package>
                 <package>org.apache.xmlbeans.impl.xpathgen</package>
+                <package>org.apache.xmlbeans.impl.xquery.saxon</package>
                 <package>org.apache.xmlbeans.impl.xsd2inst</package>
                 <package>org.apache.xmlbeans.soap</package>
                 <package>org.apache.xmlbeans.xml.stream</package>
                 <package>org.apache.xmlbeans.xml.stream.events</package>
+                <package>org.apache.xmlbeans.xml.stream.utils</package>
+                <package>org.apache.xmlcommons</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.chart</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.chart.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.main</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.picture</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.picture.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships.impl</package>
+                <package>org.openxmlformats.schemas.presentationml.x2006.main</package>
+                <package>org.openxmlformats.schemas.presentationml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main</package>
+                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main</package>
+                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main.impl</package>
+                <package>schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443</package>
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/apache-mime4j-core-0.8.4.jar</runtime-relative-path>
@@ -584,6 +631,10 @@
                 <runtime-relative-path>ext/json-simple-1.1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/json-simple-1.1.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsr305-3.0.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jul-to-slf4j-1.7.36.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jul-to-slf4j-1.7.36.jar</binary-origin>
@@ -612,6 +663,10 @@
                 <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/netcdf4-4.5.5.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/ooxml-schemas-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/ooxml-schemas-1.4.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/openjson-1.0.12.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/openjson-1.0.12.jar</binary-origin>
@@ -696,6 +751,10 @@
                 <runtime-relative-path>ext/sis-utility-1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sis-utility-1.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/SparseBitSet-1.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/SparseBitSet-1.2.jar</binary-origin>