From a56c5c116a5c81c1e04a99167b66cf86dee5dddf Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Tue, 30 Apr 2019 17:42:59 -0400
Subject: [PATCH] Fixed old references hanging around from bad merge in Tika
 1.20 branch

---
 KeywordSearch/ivy.xml                      |   2 +
 KeywordSearch/nbproject/project.properties |   9 +-
 KeywordSearch/nbproject/project.xml        | 176 ++++++---------------
 3 files changed, 61 insertions(+), 126 deletions(-)

diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index f86e1de895..314c9e63c2 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -44,5 +44,7 @@
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.10"/>
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="1.7.10"/>
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.10"/>
+        
+        <override org="org.cleartk" module="cleartk-util" rev="2.0.0"/>            
     </dependencies>
 </ivy-module>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 08eec5cbee..94ec9d54be 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -4,11 +4,9 @@ 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-codec-1.11.jar=release\\modules\\ext\\commons-codec-1.11.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-io-2.3.jar=release\\modules\\ext\\commons-io-2.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
@@ -21,9 +19,13 @@ file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.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.5.6.jar
+file.reference.httpclient-4.5.6.jar=release\\modules\\ext\\httpclient-4.5.6.jar
 file.reference.httpcore-4.4.1.jar=release/modules/ext/httpcore-4.4.10.jar
+file.reference.httpcore-4.4.10.jar=release/modules/ext/httpcore-4.4.10.jar
 file.reference.httpmime-4.3.1.jar=release\\modules\\ext\\httpmime-4.5.6.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
@@ -36,6 +38,9 @@ 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.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
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index b6a814eb36..22a9cfee96 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -243,6 +243,14 @@
                 <runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-digester-1.8.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <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/jericho-html-3.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jericho-html-3.3.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/cdm-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/cdm-4.5.5.jar</binary-origin>
@@ -251,6 +259,10 @@
                 <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>
@@ -271,6 +283,10 @@
                 <runtime-relative-path>ext/quartz-2.2.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/quartz-2.2.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/icu4j-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/icu4j-3.8.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/guava-17.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/guava-17.0.jar</binary-origin>
@@ -287,6 +303,10 @@
                 <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tagsoup-1.2.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/lucene-core-4.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/lucene-core-4.0.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opennlp-maxent-3.0.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opennlp-maxent-3.0.3.jar</binary-origin>
@@ -295,26 +315,30 @@
                 <runtime-relative-path>ext/poi-scratchpad-4.0.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-scratchpad-4.0.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <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/c3p0-0.9.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/c3p0-0.9.1.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-ooxml-4.0.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-ooxml-4.0.1.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/commons-codec-1.11.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-codec-1.11.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-parsers-1.20.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parsers-1.20.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sqlwrapper-0.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sqlwrapper-0.0.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
@@ -379,10 +403,6 @@
                 <runtime-relative-path>ext/lucene-queries-4.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/lucene-queries-4.0.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-io-2.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-io-2.3.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jericho-html-3.3-sources.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jericho-html-3.3-sources.jar</binary-origin>
@@ -411,122 +431,14 @@
                 <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/jna-4.1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-4.1.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/qdox-1.12.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/qdox-1.12.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/bcpkix-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcpkix-jdk15on-1.54.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/bzip2-0.9.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bzip2-0.9.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <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/jackson-core-2.9.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-core-2.9.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/uimaj-core-2.5.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/uimaj-core-2.5.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jmatio-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jmatio-1.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/wstx-asl-3.2.7.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\wstx-asl-3.2.7.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-csv-1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-csv-1.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-validator-1.5.1-javadoc.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-validator-1.5.1-javadoc.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <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/jericho-html-3.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jericho-html-3.3.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jsr-275-0.9.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jsr-275-0.9.3.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/bcmail-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcmail-jdk15on-1.54.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/asm-all-3.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/asm-all-3.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/icu4j-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/icu4j-3.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/curvesapi-1.04.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/curvesapi-1.04.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-referencing-0.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sis-referencing-0.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/ctakes-core-res-3.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/ctakes-core-res-3.2.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/lucene-core-4.0.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/lucene-core-4.0.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/asm-5.0.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/asm-5.0.4.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/org.osgi.core-4.0.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/org.osgi.core-4.0.0.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sqlwrapper-0.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sqlwrapper-0.0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackcess-encrypt-2.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackcess-encrypt-2.1.2.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>
@@ -535,10 +447,18 @@
                 <runtime-relative-path>ext/commons-validator-1.5.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-validator-1.5.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/bzip2-0.9.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bzip2-0.9.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/cleartk-util-2.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/cleartk-util-2.0.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <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/jdom-1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
@@ -555,10 +475,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/wstx-asl-3.2.7.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\wstx-asl-3.2.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/commons-validator-1.5.1-javadoc.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-validator-1.5.1-javadoc.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>