From 7ca65cc65b446d8c48f7ea20ca658d3ce130d994 Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Thu, 3 Sep 2020 16:25:59 -0400
Subject: [PATCH] Upgraded to Solr 8.6.2

---
 KeywordSearch/ivy.xml                         |   6 +-
 KeywordSearch/nbproject/project.properties    |  12 +-
 KeywordSearch/nbproject/project.xml           | 116 +++---------------
 .../configsets/AutopsyConfig/conf/schema.xml  |  40 +++---
 .../AutopsyConfig/conf/solrconfig.xml         |   2 +-
 5 files changed, 50 insertions(+), 126 deletions(-)

diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 6a8cd4ee73..47f1039013 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -15,11 +15,11 @@
     </configurations>
     <dependencies>
         <!-- Solr -->
-		<dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file for embedded Solr 4 -->
-        <dependency name="solr-cell" rev="8.2.0" org="org.apache.solr" conf="solr-libs->default"/>
+	<dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file for embedded Solr 4 -->
+        <dependency name="solr-cell" rev="8.6.2" org="org.apache.solr" conf="solr-libs->default"/>
         
         <!-- Autopsy -->
-        <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="8.2.0"/>
+        <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="8.6.2"/>
         <dependency conf="autopsy->*" org="commons-lang" name="commons-lang" rev="2.4"/>
         <dependency conf="autopsy->*" org="commons-validator" name="commons-validator" rev="1.5.1"/>
         <dependency conf="autopsy->*" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 4362e06659..6e7117d751 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -15,10 +15,9 @@ 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.guava-18.0.jar=release/modules/ext/guava-18.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.httpclient-4.5.10.jar=release/modules/ext/httpclient-4.5.10.jar
+file.reference.httpcore-4.4.12.jar=release/modules/ext/httpcore-4.4.12.jar
+file.reference.httpmime-4.5.10.jar=release/modules/ext/httpmime-4.5.10.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
@@ -44,7 +43,7 @@ file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas
 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-8.2.0.jar=release/modules/ext/solr-solrj-8.2.0.jar
+file.reference.solr-solrj-8.6.2.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\solr-solrj-8.6.2.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
@@ -56,7 +55,7 @@ file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8
 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.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar
-file.reference.zookeeper-3.5.5.jar=release/modules/ext/zookeeper-3.5.5.jar
+file.reference.zookeeper-3.5.7.jar=release/modules/ext/zookeeper-3.5.7.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
@@ -64,4 +63,5 @@ 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 
+source.reference.solr-solrj-8.6.2.jar=release/modules/ext/solr-solrj-8.6.2-sources.jar
 spec.version.base=6.6
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index b177f27af8..7c07c6467c 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -134,78 +134,6 @@
             </module-dependencies>
             <public-packages>
                 <package>org.apache.commons.logging.impl</package>
