diff --git a/Core/ivy.xml b/Core/ivy.xml
index 35cb8de904..6d67fb0992 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index d98228ef4e..ec299345a1 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,6 +1,6 @@
file.reference.activemq-all-5.11.1.jar=release/modules/ext/activemq-all-5.11.1.jar
file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar
-file.reference.commons-compress-1.12.jar=release/modules/ext/commons-compress-1.12.jar
+file.reference.commons-compress-1.14.jar=release/modules/ext/commons-compress-1.14.jar
file.reference.commons-dbcp2-2.1.1.jar=release\\modules\\ext\\commons-dbcp2-2.1.1.jar
file.reference.commons-pool2-2.4.2.jar=release\\modules\\ext\\commons-pool2-2.4.2.jar
file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar
@@ -8,7 +8,7 @@ file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar
file.reference.jsoup-1.10.3.jar=release/modules/ext/jsoup-1.10.3.jar
file.reference.jython-standalone-2.7.0.jar=release/modules/ext/jython-standalone-2.7.0.jar
file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar
-file.reference.metadata-extractor-2.9.1.jar=release/modules/ext/metadata-extractor-2.9.1.jar
+file.reference.metadata-extractor-2.10.1.jar=release/modules/ext/metadata-extractor-2.10.1.jar
file.reference.postgresql-9.4.1211.jre7.jar=release/modules/ext/postgresql-9.4.1211.jre7.jar
file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
file.reference.Rejistry-1.0-SNAPSHOT.jar=release/modules/ext/Rejistry-1.0-SNAPSHOT.jar
@@ -16,14 +16,14 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi
file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar
file.reference.StixLib.jar=release/modules/ext/StixLib.jar
-file.reference.tika-core-1.14.jar=release/modules/ext/tika-core-1.14.jar
-file.reference.tika-parsers-1.14.jar=release/modules/ext/tika-parsers-1.14.jar
+file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar
+file.reference.tika-parsers-1.17.jar=release/modules/ext/tika-parsers-1.17.jar
file.reference.Tsk_DataModel_PostgreSQL.jar=release/modules/ext/Tsk_DataModel_PostgreSQL.jar
-file.reference.xmpcore-5.1.2.jar=release/modules/ext/xmpcore-5.1.2.jar
file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar
file.reference.curator-framework-2.8.0.jar=release/modules/ext/curator-framework-2.8.0.jar
file.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0.jar
-file.reference.xz-1.5.jar=release/modules/ext/xz-1.5.jar
+file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar
+file.reference.xz-1.6.jar=release/modules/ext/xz-1.6.jar
file.reference.zookeeper-3.4.6.jar=release/modules/ext/zookeeper-3.4.6.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 1663abca2b..1407b88da9 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -328,10 +328,6 @@
ext/jdom-2.0.5.jar
release/modules/ext/jdom-2.0.5.jar
-
- ext/tika-core-1.14.jar
- release/modules/ext/tika-core-1.14.jar
-
ext/Tsk_DataModel_PostgreSQL.jar
release/modules/ext/Tsk_DataModel_PostgreSQL.jar
@@ -345,12 +341,12 @@
release/modules/ext/curator-framework-2.8.0.jar
- ext/commons-dbcp2-2.1.1.jar
- release\modules\ext\commons-dbcp2-2.1.1.jar
+ ext/commons-compress-1.14.jar
+ release/modules/ext/commons-compress-1.14.jar
- ext/tika-parsers-1.14.jar
- release/modules/ext/tika-parsers-1.14.jar
+ ext/commons-dbcp2-2.1.1.jar
+ release\modules\ext\commons-dbcp2-2.1.1.jar
ext/jython-standalone-2.7.0.jar
@@ -373,12 +369,12 @@
release/modules/ext/curator-recipes-2.8.0.jar
- ext/xz-1.5.jar
- release/modules/ext/xz-1.5.jar
+ ext/metadata-extractor-2.10.1.jar
+ release/modules/ext/metadata-extractor-2.10.1.jar
- ext/xmpcore-5.1.2.jar
- release/modules/ext/xmpcore-5.1.2.jar
+ ext/tika-core-1.17.jar
+ release/modules/ext/tika-core-1.17.jar
ext/StixLib.jar
@@ -388,6 +384,10 @@
ext/curator-client-2.8.0.jar
release/modules/ext/curator-client-2.8.0.jar
+
+ ext/tika-parsers-1.17.jar
+ release/modules/ext/tika-parsers-1.17.jar
+
ext/sqlite-jdbc-3.8.11.jar
release/modules/ext/sqlite-jdbc-3.8.11.jar
@@ -396,6 +396,10 @@
ext/activemq-all-5.11.1.jar
release/modules/ext/activemq-all-5.11.1.jar
+
+ ext/xz-1.6.jar
+ release/modules/ext/xz-1.6.jar
+
ext/Rejistry-1.0-SNAPSHOT.jar
release/modules/ext/Rejistry-1.0-SNAPSHOT.jar
@@ -408,14 +412,6 @@
ext/commons-pool2-2.4.2.jar
release\modules\ext\commons-pool2-2.4.2.jar
-
- ext/metadata-extractor-2.9.1.jar
- release/modules/ext/metadata-extractor-2.9.1.jar
-
-
- ext/commons-compress-1.12.jar
- release/modules/ext/commons-compress-1.12.jar
-
ext/jsoup-1.10.3.jar
release/modules/ext/jsoup-1.10.3.jar
@@ -428,6 +424,10 @@
ext/c3p0-0.9.5.jar
release/modules/ext/c3p0-0.9.5.jar
+
+ ext/xmpcore-5.1.3.jar
+ release/modules/ext/xmpcore-5.1.3.jar
+
diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/MSOfficeEmbeddedContentExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/MSOfficeEmbeddedContentExtractor.java
index 4a3a20da07..7fca6a896c 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/MSOfficeEmbeddedContentExtractor.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/MSOfficeEmbeddedContentExtractor.java
@@ -51,6 +51,7 @@ import org.apache.tika.mime.MimeTypeException;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+import org.apache.tika.parser.microsoft.OfficeParserConfig;
import org.apache.tika.sax.BodyContentHandler;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Case;
@@ -231,11 +232,13 @@ class MSOfficeEmbeddedContentExtractor {
// write limit (which defaults to 100,000 characters.
ContentHandler contentHandler = new BodyContentHandler(-1);
- // TODO: this will be needed once we upgrade to Tika 1.16 or later.
- // OfficeParserConfig officeParserConfig = new OfficeParserConfig();
- // officeParserConfig.setUseSAXPptxExtractor(true);
- // officeParserConfig.setUseSAXDocxExtractor(true);
- // parseContext.set(OfficeParserConfig.class, officeParserConfig);
+ // Use the more memory efficient Tika SAX parsers for DOCX and
+ // PPTX files (it already uses SAX for XLSX).
+ OfficeParserConfig officeParserConfig = new OfficeParserConfig();
+ officeParserConfig.setUseSAXPptxExtractor(true);
+ officeParserConfig.setUseSAXDocxExtractor(true);
+ parseContext.set(OfficeParserConfig.class, officeParserConfig);
+
EmbeddedDocumentExtractor extractor = new EmbeddedContentExtractor(parseContext);
parseContext.set(EmbeddedDocumentExtractor.class, extractor);
ReadContentInputStream stream = new ReadContentInputStream(abstractFile);
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index b5de9e9ac2..a5f7aab768 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -28,8 +28,8 @@
-
-
+
+
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 09225d0115..4031d14fc3 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -58,11 +58,11 @@ file.reference.logkit-1.0.1.jar=release/modules/ext/logkit-1.0.1.jar
file.reference.mail-1.4.3.jar=release/modules/ext/mail-1.4.3.jar
file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar
file.reference.platform-3.4.0.jar=release/modules/ext/platform-3.4.0.jar
-file.reference.poi-3.15.jar=release/modules/ext/poi-3.15.jar
-file.reference.poi-excelant-3.15.jar=release/modules/ext/poi-excelant-3.15.jar
-file.reference.poi-ooxml-3.15.jar=release/modules/ext/poi-ooxml-3.15.jar
-file.reference.poi-ooxml-schemas-3.15.jar=release/modules/ext/poi-ooxml-schemas-3.15.jar
-file.reference.poi-scratchpad-3.15.jar=release/modules/ext/poi-scratchpad-3.15.jar
+file.reference.poi-3.17.jar=release/modules/ext/poi-3.17.jar
+file.reference.poi-excelant-3.17.jar=release/modules/ext/poi-excelant-3.17.jar
+file.reference.poi-ooxml-3.17.jar=release/modules/ext/poi-ooxml-3.17.jar
+file.reference.poi-ooxml-schemas-3.17.jar=release/modules/ext/poi-ooxml-schemas-3.17.jar
+file.reference.poi-scratchpad-3.17.jar=release/modules/ext/poi-scratchpad-3.17.jar
file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.jar
file.reference.sigar-1.6.4-sources.jar=release/modules/ext/sigar-1.6.4-sources.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 5b4cb9fd83..ca89b8c1c2 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -295,17 +295,10 @@
org.apache.log4j.xml
org.apache.poi
org.apache.poi.common.usermodel
+ org.apache.poi.common.usermodel.fonts
org.apache.poi.ddf
org.apache.poi.dev
org.apache.poi.extractor
- org.apache.poi.hdf.event
- org.apache.poi.hdf.extractor
- org.apache.poi.hdf.extractor.data
- org.apache.poi.hdf.extractor.util
- org.apache.poi.hdf.model
- org.apache.poi.hdf.model.hdftypes
- org.apache.poi.hdf.model.hdftypes.definitions
- org.apache.poi.hdf.model.util
org.apache.poi.hdgf
org.apache.poi.hdgf.chunks
org.apache.poi.hdgf.dev
@@ -313,6 +306,9 @@
org.apache.poi.hdgf.extractor
org.apache.poi.hdgf.pointers
org.apache.poi.hdgf.streams
+ org.apache.poi.hemf.extractor
+ org.apache.poi.hemf.hemfplus.record
+ org.apache.poi.hemf.record
org.apache.poi.hmef
org.apache.poi.hmef.attribute
org.apache.poi.hmef.dev
@@ -325,7 +321,6 @@
org.apache.poi.hpsf
org.apache.poi.hpsf.extractor
org.apache.poi.hpsf.wellknown
- org.apache.poi.hslf
org.apache.poi.hslf.blip
org.apache.poi.hslf.dev
org.apache.poi.hslf.exceptions
@@ -358,7 +353,11 @@
org.apache.poi.hssf.record.crypto
org.apache.poi.hssf.record.pivottable
org.apache.poi.hssf.usermodel
+ org.apache.poi.hssf.usermodel.helpers
org.apache.poi.hssf.util
+ org.apache.poi.hwmf.draw
+ org.apache.poi.hwmf.record
+ org.apache.poi.hwmf.usermodel
org.apache.poi.hwpf
org.apache.poi.hwpf.converter
org.apache.poi.hwpf.dev
@@ -372,18 +371,30 @@
org.apache.poi.openxml4j.opc
org.apache.poi.openxml4j.opc.internal
org.apache.poi.openxml4j.opc.internal.marshallers
- org.apache.poi.openxml4j.opc.internal.signature
org.apache.poi.openxml4j.opc.internal.unmarshallers
- org.apache.poi.openxml4j.opc.signature
org.apache.poi.openxml4j.util
org.apache.poi.poifs.common
org.apache.poi.poifs.crypt
+ org.apache.poi.poifs.crypt.agile
+ org.apache.poi.poifs.crypt.binaryrc4
+ org.apache.poi.poifs.crypt.cryptoapi
+ org.apache.poi.poifs.crypt.dsig
+ org.apache.poi.poifs.crypt.dsig.facets
+ org.apache.poi.poifs.crypt.dsig.services
+ org.apache.poi.poifs.crypt.standard
+ org.apache.poi.poifs.crypt.temp
+ org.apache.poi.poifs.crypt.xor
org.apache.poi.poifs.dev
org.apache.poi.poifs.eventfilesystem
org.apache.poi.poifs.filesystem
+ org.apache.poi.poifs.macros
org.apache.poi.poifs.nio
org.apache.poi.poifs.property
org.apache.poi.poifs.storage
+ org.apache.poi.sl.draw
+ org.apache.poi.sl.draw.binding
+ org.apache.poi.sl.draw.geom
+ org.apache.poi.sl.image
org.apache.poi.sl.usermodel
org.apache.poi.ss
org.apache.poi.ss.excelant
@@ -401,15 +412,27 @@
org.apache.poi.ss.formula.udf
org.apache.poi.ss.usermodel
org.apache.poi.ss.usermodel.charts
+ org.apache.poi.ss.usermodel.helpers
org.apache.poi.ss.util
org.apache.poi.ss.util.cellwalk
org.apache.poi.util
- org.apache.poi.xslf
+ org.apache.poi.wp.usermodel
+ org.apache.poi.xdgf.exceptions
+ org.apache.poi.xdgf.extractor
+ org.apache.poi.xdgf.geom
+ org.apache.poi.xdgf.usermodel
+ org.apache.poi.xdgf.usermodel.section
+ org.apache.poi.xdgf.usermodel.section.geometry
+ org.apache.poi.xdgf.usermodel.shape
+ org.apache.poi.xdgf.usermodel.shape.exceptions
+ org.apache.poi.xdgf.util
+ org.apache.poi.xdgf.xml
org.apache.poi.xslf.extractor
org.apache.poi.xslf.model
- org.apache.poi.xslf.model.geom
org.apache.poi.xslf.usermodel
org.apache.poi.xslf.util
+ org.apache.poi.xssf
+ org.apache.poi.xssf.binary
org.apache.poi.xssf.dev
org.apache.poi.xssf.eventusermodel
org.apache.poi.xssf.extractor
@@ -620,6 +643,8 @@
org.openxmlformats.schemas.spreadsheetml.x2006.main.impl
org.openxmlformats.schemas.wordprocessingml.x2006.main
org.openxmlformats.schemas.wordprocessingml.x2006.main.impl
+ org.openxmlformats.schemas.xpackage.x2006.digitalSignature
+ org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl
org.reflections
org.reflections.adapters
org.reflections.scanners
@@ -643,17 +668,10 @@
org.xml.sax.ext
org.xml.sax.helpers
repackage
- schemaorg_apache_xmlbeans.system.sE130CAA0A01A7CDE5A2B4FEB8B311707
schemaorg_apache_xmlbeans.system.sXMLCONFIG
schemaorg_apache_xmlbeans.system.sXMLLANG
schemaorg_apache_xmlbeans.system.sXMLSCHEMA
schemaorg_apache_xmlbeans.system.sXMLTOOLS
- schemasMicrosoftComOfficeExcel
- schemasMicrosoftComOfficeExcel.impl
- schemasMicrosoftComOfficeOffice
- schemasMicrosoftComOfficeOffice.impl
- schemasMicrosoftComVml
- schemasMicrosoftComVml.impl
ext/commons-logging-1.1.2-sources.jar
@@ -763,10 +781,6 @@
ext/joda-time-2.4-javadoc.jar
release/modules/ext/joda-time-2.4-javadoc.jar
-
- ext/poi-excelant-3.15.jar
- release/modules/ext/poi-excelant-3.15.jar
-
ext/imageio-psd-3.2.jar
release/modules/ext/imageio-psd-3.2.jar
@@ -823,10 +837,6 @@
ext/jfxtras-fxml-8.0-r4.jar
release/modules/ext/jfxtras-fxml-8.0-r4.jar
-
- ext/poi-ooxml-3.15.jar
- release/modules/ext/poi-ooxml-3.15.jar
-
ext/joda-time-2.4.jar
release/modules/ext/joda-time-2.4.jar
@@ -851,18 +861,22 @@
ext/guava-19.0.jar
release/modules/ext/guava-19.0.jar
+
+ ext/poi-3.17.jar
+ release/modules/ext/poi-3.17.jar
+
+
+ ext/poi-ooxml-schemas-3.17.jar
+ release/modules/ext/poi-ooxml-schemas-3.17.jar
+
+
+ ext/poi-scratchpad-3.17.jar
+ release/modules/ext/poi-scratchpad-3.17.jar
+
ext/commons-io-2.5.jar
release/modules/ext/commons-io-2.5.jar
-
- ext/poi-ooxml-schemas-3.15.jar
- release/modules/ext/poi-ooxml-schemas-3.15.jar
-
-
- ext/poi-scratchpad-3.15.jar
- release/modules/ext/poi-scratchpad-3.15.jar
-
ext/imageio-bmp-3.2.jar
release/modules/ext/imageio-bmp-3.2.jar
@@ -887,6 +901,10 @@
ext/ant-1.8.2.jar
release/modules/ext/ant-1.8.2.jar
+
+ ext/poi-excelant-3.17.jar
+ release/modules/ext/poi-excelant-3.17.jar
+
ext/javassist-3.12.1.GA.jar
release/modules/ext/javassist-3.12.1.GA.jar
@@ -899,6 +917,10 @@
ext/commons-logging-1.1.2.jar
release/modules/ext/commons-logging-1.1.2.jar
+
+ ext/poi-ooxml-3.17.jar
+ release/modules/ext/poi-ooxml-3.17.jar
+
ext/controlsfx-8.40.11.jar
release/modules/ext/controlsfx-8.40.11.jar
@@ -911,10 +933,6 @@
ext/javaee-api-5.0-2.jar
release/modules/ext/javaee-api-5.0-2.jar
-
- ext/poi-3.15.jar
- release/modules/ext/poi-3.15.jar
-
ext/common-image-3.2.jar
release/modules/ext/common-image-3.2.jar
diff --git a/Experimental/ivy.xml b/Experimental/ivy.xml
index 93d6dafa8d..965af1bc12 100644
--- a/Experimental/ivy.xml
+++ b/Experimental/ivy.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties
index 1bd0e2fc90..2db8202ab7 100644
--- a/Experimental/nbproject/project.properties
+++ b/Experimental/nbproject/project.properties
@@ -3,7 +3,7 @@ file.reference.jackson-core-2.7.0.jar=release/modules/ext/jackson-core-2.7.0.jar
file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar
file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar
file.reference.postgresql-9.4-1201-jdbc41.jar=release/modules/ext/postgresql-9.4-1201-jdbc41.jar
-file.reference.tika-core-1.14.jar=release/modules/ext/tika-core-1.14.jar
+file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar
diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml
index 8293608102..f2bf6d1996 100644
--- a/Experimental/nbproject/project.xml
+++ b/Experimental/nbproject/project.xml
@@ -146,12 +146,12 @@
org.sleuthkit.autopsy.experimental.configuration
- ext/tika-core-1.14.jar
- release/modules/ext/tika-core-1.14.jar
+ ext/LGoodDatePicker-10.3.1.jar
+ release/modules/ext/LGoodDatePicker-10.3.1.jar
- ext/LGoodDatePicker-10.3.1.jar
- release/modules/ext/LGoodDatePicker-10.3.1.jar
+ ext/tika-core-1.17.jar
+ release/modules/ext/tika-core-1.17.jar
ext/mchange-commons-java-0.2.9.jar
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 3ceb4e6378..fc6aa00269 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 5aa1b716e0..ddc825b4d4 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,6 +1,5 @@
-file.reference.aopalliance-1.0.jar=release/modules/ext/aopalliance-1.0.jar
-file.reference.apache-mime4j-core-0.7.2.jar=release/modules/ext/apache-mime4j-core-0.7.2.jar
-file.reference.apache-mime4j-dom-0.7.2.jar=release/modules/ext/apache-mime4j-dom-0.7.2.jar
+file.reference.apache-mime4j-core-0.8.1.jar=release/modules/ext/apache-mime4j-core-0.8.1.jar
+file.reference.apache-mime4j-dom-0.8.1.jar=release/modules/ext/apache-mime4j-dom-0.8.1.jar
file.reference.asm-5.0.4.jar=release/modules/ext/asm-5.0.4.jar
file.reference.asm-all-3.1.jar=release/modules/ext/asm-all-3.1.jar
file.reference.bcmail-jdk15on-1.54.jar=release/modules/ext/bcmail-jdk15on-1.54.jar
@@ -15,7 +14,7 @@ file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils
file.reference.commons-codec-1.10.jar=release/modules/ext/commons-codec-1.10.jar
file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar
file.reference.commons-collections4-4.1.jar=release/modules/ext/commons-collections4-4.1.jar
-file.reference.commons-compress-1.12.jar=release/modules/ext/commons-compress-1.12.jar
+file.reference.commons-compress-1.14.jar=release/modules/ext/commons-compress-1.14.jar
file.reference.commons-csv-1.0.jar=release/modules/ext/commons-csv-1.0.jar
file.reference.commons-digester-1.8.1.jar=release/modules/ext/commons-digester-1.8.1.jar
file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar
@@ -26,35 +25,34 @@ file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-a
file.reference.commons-validator-1.5.1-javadoc.jar=release/modules/ext/commons-validator-1.5.1-javadoc.jar
file.reference.commons-validator-1.5.1-sources.jar=release/modules/ext/commons-validator-1.5.1-sources.jar
file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar
-file.reference.commons-vfs2-2.0.jar=release/modules/ext/commons-vfs2-2.0.jar
file.reference.ctakes-core-3.2.2.jar=release/modules/ext/ctakes-core-3.2.2.jar
file.reference.ctakes-core-res-3.2.2.jar=release/modules/ext/ctakes-core-res-3.2.2.jar
file.reference.ctakes-type-system-3.2.2.jar=release/modules/ext/ctakes-type-system-3.2.2.jar
file.reference.ctakes-utils-3.2.2.jar=release/modules/ext/ctakes-utils-3.2.2.jar
file.reference.curvesapi-1.04.jar=release/modules/ext/curvesapi-1.04.jar
-file.reference.cxf-core-3.0.3.jar=release/modules/ext/cxf-core-3.0.3.jar
-file.reference.cxf-rt-frontend-jaxrs-3.0.3.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.0.3.jar
-file.reference.cxf-rt-rs-client-3.0.3.jar=release/modules/ext/cxf-rt-rs-client-3.0.3.jar
-file.reference.cxf-rt-transports-http-3.0.3.jar=release/modules/ext/cxf-rt-transports-http-3.0.3.jar
+file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar
+file.reference.cxf-rt-frontend-jaxrs-3.0.16.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar
+file.reference.cxf-rt-rs-client-3.0.16.jar=release/modules/ext/cxf-rt-rs-client-3.0.16.jar
+file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-transports-http-3.0.16.jar
file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar
-file.reference.fontbox-2.0.3.jar=release/modules/ext/fontbox-2.0.3.jar
+file.reference.fontbox-2.0.8.jar=release/modules/ext/fontbox-2.0.8.jar
file.reference.geoapi-3.0.0.jar=release/modules/ext/geoapi-3.0.0.jar
file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar
-file.reference.gson-2.2.4.jar=release/modules/ext/gson-2.2.4.jar
+file.reference.gson-2.8.1.jar=release/modules/ext/gson-2.8.1.jar
file.reference.guava-17.0.jar=release/modules/ext/guava-17.0.jar
file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
-file.reference.httpclient-4.3.1.jar=release/modules/ext/httpclient-4.3.1.jar
-file.reference.httpcore-4.3.jar=release/modules/ext/httpcore-4.3.jar
+file.reference.httpclient-4.5.4.jar=release/modules/ext/httpclient-4.5.4.jar
file.reference.httpcore-4.4.1.jar=release/modules/ext/httpcore-4.4.1.jar
-file.reference.httpmime-4.3.1.jar=release/modules/ext/httpmime-4.3.1.jar
+file.reference.httpcore-4.4.7.jar=release/modules/ext/httpcore-4.4.7.jar
file.reference.httpmime-4.4.1.jar=release/modules/ext/httpmime-4.4.1.jar
+file.reference.httpmime-4.5.4.jar=release/modules/ext/httpmime-4.5.4.jar
file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar
file.reference.icu4j-3.8.jar=release/modules/ext/icu4j-3.8.jar
file.reference.isoparser-1.1.18.jar=release/modules/ext/isoparser-1.1.18.jar
-file.reference.jackcess-2.1.4.jar=release/modules/ext/jackcess-2.1.4.jar
-file.reference.jackcess-encrypt-2.1.1.jar=release/modules/ext/jackcess-encrypt-2.1.1.jar
-file.reference.jackson-core-2.8.1.jar=release/modules/ext/jackson-core-2.8.1.jar
+file.reference.jackcess-2.1.8.jar=release/modules/ext/jackcess-2.1.8.jar
+file.reference.jackcess-encrypt-2.1.2.jar=release/modules/ext/jackcess-encrypt-2.1.2.jar
+file.reference.jackson-core-2.9.2.jar=release/modules/ext/jackson-core-2.9.2.jar
file.reference.jakarta-regexp-1.4.jar=release/modules/ext/jakarta-regexp-1.4.jar
file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar
file.reference.javax.annotation-api-1.2.jar=release/modules/ext/javax.annotation-api-1.2.jar
@@ -63,20 +61,17 @@ file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0
file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar
file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar
file.reference.jdom2-2.0.4.jar=release/modules/ext/jdom2-2.0.4.jar
-file.reference.jempbox-1.8.12.jar=release/modules/ext/jempbox-1.8.12.jar
+file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar
file.reference.jericho-html-3.3-javadoc.jar=release/modules/ext/jericho-html-3.3-javadoc.jar
file.reference.jericho-html-3.3-sources.jar=release/modules/ext/jericho-html-3.3-sources.jar
file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar
file.reference.jhighlight-1.0.2.jar=release/modules/ext/jhighlight-1.0.2.jar
-file.reference.jj2000-5.2.jar=release/modules/ext/jj2000-5.2.jar
file.reference.jmatio-1.2.jar=release/modules/ext/jmatio-1.2.jar
file.reference.jna-4.1.0.jar=release/modules/ext/jna-4.1.0.jar
file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
-file.reference.json-20140107.jar=release/modules/ext/json-20140107.jar
file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
file.reference.jsoup-1.7.2.jar=release/modules/ext/jsoup-1.7.2.jar
file.reference.jsr-275-0.9.3.jar=release/modules/ext/jsr-275-0.9.3.jar
-file.reference.junit-4.11.jar=release/modules/ext/junit-4.11.jar
file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
file.reference.junrar-0.7.jar=release/modules/ext/junrar-0.7.jar
file.reference.jVinci-2.6.0.jar=release/modules/ext/jVinci-2.6.0.jar
@@ -88,10 +83,7 @@ file.reference.lucene-core-4.0.0.jar=release/modules/ext/lucene-core-4.0.0.jar
file.reference.lucene-queries-4.0.0.jar=release/modules/ext/lucene-queries-4.0.0.jar
file.reference.lucene-queryparser-4.0.0.jar=release/modules/ext/lucene-queryparser-4.0.0.jar
file.reference.lucene-sandbox-4.0.0.jar=release/modules/ext/lucene-sandbox-4.0.0.jar
-file.reference.maven-scm-api-1.4.jar=release/modules/ext/maven-scm-api-1.4.jar
-file.reference.maven-scm-provider-svn-commons-1.4.jar=release/modules/ext/maven-scm-provider-svn-commons-1.4.jar
-file.reference.maven-scm-provider-svnexe-1.4.jar=release/modules/ext/maven-scm-provider-svnexe-1.4.jar
-file.reference.metadata-extractor-2.9.1.jar=release/modules/ext/metadata-extractor-2.9.1.jar
+file.reference.metadata-extractor-2.10.1.jar=release/modules/ext/metadata-extractor-2.10.1.jar
file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar
file.reference.noggit-0.5.jar=release/modules/ext/noggit-0.5.jar
file.reference.openaifsm-0.0.1.jar=release/modules/ext/openaifsm-0.0.1.jar
@@ -101,18 +93,15 @@ file.reference.org.apache.felix.scr.annotations-1.6.0.jar=release/modules/ext/or
file.reference.org.apache.felix.scr.generator-1.1.2.jar=release/modules/ext/org.apache.felix.scr.generator-1.1.2.jar
file.reference.org.osgi.compendium-4.0.0.jar=release/modules/ext/org.osgi.compendium-4.0.0.jar
file.reference.org.osgi.core-4.0.0.jar=release/modules/ext/org.osgi.core-4.0.0.jar
-file.reference.pdfbox-2.0.3.jar=release/modules/ext/pdfbox-2.0.3.jar
-file.reference.pdfbox-debugger-2.0.3.jar=release/modules/ext/pdfbox-debugger-2.0.3.jar
-file.reference.pdfbox-tools-2.0.3.jar=release/modules/ext/pdfbox-tools-2.0.3.jar
-file.reference.plexus-utils-1.5.6.jar=release/modules/ext/plexus-utils-1.5.6.jar
-file.reference.poi-3.15.jar=release/modules/ext/poi-3.15.jar
-file.reference.poi-ooxml-3.15.jar=release/modules/ext/poi-ooxml-3.15.jar
-file.reference.poi-ooxml-schemas-3.15.jar=release/modules/ext/poi-ooxml-schemas-3.15.jar
-file.reference.poi-scratchpad-3.15.jar=release/modules/ext/poi-scratchpad-3.15.jar
+file.reference.pdfbox-2.0.8.jar=release/modules/ext/pdfbox-2.0.8.jar
+file.reference.pdfbox-tools-2.0.8.jar=release/modules/ext/pdfbox-tools-2.0.8.jar
+file.reference.poi-3.17.jar=release/modules/ext/poi-3.17.jar
+file.reference.poi-ooxml-3.17.jar=release/modules/ext/poi-ooxml-3.17.jar
+file.reference.poi-ooxml-schemas-3.17.jar=release/modules/ext/poi-ooxml-schemas-3.17.jar
+file.reference.poi-scratchpad-3.17.jar=release/modules/ext/poi-scratchpad-3.17.jar
file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar
file.reference.qdox-1.12.jar=release/modules/ext/qdox-1.12.jar
file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar
-file.reference.regexp-1.3.jar=release/modules/ext/regexp-1.3.jar
file.reference.rome-1.5.1.jar=release/modules/ext/rome-1.5.1.jar
file.reference.rome-utils-1.5.1.jar=release/modules/ext/rome-utils-1.5.1.jar
file.reference.sis-metadata-0.6.jar=release/modules/ext/sis-metadata-0.6.jar
@@ -120,24 +109,18 @@ file.reference.sis-netcdf-0.6.jar=release/modules/ext/sis-netcdf-0.6.jar
file.reference.sis-referencing-0.6.jar=release/modules/ext/sis-referencing-0.6.jar
file.reference.sis-storage-0.6.jar=release/modules/ext/sis-storage-0.6.jar
file.reference.sis-utility-0.6.jar=release/modules/ext/sis-utility-0.6.jar
-file.reference.slf4j-api-1.7.12.jar=release/modules/ext/slf4j-api-1.7.12.jar
+file.reference.slf4j-api-1.7.24.jar=release/modules/ext/slf4j-api-1.7.24.jar
file.reference.solr-solrj-4.9.1-javadoc.jar=release/modules/ext/solr-solrj-4.9.1-javadoc.jar
file.reference.solr-solrj-4.9.1-sources.jar=release/modules/ext/solr-solrj-4.9.1-sources.jar
file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar
-file.reference.spring-aop-3.1.2.RELEASE.jar=release/modules/ext/spring-aop-3.1.2.RELEASE.jar
-file.reference.spring-asm-3.1.2.RELEASE.jar=release/modules/ext/spring-asm-3.1.2.RELEASE.jar
-file.reference.spring-beans-3.1.2.RELEASE.jar=release/modules/ext/spring-beans-3.1.2.RELEASE.jar
-file.reference.spring-context-3.1.2.RELEASE.jar=release/modules/ext/spring-context-3.1.2.RELEASE.jar
-file.reference.spring-core-3.1.2.RELEASE.jar=release/modules/ext/spring-core-3.1.2.RELEASE.jar
-file.reference.spring-expression-3.1.2.RELEASE.jar=release/modules/ext/spring-expression-3.1.2.RELEASE.jar
-file.reference.sqlite-jdbc-3.8.11.2.jar=release/modules/ext/sqlite-jdbc-3.8.11.2.jar
+file.reference.sqlite-jdbc-3.19.3.jar=release/modules/ext/sqlite-jdbc-3.19.3.jar
file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar
file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar
file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
-file.reference.tika-core-1.14.jar=release/modules/ext/tika-core-1.14.jar
-file.reference.tika-parsers-1.14-javadoc.jar=release/modules/ext/tika-parsers-1.14-javadoc.jar
-file.reference.tika-parsers-1.14-sources.jar=release/modules/ext/tika-parsers-1.14-sources.jar
-file.reference.tika-parsers-1.14.jar=release/modules/ext/tika-parsers-1.14.jar
+file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar
+file.reference.tika-parsers-1.17-javadoc.jar=release/modules/ext/tika-parsers-1.17-javadoc.jar
+file.reference.tika-parsers-1.17-sources.jar=release/modules/ext/tika-parsers-1.17-sources.jar
+file.reference.tika-parsers-1.17.jar=release/modules/ext/tika-parsers-1.17.jar
file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar
file.reference.uimafit-core-2.1.0.jar=release/modules/ext/uimafit-core-2.1.0.jar
file.reference.uimaj-adapter-vinci-2.6.0.jar=release/modules/ext/uimaj-adapter-vinci-2.6.0.jar
@@ -150,9 +133,7 @@ file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8
file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar
file.reference.woodstox-core-asl-4.4.1.jar=release/modules/ext/woodstox-core-asl-4.4.1.jar
file.reference.xmlbeans-2.6.0.jar=release/modules/ext/xmlbeans-2.6.0.jar
-file.reference.xmlschema-core-2.1.0.jar=release/modules/ext/xmlschema-core-2.1.0.jar
-file.reference.xmpcore-5.1.2.jar=release/modules/ext/xmpcore-5.1.2.jar
-file.reference.xz-1.5.jar=release/modules/ext/xz-1.5.jar
+file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar
file.reference.zookeeper-3.4.6.jar=release/modules/ext/zookeeper-3.4.6.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 357c2178e2..db9ada1b1b 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -141,6 +141,10 @@
ext/commons-validator-1.5.1-sources.jar
release/modules/ext/commons-validator-1.5.1-sources.jar
+
+ ext/apache-mime4j-dom-0.8.1.jar
+ release/modules/ext/apache-mime4j-dom-0.8.1.jar
+
ext/commons-digester-1.8.1.jar
release/modules/ext/commons-digester-1.8.1.jar
@@ -149,14 +153,14 @@
ext/jwnl-1.3.3.jar
release/modules/ext/jwnl-1.3.3.jar
-
- ext/tika-core-1.14.jar
- release/modules/ext/tika-core-1.14.jar
-
ext/lucene-queryparser-4.0.0.jar
release/modules/ext/lucene-queryparser-4.0.0.jar
+
+ ext/httpclient-4.5.4.jar
+ release/modules/ext/httpclient-4.5.4.jar
+
ext/uimaj-examples-2.4.0.jar
release/modules/ext/uimaj-examples-2.4.0.jar
@@ -165,10 +169,6 @@
ext/cdm-4.5.5.jar
release/modules/ext/cdm-4.5.5.jar
-
- ext/gson-2.2.4.jar
- release/modules/ext/gson-2.2.4.jar
-
ext/org.osgi.compendium-4.0.0.jar
release/modules/ext/org.osgi.compendium-4.0.0.jar
@@ -177,6 +177,10 @@
ext/geoapi-3.0.0.jar
release/modules/ext/geoapi-3.0.0.jar
+
+ ext/commons-compress-1.14.jar
+ release/modules/ext/commons-compress-1.14.jar
+
ext/hamcrest-core-1.3.jar
release/modules/ext/hamcrest-core-1.3.jar
@@ -197,30 +201,34 @@
ext/xmlbeans-2.6.0.jar
release/modules/ext/xmlbeans-2.6.0.jar
-
- ext/maven-scm-api-1.4.jar
- release/modules/ext/maven-scm-api-1.4.jar
-
ext/quartz-2.2.0.jar
release/modules/ext/quartz-2.2.0.jar
- ext/jackcess-2.1.4.jar
- release/modules/ext/jackcess-2.1.4.jar
-
-
- ext/slf4j-api-1.7.12.jar
- release/modules/ext/slf4j-api-1.7.12.jar
+ ext/sqlite-jdbc-3.19.3.jar
+ release/modules/ext/sqlite-jdbc-3.19.3.jar
ext/guava-17.0.jar
release/modules/ext/guava-17.0.jar
+
+ ext/metadata-extractor-2.10.1.jar
+ release/modules/ext/metadata-extractor-2.10.1.jar
+
+
+ ext/apache-mime4j-core-0.8.1.jar
+ release/modules/ext/apache-mime4j-core-0.8.1.jar
+
ext/opennlp-maxent-3.0.3.jar
release/modules/ext/opennlp-maxent-3.0.3.jar
+
+ ext/pdfbox-tools-2.0.8.jar
+ release/modules/ext/pdfbox-tools-2.0.8.jar
+
ext/jVinci-2.6.0.jar
release/modules/ext/jVinci-2.6.0.jar
@@ -229,18 +237,14 @@
ext/json-simple-1.1.1.jar
release/modules/ext/json-simple-1.1.1.jar
+
+ ext/tika-parsers-1.17.jar
+ release/modules/ext/tika-parsers-1.17.jar
+
ext/sis-utility-0.6.jar
release/modules/ext/sis-utility-0.6.jar
-
- ext/jj2000-5.2.jar
- release/modules/ext/jj2000-5.2.jar
-
-
- ext/httpclient-4.3.1.jar
- release/modules/ext/httpclient-4.3.1.jar
-
ext/jhighlight-1.0.2.jar
release/modules/ext/jhighlight-1.0.2.jar
@@ -258,12 +262,12 @@
release/modules/ext/ctakes-utils-3.2.2.jar
- ext/apache-mime4j-dom-0.7.2.jar
- release/modules/ext/apache-mime4j-dom-0.7.2.jar
+ ext/cxf-rt-rs-client-3.0.16.jar
+ release/modules/ext/cxf-rt-rs-client-3.0.16.jar
- ext/commons-compress-1.12.jar
- release/modules/ext/commons-compress-1.12.jar
+ ext/jempbox-1.8.13.jar
+ release/modules/ext/jempbox-1.8.13.jar
ext/openaifsm-0.0.1.jar
@@ -277,14 +281,18 @@
ext/commons-collections4-4.1.jar
release/modules/ext/commons-collections4-4.1.jar
-
- ext/cxf-rt-rs-client-3.0.3.jar
- release/modules/ext/cxf-rt-rs-client-3.0.3.jar
-
ext/solr-solrj-4.9.1.jar
release/modules/ext/solr-solrj-4.9.1.jar
+
+ ext/xmpcore-5.1.3.jar
+ release/modules/ext/xmpcore-5.1.3.jar
+
+
+ ext/jackcess-2.1.8.jar
+ release/modules/ext/jackcess-2.1.8.jar
+
ext/findstructapi-0.0.1.jar
release/modules/ext/findstructapi-0.0.1.jar
@@ -317,6 +325,22 @@
ext/commons-codec-1.10.jar
release/modules/ext/commons-codec-1.10.jar
+
+ ext/gson-2.8.1.jar
+ release/modules/ext/gson-2.8.1.jar
+
+
+ ext/poi-ooxml-schemas-3.17.jar
+ release/modules/ext/poi-ooxml-schemas-3.17.jar
+
+
+ ext/poi-scratchpad-3.17.jar
+ release/modules/ext/poi-scratchpad-3.17.jar
+
+
+ ext/poi-3.17.jar
+ release/modules/ext/poi-3.17.jar
+
ext/lucene-queries-4.0.0.jar
release/modules/ext/lucene-queries-4.0.0.jar
@@ -326,45 +350,25 @@
release/modules/ext/bcprov-jdk15on-1.54.jar
- ext/poi-ooxml-schemas-3.15.jar
- release/modules/ext/poi-ooxml-schemas-3.15.jar
-
-
- ext/poi-scratchpad-3.15.jar
- release/modules/ext/poi-scratchpad-3.15.jar
+ ext/fontbox-2.0.8.jar
+ release/modules/ext/fontbox-2.0.8.jar
ext/solr-solrj-4.9.1-sources.jar
release/modules/ext/solr-solrj-4.9.1-sources.jar
-
- ext/commons-vfs2-2.0.jar
- release/modules/ext/commons-vfs2-2.0.jar
-
-
- ext/tika-parsers-1.14.jar
- release/modules/ext/tika-parsers-1.14.jar
-
-
- ext/jackcess-encrypt-2.1.1.jar
- release/modules/ext/jackcess-encrypt-2.1.1.jar
-
-
- ext/spring-expression-3.1.2.RELEASE.jar
- release/modules/ext/spring-expression-3.1.2.RELEASE.jar
-
ext/lucene-analyzers-common-4.0.0.jar
release/modules/ext/lucene-analyzers-common-4.0.0.jar
-
- ext/tika-parsers-1.14-sources.jar
- release/modules/ext/tika-parsers-1.14-sources.jar
-
ext/javax.ws.rs-api-2.0.1.jar
release/modules/ext/javax.ws.rs-api-2.0.1.jar
+
+ ext/httpmime-4.5.4.jar
+ release/modules/ext/httpmime-4.5.4.jar
+
ext/junrar-0.7.jar
release/modules/ext/junrar-0.7.jar
@@ -378,21 +382,13 @@
release/modules/ext/noggit-0.5.jar
- ext/xmlschema-core-2.1.0.jar
- release/modules/ext/xmlschema-core-2.1.0.jar
-
-
- ext/httpmime-4.3.1.jar
- release/modules/ext/httpmime-4.3.1.jar
+ ext/poi-ooxml-3.17.jar
+ release/modules/ext/poi-ooxml-3.17.jar
ext/jna-4.1.0.jar
release/modules/ext/jna-4.1.0.jar
-
- ext/xz-1.5.jar
- release/modules/ext/xz-1.5.jar
-
ext/qdox-1.12.jar
release/modules/ext/qdox-1.12.jar
@@ -410,37 +406,17 @@
release/modules/ext/grib-4.5.5.jar
- ext/maven-scm-provider-svn-commons-1.4.jar
- release/modules/ext/maven-scm-provider-svn-commons-1.4.jar
-
-
- ext/poi-3.15.jar
- release/modules/ext/poi-3.15.jar
-
-
- ext/spring-aop-3.1.2.RELEASE.jar
- release/modules/ext/spring-aop-3.1.2.RELEASE.jar
-
-
- ext/json-20140107.jar
- release/modules/ext/json-20140107.jar
+ ext/jackson-core-2.9.2.jar
+ release/modules/ext/jackson-core-2.9.2.jar
ext/uimaj-core-2.5.0.jar
release/modules/ext/uimaj-core-2.5.0.jar
-
- ext/pdfbox-2.0.3.jar
- release/modules/ext/pdfbox-2.0.3.jar
-
ext/jmatio-1.2.jar
release/modules/ext/jmatio-1.2.jar
-
- ext/metadata-extractor-2.9.1.jar
- release/modules/ext/metadata-extractor-2.9.1.jar
-
ext/commons-csv-1.0.jar
release/modules/ext/commons-csv-1.0.jar
@@ -466,21 +442,13 @@
release/modules/ext/httpservices-4.5.5.jar
- ext/plexus-utils-1.5.6.jar
- release/modules/ext/plexus-utils-1.5.6.jar
-
-
- ext/fontbox-2.0.3.jar
- release/modules/ext/fontbox-2.0.3.jar
+ ext/httpcore-4.4.7.jar
+ release/modules/ext/httpcore-4.4.7.jar
ext/bcmail-jdk15on-1.54.jar
release/modules/ext/bcmail-jdk15on-1.54.jar
-
- ext/spring-beans-3.1.2.RELEASE.jar
- release/modules/ext/spring-beans-3.1.2.RELEASE.jar
-
ext/solr-solrj-4.9.1-javadoc.jar
release/modules/ext/solr-solrj-4.9.1-javadoc.jar
@@ -490,8 +458,8 @@
release/modules/ext/asm-all-3.1.jar
- ext/tika-parsers-1.14-javadoc.jar
- release/modules/ext/tika-parsers-1.14-javadoc.jar
+ ext/tika-parsers-1.17-javadoc.jar
+ release/modules/ext/tika-parsers-1.17-javadoc.jar
ext/icu4j-3.8.jar
@@ -501,10 +469,6 @@
ext/curvesapi-1.04.jar
release/modules/ext/curvesapi-1.04.jar
-
- ext/xmpcore-5.1.2.jar
- release/modules/ext/xmpcore-5.1.2.jar
-
ext/sis-referencing-0.6.jar
release/modules/ext/sis-referencing-0.6.jar
@@ -521,6 +485,10 @@
ext/tagsoup-1.2.1.jar
release/modules/ext/tagsoup-1.2.1.jar
+
+ ext/tika-core-1.17.jar
+ release/modules/ext/tika-core-1.17.jar
+
ext/lucene-core-4.0.0.jar
release/modules/ext/lucene-core-4.0.0.jar
@@ -533,10 +501,6 @@
ext/commons-logging-1.2.jar
release/modules/ext/commons-logging-1.2.jar
-
- ext/jackson-core-2.8.1.jar
- release/modules/ext/jackson-core-2.8.1.jar
-
ext/org.osgi.core-4.0.0.jar
release/modules/ext/org.osgi.core-4.0.0.jar
@@ -545,10 +509,18 @@
ext/c3p0-0.9.1.1.jar
release/modules/ext/c3p0-0.9.1.1.jar
+
+ ext/tika-parsers-1.17-sources.jar
+ release/modules/ext/tika-parsers-1.17-sources.jar
+
ext/sqlwrapper-0.0.1.jar
release/modules/ext/sqlwrapper-0.0.1.jar
+
+ ext/jackcess-encrypt-2.1.2.jar
+ release/modules/ext/jackcess-encrypt-2.1.2.jar
+
ext/jericho-html-3.3-javadoc.jar
release/modules/ext/jericho-html-3.3-javadoc.jar
@@ -557,18 +529,10 @@
ext/udunits-4.5.5.jar
release/modules/ext/udunits-4.5.5.jar
-
- ext/aopalliance-1.0.jar
- release/modules/ext/aopalliance-1.0.jar
-
ext/commons-collections-3.2.2.jar
release/modules/ext/commons-collections-3.2.2.jar
-
- ext/cxf-rt-frontend-jaxrs-3.0.3.jar
- release/modules/ext/cxf-rt-frontend-jaxrs-3.0.3.jar
-
ext/uimaj-document-annotation-2.5.0.jar
release/modules/ext/uimaj-document-annotation-2.5.0.jar
@@ -577,41 +541,29 @@
ext/woodstox-core-asl-4.4.1.jar
release/modules/ext/woodstox-core-asl-4.4.1.jar
-
- ext/poi-ooxml-3.15.jar
- release/modules/ext/poi-ooxml-3.15.jar
-
ext/org.apache.felix.scr.generator-1.1.2.jar
release/modules/ext/org.apache.felix.scr.generator-1.1.2.jar
+
+ ext/pdfbox-2.0.8.jar
+ release/modules/ext/pdfbox-2.0.8.jar
+
ext/zookeeper-3.4.6.jar
release/modules/ext/zookeeper-3.4.6.jar
- ext/cxf-rt-transports-http-3.0.3.jar
- release/modules/ext/cxf-rt-transports-http-3.0.3.jar
-
-
- ext/pdfbox-debugger-2.0.3.jar
- release/modules/ext/pdfbox-debugger-2.0.3.jar
-
-
- ext/spring-core-3.1.2.RELEASE.jar
- release/modules/ext/spring-core-3.1.2.RELEASE.jar
+ ext/cxf-rt-transports-http-3.0.16.jar
+ release/modules/ext/cxf-rt-transports-http-3.0.16.jar
ext/netcdf4-4.5.5.jar
release/modules/ext/netcdf4-4.5.5.jar
- ext/spring-asm-3.1.2.RELEASE.jar
- release/modules/ext/spring-asm-3.1.2.RELEASE.jar
-
-
- ext/junit-4.11.jar
- release/modules/ext/junit-4.11.jar
+ ext/slf4j-api-1.7.24.jar
+ release/modules/ext/slf4j-api-1.7.24.jar
ext/protobuf-java-2.5.0.jar
@@ -642,37 +594,17 @@
release/modules/ext/commons-lang-2.6.jar
- ext/sqlite-jdbc-3.8.11.2.jar
- release/modules/ext/sqlite-jdbc-3.8.11.2.jar
-
-
- ext/jempbox-1.8.12.jar
- release/modules/ext/jempbox-1.8.12.jar
-
-
- ext/maven-scm-provider-svnexe-1.4.jar
- release/modules/ext/maven-scm-provider-svnexe-1.4.jar
+ ext/cxf-core-3.0.16.jar
+ release/modules/ext/cxf-core-3.0.16.jar
ext/opennlp-tools-1.5.3.jar
release/modules/ext/opennlp-tools-1.5.3.jar
-
- ext/apache-mime4j-core-0.7.2.jar
- release/modules/ext/apache-mime4j-core-0.7.2.jar
-
ext/rome-utils-1.5.1.jar
release/modules/ext/rome-utils-1.5.1.jar
-
- ext/httpcore-4.3.jar
- release/modules/ext/httpcore-4.3.jar
-
-
- ext/pdfbox-tools-2.0.3.jar
- release/modules/ext/pdfbox-tools-2.0.3.jar
-
ext/sis-storage-0.6.jar
release/modules/ext/sis-storage-0.6.jar
@@ -689,6 +621,10 @@
ext/uimafit-core-2.1.0.jar
release/modules/ext/uimafit-core-2.1.0.jar
+
+ ext/cxf-rt-frontend-jaxrs-3.0.16.jar
+ release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar
+
ext/cleartk-util-2.0.0.jar
release/modules/ext/cleartk-util-2.0.0.jar
@@ -697,14 +633,6 @@
ext/jdom-1.0.jar
release/modules/ext/jdom-1.0.jar
-
- ext/cxf-core-3.0.3.jar
- release/modules/ext/cxf-core-3.0.3.jar
-
-
- ext/regexp-1.3.jar
- release/modules/ext/regexp-1.3.jar
-
ext/commons-beanutils-1.9.2.jar
release/modules/ext/commons-beanutils-1.9.2.jar
@@ -713,10 +641,6 @@
ext/ehcache-core-2.6.2.jar
release/modules/ext/ehcache-core-2.6.2.jar
-
- ext/spring-context-3.1.2.RELEASE.jar
- release/modules/ext/spring-context-3.1.2.RELEASE.jar
-
ext/ctakes-type-system-3.2.2.jar
release/modules/ext/ctakes-type-system-3.2.2.jar
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java
index fcbace158d..4b9c3b17cb 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java
@@ -33,7 +33,11 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.tika.Tika;
import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.parser.ParsingReader;
+import org.apache.tika.parser.microsoft.OfficeParserConfig;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.datamodel.AbstractFile;
@@ -48,6 +52,8 @@ class TikaTextExtractor extends FileTextExtractor {
static final private Logger logger = Logger.getLogger(TikaTextExtractor.class.getName());
private final ExecutorService tikaParseExecutor = Executors.newSingleThreadExecutor();
+ private final AutoDetectParser parser = new AutoDetectParser();
+
private static final List TIKA_SUPPORTED_TYPES
= new Tika().getParser().getSupportedTypes(new ParseContext())
.stream()
@@ -64,8 +70,18 @@ class TikaTextExtractor extends FileTextExtractor {
ReadContentInputStream stream = new ReadContentInputStream(sourceFile);
Metadata metadata = new Metadata();
+ ParseContext parseContext = new ParseContext();
+ parseContext.set(Parser.class, parser);
+
+ // Use the more memory efficient Tika SAX parsers for DOCX and
+ // PPTX files (it already uses SAX for XLSX).
+ OfficeParserConfig officeParserConfig = new OfficeParserConfig();
+ officeParserConfig.setUseSAXPptxExtractor(true);
+ officeParserConfig.setUseSAXDocxExtractor(true);
+ parseContext.set(OfficeParserConfig.class, officeParserConfig);
+
//Parse the file in a task, a convenient way to have a timeout...
- final Future future = tikaParseExecutor.submit(() -> new Tika().parse(stream, metadata));
+ final Future future = tikaParseExecutor.submit(() -> new ParsingReader(parser, stream, metadata, parseContext));
try {
final Reader tikaReader = future.get(getTimeout(sourceFile.getSize()), TimeUnit.SECONDS);