From 1ce768a8617cbab3eb30aa0dbc040714b51a42f9 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Mon, 3 Dec 2018 14:18:10 -0500 Subject: [PATCH] Migrated all tika dependencies from keywordsearch NBM to core --- Core/nbproject/project.properties | 52 +++++- Core/nbproject/project.xml | 300 ++++++++++++++++++++++-------- 2 files changed, 261 insertions(+), 91 deletions(-) diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 0833626f85..3cccdceb8e 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,28 +1,59 @@ file.reference.activemq-all-5.11.1.jar=release/modules/ext/activemq-all-5.11.1.jar -file.reference.apache-mime4j-core-0.8.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\apache-mime4j-core-0.8.1.jar -file.reference.apache-mime4j-dom-0.8.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\apache-mime4j-dom-0.8.1.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.bcmail-jdk15on-1.54.jar=release/modules/ext/bcmail-jdk15on-1.54.jar +file.reference.bcprov-jdk15on-1.54.jar=release/modules/ext/bcprov-jdk15on-1.54.jar +file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar +file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar +file.reference.commons-codec-1.6.jar=release/modules/ext/commons-codec-1.6.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.commons-dbcp2-2.1.1.jar=release/modules/ext/commons-dbcp2-2.1.1.jar +file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar +file.reference.commons-pool2-2.4.2.jar=release/modules/ext/commons-pool2-2.4.2.jar file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.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.8.1.jar=release/modules/ext/gson-2.8.1.jar +file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar +file.reference.isoparser-1.1.18.jar=release/modules/ext/isoparser-1.1.18.jar +file.reference.jackcess-2.2.0.jar=release/modules/ext/jackcess-2.2.0.jar +file.reference.jackcess-encrypt-2.1.4.jar=release/modules/ext/jackcess-encrypt-2.1.4.jar +file.reference.jackson-core-2.9.2.jar=release/modules/ext/jackson-core-2.9.2.jar +file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar +file.reference.jcl-over-slf4j-1.7.24.jar=release/modules/ext/jcl-over-slf4j-1.7.24.jar file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar -file.reference.jericho-html-3.3.jar=release\\modules\\ext\\jericho-html-3.3.jar +file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar file.reference.jgraphx-v3.8.0.jar=release/modules/ext/jgraphx-v3.8.0.jar +file.reference.jhighlight-1.0.2.jar=release/modules/ext/jhighlight-1.0.2.jar +file.reference.jmatio-1.2.jar=release/modules/ext/jmatio-1.2.jar +file.reference.json-1.8.jar=release/modules/ext/json-1.8.jar +file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar file.reference.jsoup-1.10.3.jar=release/modules/ext/jsoup-1.10.3.jar +file.reference.jul-to-slf4j-1.7.24.jar=release/modules/ext/jul-to-slf4j-1.7.24.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.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.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.opennlp-tools-1.8.3.jar=release/modules/ext/opennlp-tools-1.8.3.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-scratchpad-3.17.jar=release/modules/ext/poi-scratchpad-3.17.jar file.reference.postgresql-9.4.1211.jre7.jar=release/modules/ext/postgresql-9.4.1211.jre7.jar file.reference.Rejistry-1.0-SNAPSHOT.jar=release/modules/ext/Rejistry-1.0-SNAPSHOT.jar +file.reference.rome-1.5.1.jar=release/modules/ext/rome-1.5.1.jar file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar 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.sis-metadata-0.6.jar=release/modules/ext/sis-metadata-0.6.jar +file.reference.sis-netcdf-0.6.jar=release/modules/ext/sis-netcdf-0.6.jar +file.reference.sis-utility-0.6.jar=release/modules/ext/sis-utility-0.6.jar +file.reference.slf4j-api-1.7.24.jar=release/modules/ext/slf4j-api-1.7.24.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.bcprov-jdk15on-1.54.jar=release/modules/ext/bcprov-jdk15on-1.54.jar -file.reference.jackcess-2.2.0.jar=release/modules/ext/jackcess-2.2.0.jar -file.reference.jackcess-encrypt-2.1.4.jar=release/modules/ext/jackcess-encrypt-2.1.4.jar file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0.1.jar file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar @@ -33,11 +64,14 @@ file.reference.fontbox-2.0.8.jar=release/modules/ext/fontbox-2.0.8.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.sleuthkit-postgresql-4.6.4.jar=release/modules/ext/sleuthkit-postgresql-4.6.4.jar +file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.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.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.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar +file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.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 diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 2cc68bf73b..bc9de174b5 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -343,90 +343,54 @@ org.sleuthkit.autopsy.texttranslation org.sleuthkit.datamodel - - ext/zookeeper-3.4.6.jar - release/modules/ext/zookeeper-3.4.6.jar - ext/apache-mime4j-dom-0.8.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\apache-mime4j-dom-0.8.1.jar - - - ext/jdom-2.0.5.jar - release/modules/ext/jdom-2.0.5.jar - - - ext/cxf-rt-transports-http-3.0.16.jar - release/modules/ext/cxf-rt-transports-http-3.0.16.jar + release/modules/ext/apache-mime4j-dom-0.8.1.jar ext/jackcess-2.2.0.jar release/modules/ext/jackcess-2.2.0.jar - ext/sleuthkit-postgresql-4.6.4.jar - release/modules/ext/sleuthkit-postgresql-4.6.4.jar + ext/jericho-html-3.3.jar + release/modules/ext/jericho-html-3.3.jar - ext/jericho-html-3.3.jar - release\modules\ext\jericho-html-3.3.jar + ext/cdm-4.5.5.jar + release/modules/ext/cdm-4.5.5.jar + + + ext/httpservices-4.5.5.jar + release/modules/ext/httpservices-4.5.5.jar ext/commons-validator-1.6.jar release/modules/ext/commons-validator-1.6.jar - - ext/curator-framework-2.8.0.jar - release/modules/ext/curator-framework-2.8.0.jar - - - ext/bcprov-jdk15on-1.54.jar - release/modules/ext/bcprov-jdk15on-1.54.jar - ext/commons-compress-1.14.jar release/modules/ext/commons-compress-1.14.jar - ext/fontbox-2.0.8.jar - release/modules/ext/fontbox-2.0.8.jar + ext/geoapi-3.0.0.jar + release/modules/ext/geoapi-3.0.0.jar - ext/commons-dbcp2-2.1.1.jar - release\modules\ext\commons-dbcp2-2.1.1.jar - - - ext/jgraphx-v3.8.0.jar - release/modules/ext/jgraphx-v3.8.0.jar - - - ext/jython-standalone-2.7.0.jar - release/modules/ext/jython-standalone-2.7.0.jar + ext/boilerpipe-1.1.0.jar + release/modules/ext/boilerpipe-1.1.0.jar ext/sevenzipjbinding.jar release/modules/ext/sevenzipjbinding.jar + + ext/bcmail-jdk15on-1.54.jar + release/modules/ext/bcmail-jdk15on-1.54.jar + ext/mchange-commons-java-0.2.9.jar release/modules/ext/mchange-commons-java-0.2.9.jar - - ext/jackcess-encrypt-2.1.4.jar - release/modules/ext/jackcess-encrypt-2.1.4.jar - - - ext/cxf-core-3.0.16.jar - release/modules/ext/cxf-core-3.0.16.jar - - - ext/javax.ws.rs-api-2.0.1.jar - release/modules/ext/javax.ws.rs-api-2.0.1.jar - - - ext/postgresql-9.4.1211.jre7.jar - release/modules/ext/postgresql-9.4.1211.jre7.jar - ext/curator-recipes-2.8.0.jar release/modules/ext/curator-recipes-2.8.0.jar @@ -437,7 +401,11 @@ ext/apache-mime4j-core-0.8.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\apache-mime4j-core-0.8.1.jar + release/modules/ext/apache-mime4j-core-0.8.1.jar + + + ext/tagsoup-1.2.1.jar + release/modules/ext/tagsoup-1.2.1.jar ext/tika-core-1.17.jar @@ -447,41 +415,37 @@ ext/StixLib.jar release/modules/ext/StixLib.jar - - ext/curator-client-2.8.0.jar - release/modules/ext/curator-client-2.8.0.jar - - - ext/cxf-rt-frontend-jaxrs-3.0.16.jar - release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar - ext/pdfbox-tools-2.0.8.jar release/modules/ext/pdfbox-tools-2.0.8.jar + + ext/asm-5.0.4.jar + release/modules/ext/asm-5.0.4.jar + + + ext/jcl-over-slf4j-1.7.24.jar + release/modules/ext/jcl-over-slf4j-1.7.24.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 + release/modules/ext/sqlite-jdbc-3.8.11.jar - ext/activemq-all-5.11.1.jar - release/modules/ext/activemq-all-5.11.1.jar + ext/json-simple-1.1.1.jar + release/modules/ext/json-simple-1.1.1.jar - ext/xz-1.6.jar - release/modules/ext/xz-1.6.jar + ext/sis-utility-0.6.jar + release/modules/ext/sis-utility-0.6.jar - ext/Rejistry-1.0-SNAPSHOT.jar - release/modules/ext/Rejistry-1.0-SNAPSHOT.jar - - - ext/dd-plist-1.20.jar - release/modules/ext/dd-plist-1.20.jar + ext/jhighlight-1.0.2.jar + release/modules/ext/jhighlight-1.0.2.jar ext/jempbox-1.8.13.jar @@ -491,17 +455,9 @@ ext/cxf-rt-rs-client-3.0.16.jar release/modules/ext/cxf-rt-rs-client-3.0.16.jar - - ext/sevenzipjbinding-AllPlatforms.jar - release/modules/ext/sevenzipjbinding-AllPlatforms.jar - ext/commons-pool2-2.4.2.jar - release\modules\ext\commons-pool2-2.4.2.jar - - - ext/jsoup-1.10.3.jar - release/modules/ext/jsoup-1.10.3.jar + release/modules/ext/commons-pool2-2.4.2.jar ext/jdom-2.0.5-contrib.jar @@ -523,6 +479,186 @@ ext/xmpcore-5.1.3.jar release/modules/ext/xmpcore-5.1.3.jar + + ext/zookeeper-3.4.6.jar + release/modules/ext/zookeeper-3.4.6.jar + + + ext/jdom-2.0.5.jar + release/modules/ext/jdom-2.0.5.jar + + + ext/cxf-rt-transports-http-3.0.16.jar + release/modules/ext/cxf-rt-transports-http-3.0.16.jar + + + ext/sis-metadata-0.6.jar + release/modules/ext/sis-metadata-0.6.jar + + + ext/isoparser-1.1.18.jar + release/modules/ext/isoparser-1.1.18.jar + + + ext/sleuthkit-postgresql-4.6.4.jar + release/modules/ext/sleuthkit-postgresql-4.6.4.jar + + + ext/vorbis-java-core-0.8.jar + release/modules/ext/vorbis-java-core-0.8.jar + + + ext/commons-codec-1.6.jar + release/modules/ext/commons-codec-1.6.jar + + + ext/netcdf4-4.5.5.jar + release/modules/ext/netcdf4-4.5.5.jar + + + ext/slf4j-api-1.7.24.jar + release/modules/ext/slf4j-api-1.7.24.jar + + + ext/java-libpst-0.8.1.jar + release/modules/ext/java-libpst-0.8.1.jar + + + ext/jul-to-slf4j-1.7.24.jar + release/modules/ext/jul-to-slf4j-1.7.24.jar + + + ext/gson-2.8.1.jar + release/modules/ext/gson-2.8.1.jar + + + ext/poi-3.17.jar + release/modules/ext/poi-3.17.jar + + + ext/poi-scratchpad-3.17.jar + release/modules/ext/poi-scratchpad-3.17.jar + + + ext/sis-netcdf-0.6.jar + release/modules/ext/sis-netcdf-0.6.jar + + + ext/commons-io-2.5.jar + release/modules/ext/commons-io-2.5.jar + + + ext/curator-framework-2.8.0.jar + release/modules/ext/curator-framework-2.8.0.jar + + + ext/bcprov-jdk15on-1.54.jar + release/modules/ext/bcprov-jdk15on-1.54.jar + + + ext/fontbox-2.0.8.jar + release/modules/ext/fontbox-2.0.8.jar + + + ext/commons-dbcp2-2.1.1.jar + release/modules/ext/commons-dbcp2-2.1.1.jar + + + ext/jgraphx-v3.8.0.jar + release/modules/ext/jgraphx-v3.8.0.jar + + + ext/juniversalchardet-1.0.3.jar + release/modules/ext/juniversalchardet-1.0.3.jar + + + ext/jython-standalone-2.7.0.jar + release/modules/ext/jython-standalone-2.7.0.jar + + + ext/jackcess-encrypt-2.1.4.jar + release/modules/ext/jackcess-encrypt-2.1.4.jar + + + ext/cxf-core-3.0.16.jar + release/modules/ext/cxf-core-3.0.16.jar + + + ext/javax.ws.rs-api-2.0.1.jar + release/modules/ext/javax.ws.rs-api-2.0.1.jar + + + ext/opennlp-tools-1.8.3.jar + release/modules/ext/opennlp-tools-1.8.3.jar + + + ext/junrar-0.7.jar + release/modules/ext/junrar-0.7.jar + + + ext/postgresql-9.4.1211.jre7.jar + release/modules/ext/postgresql-9.4.1211.jre7.jar + + + ext/poi-ooxml-3.17.jar + release/modules/ext/poi-ooxml-3.17.jar + + + ext/curator-client-2.8.0.jar + release/modules/ext/curator-client-2.8.0.jar + + + ext/cxf-rt-frontend-jaxrs-3.0.16.jar + release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar + + + ext/grib-4.5.5.jar + release/modules/ext/grib-4.5.5.jar + + + ext/jackson-core-2.9.2.jar + release/modules/ext/jackson-core-2.9.2.jar + + + 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 + + + ext/dd-plist-1.20.jar + release/modules/ext/dd-plist-1.20.jar + + + ext/rome-1.5.1.jar + release/modules/ext/rome-1.5.1.jar + + + ext/sevenzipjbinding-AllPlatforms.jar + release/modules/ext/sevenzipjbinding-AllPlatforms.jar + + + ext/jmatio-1.2.jar + release/modules/ext/jmatio-1.2.jar + + + ext/jsoup-1.10.3.jar + release/modules/ext/jsoup-1.10.3.jar + + + ext/vorbis-java-tika-0.8.jar + release/modules/ext/vorbis-java-tika-0.8.jar + + + ext/json-1.8.jar + release/modules/ext/json-1.8.jar +