-                <package>org.apache.http</package>
-                <package>org.apache.http.annotation</package>
-                <package>org.apache.http.auth</package>
-                <package>org.apache.http.auth.params</package>
-                <package>org.apache.http.client</package>
-                <package>org.apache.http.client.config</package>
-                <package>org.apache.http.client.entity</package>
-                <package>org.apache.http.client.methods</package>
-                <package>org.apache.http.client.params</package>
-                <package>org.apache.http.client.protocol</package>
-                <package>org.apache.http.client.utils</package>
-                <package>org.apache.http.concurrent</package>
-                <package>org.apache.http.config</package>
-                <package>org.apache.http.conn</package>
-                <package>org.apache.http.conn.params</package>
-                <package>org.apache.http.conn.routing</package>
-                <package>org.apache.http.conn.scheme</package>
-                <package>org.apache.http.conn.socket</package>
-                <package>org.apache.http.conn.ssl</package>
-                <package>org.apache.http.conn.util</package>
-                <package>org.apache.http.cookie</package>
-                <package>org.apache.http.cookie.params</package>
-                <package>org.apache.http.entity</package>
-                <package>org.apache.http.entity.mime</package>
-                <package>org.apache.http.entity.mime.content</package>
-                <package>org.apache.http.impl</package>
-                <package>org.apache.http.impl.auth</package>
-                <package>org.apache.http.impl.bootstrap</package>
-                <package>org.apache.http.impl.client</package>
-                <package>org.apache.http.impl.conn</package>
-                <package>org.apache.http.impl.conn.tsccm</package>
-                <package>org.apache.http.impl.cookie</package>
-                <package>org.apache.http.impl.entity</package>
-                <package>org.apache.http.impl.execchain</package>
-                <package>org.apache.http.impl.io</package>
-                <package>org.apache.http.impl.pool</package>
-                <package>org.apache.http.io</package>
-                <package>org.apache.http.message</package>
-                <package>org.apache.http.params</package>
-                <package>org.apache.http.pool</package>
-                <package>org.apache.http.protocol</package>
-                <package>org.apache.http.ssl</package>
-                <package>org.apache.http.util</package>
-                <package>org.apache.solr.client.solrj</package>
-                <package>org.apache.solr.client.solrj.beans</package>
-                <package>org.apache.solr.client.solrj.cloud</package>
-                <package>org.apache.solr.client.solrj.cloud.autoscaling</package>
-                <package>org.apache.solr.client.solrj.embedded</package>
-                <package>org.apache.solr.client.solrj.impl</package>
-                <package>org.apache.solr.client.solrj.io</package>
-                <package>org.apache.solr.client.solrj.io.comp</package>
-                <package>org.apache.solr.client.solrj.io.eq</package>
-                <package>org.apache.solr.client.solrj.io.eval</package>
-                <package>org.apache.solr.client.solrj.io.graph</package>
-                <package>org.apache.solr.client.solrj.io.ops</package>
-                <package>org.apache.solr.client.solrj.io.sql</package>
-                <package>org.apache.solr.client.solrj.io.stream</package>
-                <package>org.apache.solr.client.solrj.io.stream.expr</package>
-                <package>org.apache.solr.client.solrj.io.stream.metrics</package>
-                <package>org.apache.solr.client.solrj.request</package>
-                <package>org.apache.solr.client.solrj.request.json</package>
-                <package>org.apache.solr.client.solrj.request.schema</package>
-                <package>org.apache.solr.client.solrj.response</package>
-                <package>org.apache.solr.client.solrj.response.json</package>
-                <package>org.apache.solr.client.solrj.response.schema</package>
-                <package>org.apache.solr.client.solrj.util</package>
-                <package>org.apache.solr.common</package>
-                <package>org.apache.solr.common.cloud</package>
-                <package>org.apache.solr.common.cloud.rule</package>
-                <package>org.apache.solr.common.luke</package>
-                <package>org.apache.solr.common.params</package>
-                <package>org.apache.solr.common.util</package>
                 <package>org.apache.tika.parser.txt</package>
                 <package>org.codehaus.stax2</package>
                 <package>org.codehaus.stax2.evt</package>
@@ -222,6 +150,10 @@
                 <runtime-relative-path>ext/lucene-sandbox-4.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/lucene-sandbox-4.0.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/httpmime-4.5.10.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpmime-4.5.10.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jericho-html-3.3.jar</binary-origin>
@@ -234,14 +166,6 @@
                 <runtime-relative-path>ext/httpservices-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/httpservices-4.5.5.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpcore-4.4.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpcore-4.4.10.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/hamcrest-core-1.3.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/boilerpipe-1.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/boilerpipe-1.1.0.jar</binary-origin>
@@ -274,10 +198,6 @@
                 <runtime-relative-path>ext/tika-core-1.20.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-core-1.20.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/solr-solrj-8.2.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/solr-solrj-8.2.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tagsoup-1.2.1.jar</binary-origin>
@@ -302,10 +222,6 @@
                 <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/zookeeper-3.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-3.5.5.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/c3p0-0.9.1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/c3p0-0.9.1.1.jar</binary-origin>
@@ -390,14 +306,6 @@
                 <runtime-relative-path>ext/poi-4.0.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-4.0.1.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpmime-4.5.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\httpmime-4.5.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpclient-4.5.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\httpclient-4.5.6.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jcip-annotations-1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jcip-annotations-1.0.jar</binary-origin>
