diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 9f39e52d7c..06c925f23a 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -18,22 +18,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
@@ -47,6 +39,5 @@
-
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 23dd898e34..0a3d71050d 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,67 +1,30 @@
-file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar
-file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar
-file.reference.c3p0-0.9.1.1.jar=release/modules/ext/c3p0-0.9.1.1.jar
-file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar
-file.reference.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar
-file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils-1.9.2.jar
-file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.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
-file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
-file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
-file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar
-file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.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.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar
+file.reference.annotations-12.0.jar=release\\modules\\ext\\annotations-12.0.jar
+file.reference.commons-beanutils-1.9.2.jar=release\\modules\\ext\\commons-beanutils-1.9.2.jar
+file.reference.commons-collections-3.2.2.jar=release\\modules\\ext\\commons-collections-3.2.2.jar
+file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar
+file.reference.commons-io-2.3.jar=release\\modules\\ext\\commons-io-2.3.jar
+file.reference.commons-lang-2.4.jar=release\\modules\\ext\\commons-lang-2.4.jar
+file.reference.commons-logging-1.2.jar=release\\modules\\ext\\commons-logging-1.2.jar
+file.reference.commons-validator-1.5.1.jar=release\\modules\\ext\\commons-validator-1.5.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.5.6.jar=release\\modules\\ext\\httpclient-4.5.6.jar
-file.reference.httpcore-4.4.10.jar=release/modules/ext/httpcore-4.4.10.jar
-file.reference.httpmime-4.5.6.jar=release\\modules\\ext\\httpmime-4.5.6.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.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar
-file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar
-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.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.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.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
+file.reference.guava-18.0.jar=release\\modules\\ext\\guava-18.0.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.httpmime-4.3.1.jar=release\\modules\\ext\\httpmime-4.3.1.jar
+file.reference.icu4j-3.8.jar=release\\modules\\ext\\icu4j-3.8.jar
+file.reference.jericho-html-3.3.jar=release\\modules\\ext\\jericho-html-3.3.jar
+file.reference.jsonic-1.2.11.jar=release\\modules\\ext\\jsonic-1.2.11.jar
file.reference.language-detector-0.6.jar=release\\modules\\ext\\language-detector-0.6.jar
-file.reference.libsvm-3.1.jar=release/modules/ext/libsvm-3.1.jar
-file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
-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-sandbox-4.0.0.jar=release/modules/ext/lucene-sandbox-4.0.0.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
-file.reference.opennlp-maxent-3.0.3.jar=release/modules/ext/opennlp-maxent-3.0.3.jar
-file.reference.poi-4.0.1.jar=release/modules/ext/poi-4.0.1.jar
-file.reference.poi-ooxml-4.0.1.jar=release/modules/ext/poi-ooxml-4.0.1.jar
-file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas-4.0.1.jar
-file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar
-file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar
-file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar
-file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.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.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.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.noggit-0.5.jar=release\\modules\\ext\\noggit-0.5.jar
+file.reference.slf4j-api-1.7.6.jar=release\\modules\\ext\\slf4j-api-1.7.6.jar
+file.reference.solr-solrj-4.9.1.jar=release\\modules\\ext\\solr-solrj-4.9.1.jar
file.reference.woodstox-core-asl-4.4.1.jar=release/modules/ext/woodstox-core-asl-4.4.1.jar
file.reference.wstx-asl-3.2.7.jar=release\\modules\\ext\\wstx-asl-3.2.7.jar
file.reference.xmlbeans-2.6.0.jar=release/modules/ext/xmlbeans-2.6.0.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
+file.reference.zookeeper-3.4.6.jar=release\\modules\\ext\\zookeeper-3.4.6.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-javadoc.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1-javadoc.jar
license.file=../LICENSE-2.0.txt
nbm.homepage=http://www.sleuthkit.org/autopsy/
nbm.needs.restart=true
-source.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1-sources.jar
spec.version.base=6.6
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index f9482b14b3..11d3c53cc8 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -184,7 +184,6 @@
org.apache.http.entity.mime.content
org.apache.http.impl
org.apache.http.impl.auth
- org.apache.http.impl.bootstrap
org.apache.http.impl.client
org.apache.http.impl.conn
org.apache.http.impl.conn.tsccm
@@ -198,7 +197,6 @@
org.apache.http.params
org.apache.http.pool
org.apache.http.protocol
- org.apache.http.ssl
org.apache.http.util
org.apache.jute
org.apache.jute.compiler
@@ -239,228 +237,88 @@
org.sleuthkit.autopsy.keywordsearch
- ext/commons-digester-1.8.1.jar
- release/modules/ext/commons-digester-1.8.1.jar
+ ext/guava-18.0.jar
+ release\modules\ext\guava-18.0.jar
- ext/lucene-sandbox-4.0.0.jar
- release/modules/ext/lucene-sandbox-4.0.0.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/httpcore-4.4.10.jar
- release/modules/ext/httpcore-4.4.10.jar
-
-
- ext/hamcrest-core-1.3.jar
- release/modules/ext/hamcrest-core-1.3.jar
-
-
- ext/boilerpipe-1.1.0.jar
- release/modules/ext/boilerpipe-1.1.0.jar
-
-
- ext/commons-logging-api-1.1.jar
- release/modules/ext/commons-logging-api-1.1.jar
-
-
- ext/quartz-2.2.0.jar
- release/modules/ext/quartz-2.2.0.jar
-
-
- ext/icu4j-3.8.jar
- release/modules/ext/icu4j-3.8.jar
-
-
- ext/language-detector-0.6.jar
- release\modules\ext\language-detector-0.6.jar
-
-
- ext/joda-time-2.2.jar
- release/modules/ext/joda-time-2.2.jar
-
-
- ext/tagsoup-1.2.1.jar
- release/modules/ext/tagsoup-1.2.1.jar
-
-
- ext/lucene-core-4.0.0.jar
- release/modules/ext/lucene-core-4.0.0.jar
-
-
- ext/opennlp-maxent-3.0.3.jar
- release/modules/ext/opennlp-maxent-3.0.3.jar
-
-
- ext/poi-scratchpad-4.0.1.jar
- release/modules/ext/poi-scratchpad-4.0.1.jar
-
-
- ext/commons-logging-1.2.jar
- release/modules/ext/commons-logging-1.2.jar
-
-
- ext/json-simple-1.1.1.jar
- release/modules/ext/json-simple-1.1.1.jar
-
-
- ext/c3p0-0.9.1.1.jar
- release/modules/ext/c3p0-0.9.1.1.jar
-
-
- ext/poi-ooxml-4.0.1.jar
- release/modules/ext/poi-ooxml-4.0.1.jar
-
-
- ext/sqlwrapper-0.0.1.jar
- release/modules/ext/sqlwrapper-0.0.1.jar
-
-
- ext/log4j-1.2.17.jar
- release/modules/ext/log4j-1.2.17.jar
-
-
- ext/udunits-4.5.5.jar
- release/modules/ext/udunits-4.5.5.jar
-
-
- ext/commons-collections-3.2.2.jar
- release/modules/ext/commons-collections-3.2.2.jar
-
-
- ext/openaifsm-0.0.1.jar
- release/modules/ext/openaifsm-0.0.1.jar
-
-
- ext/stax2-api-3.1.4.jar
- release/modules/ext/stax2-api-3.1.4.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/findstructapi-0.0.1.jar
- release/modules/ext/findstructapi-0.0.1.jar
+ ext/httpcore-4.3.jar
+ release\modules\ext\httpcore-4.3.jar
ext/zookeeper-3.4.6.jar
- release/modules/ext/zookeeper-3.4.6.jar
+ release\modules\ext\zookeeper-3.4.6.jar
- ext/jcommander-1.35.jar
- release/modules/ext/jcommander-1.35.jar
-
-
- ext/vorbis-java-core-0.8.jar
- release/modules/ext/vorbis-java-core-0.8.jar
-
-
- ext/netcdf4-4.5.5.jar
- release/modules/ext/netcdf4-4.5.5.jar
-
-
- ext/java-libpst-0.8.1.jar
- release/modules/ext/java-libpst-0.8.1.jar
-
-
- ext/protobuf-java-2.5.0.jar
- release/modules/ext/protobuf-java-2.5.0.jar
-
-
- ext/lucene-queries-4.0.0.jar
- release/modules/ext/lucene-queries-4.0.0.jar
-
-
- ext/juniversalchardet-1.0.3.jar
- release/modules/ext/juniversalchardet-1.0.3.jar
-
-
- ext/commons-lang-2.6.jar
- release/modules/ext/commons-lang-2.6.jar
-
-
- ext/libsvm-3.1.jar
- release/modules/ext/libsvm-3.1.jar
-
-
- ext/noggit-0.5.jar
- release/modules/ext/noggit-0.5.jar
-
-
- ext/poi-4.0.1.jar
- release/modules/ext/poi-4.0.1.jar
-
-
- ext/httpmime-4.5.6.jar
- release\modules\ext\httpmime-4.5.6.jar
-
-
- ext/httpclient-4.5.6.jar
- release\modules\ext\httpclient-4.5.6.jar
-
-
- ext/jcip-annotations-1.0.jar
- release/modules/ext/jcip-annotations-1.0.jar
+ ext/commons-digester-1.8.1.jar
+ release\modules\ext\commons-digester-1.8.1.jar
ext/commons-validator-1.5.1.jar
- release/modules/ext/commons-validator-1.5.1.jar
+ release\modules\ext\commons-validator-1.5.1.jar
- ext/bzip2-0.9.1.jar
- release/modules/ext/bzip2-0.9.1.jar
+ ext/commons-lang-2.4.jar
+ release\modules\ext\commons-lang-2.4.jar
- ext/cleartk-util-2.0.0.jar
- release/modules/ext/cleartk-util-2.0.0.jar
+ ext/commons-logging-1.2.jar
+ release\modules\ext\commons-logging-1.2.jar
- ext/grib-4.5.5.jar
- release/modules/ext/grib-4.5.5.jar
+ ext/jericho-html-3.3.jar
+ release\modules\ext\jericho-html-3.3.jar
- ext/jdom-1.0.jar
- release/modules/ext/jdom-1.0.jar
+ ext/slf4j-api-1.7.6.jar
+ release\modules\ext\slf4j-api-1.7.6.jar
ext/commons-beanutils-1.9.2.jar
- release/modules/ext/commons-beanutils-1.9.2.jar
+ release\modules\ext\commons-beanutils-1.9.2.jar
- ext/ehcache-core-2.6.2.jar
- release/modules/ext/ehcache-core-2.6.2.jar
+ ext/commons-io-2.3.jar
+ release\modules\ext\commons-io-2.3.jar
- ext/poi-ooxml-schemas-4.0.1.jar
- release/modules/ext/poi-ooxml-schemas-4.0.1.jar
+ ext/httpclient-4.3.1.jar
+ release\modules\ext\httpclient-4.3.1.jar
ext/wstx-asl-3.2.7.jar
release\modules\ext\wstx-asl-3.2.7.jar
- ext/commons-exec-1.3.jar
- release/modules/ext/commons-exec-1.3.jar
+ ext/annotations-12.0.jar
+ release\modules\ext\annotations-12.0.jar
- ext/vorbis-java-tika-0.8.jar
- release/modules/ext/vorbis-java-tika-0.8.jar
+ ext/commons-collections-3.2.2.jar
+ release\modules\ext\commons-collections-3.2.2.jar
+
+
+ ext/noggit-0.5.jar
+ release\modules\ext\noggit-0.5.jar
+
+
+ ext/httpmime-4.3.1.jar
+ release\modules\ext\httpmime-4.3.1.jar
+
+
+ ext/icu4j-3.8.jar
+ release\modules\ext\icu4j-3.8.jar
+
+
+ ext/jsonic-1.2.11.jar
+ release\modules\ext\jsonic-1.2.11.jar
+
+
+ ext/language-detector-0.6.jar
+ release\modules\ext\language-detector-0.6.jar
+
+
+ ext/solr-solrj-4.9.1.jar
+ release\modules\ext\solr-solrj-4.9.1.jar