@@ -418,10 +326,18 @@
                 <runtime-relative-path>ext/grib-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/grib-4.5.5.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/httpcore-4.4.12.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpcore-4.4.12.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jdom-1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/solr-solrj-8.6.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-8.6.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-beanutils-1.9.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-beanutils-1.9.2.jar</binary-origin>
@@ -434,10 +350,18 @@
                 <runtime-relative-path>ext/poi-ooxml-schemas-4.0.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-ooxml-schemas-4.0.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/zookeeper-3.5.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/zookeeper-3.5.7.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-exec-1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-exec-1.3.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/httpclient-4.5.10.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpclient-4.5.10.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/vorbis-java-tika-0.8.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/vorbis-java-tika-0.8.jar</binary-origin>
diff --git a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml
index 6db945573b..ab6790c427 100755
--- a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml
+++ b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml
@@ -101,10 +101,10 @@
     <!--
       Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
     -->
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="int" class="solr.IntPointField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="float" class="solr.FloatPointField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="long" class="solr.LongPointField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="double" class="solr.DoublePointField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
 
     <!--
      Numeric field types that index each value at various levels of precision
@@ -116,10 +116,10 @@
      indexed per value, slightly larger index size, and faster range queries.
      A precisionStep of 0 disables indexing at different precision levels.
     -->
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="tint" class="solr.IntPointField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="tfloat" class="solr.FloatPointField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="tlong" class="solr.LongPointField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+    <fieldType name="tdouble" class="solr.DoublePointField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
          is a more restricted form of the canonical representation of dateTime
@@ -143,10 +143,10 @@
 
          Note: For faster range queries, consider the tdate type
       -->
-    <fieldType name="date" class="solr.TrieDateField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
+    <fieldType name="date" class="solr.DatePointField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
 
     <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
+    <fieldType name="tdate" class="solr.DatePointField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
 
 
     <!--
@@ -158,11 +158,11 @@
       value verbatim (and hence don't support range queries, since the
       lexicographic ordering isn't equal to the numeric ordering)
     -->
-    <fieldType name="pint" class="solr.TrieIntField" omitNorms="true"/>
-    <fieldType name="plong" class="solr.TrieLongField" omitNorms="true"/>
-    <fieldType name="pfloat" class="solr.TrieFloatField" omitNorms="true"/>
-    <fieldType name="pdouble" class="solr.TrieDoubleField" omitNorms="true"/>
-    <fieldType name="pdate" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="pint" class="solr.IntPointField" omitNorms="true"/>
+    <fieldType name="plong" class="solr.LongPointField" omitNorms="true"/>
+    <fieldType name="pfloat" class="solr.FloatPointField" omitNorms="true"/>
+    <fieldType name="pdouble" class="solr.DoublePointField" omitNorms="true"/>
+    <fieldType name="pdate" class="solr.DatePointField" sortMissingLast="true" omitNorms="true"/>
 
 
     <!--
@@ -175,10 +175,10 @@
       but with a lexicographic ordering the same as the numeric ordering,
       so that range queries work correctly.
     -->
-    <fieldType name="sint" class="solr.TrieIntField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="slong" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sfloat" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sdouble" class="solr.TrieDoubleField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sint" class="solr.IntPointField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="slong" class="solr.LongPointField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sfloat" class="solr.FloatPointField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sdouble" class="solr.DoublePointField" sortMissingLast="true" omitNorms="true"/>
 
 
     <!-- The "RandomSortField" is not used to store or search any
@@ -486,7 +486,7 @@
     <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
 
     <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+    <fieldType name="location" class="solr.LatLonPointSpatialField" subFieldSuffix="_coordinate"/>
 
    <!--
     A Geohash is a compact representation of a latitude longitude pair in a single field.
diff --git a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml
index 044c5ee668..2ffa675f19 100755
--- a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml
+++ b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>8.2.0</luceneMatchVersion>
+  <luceneMatchVersion>8.6.2</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in