From f52dfb9be6ab0a61d3ab8943a52ac4a96989d171 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-2925.basistech.net>
Date: Mon, 17 Aug 2020 11:19:29 -0400
Subject: [PATCH] Added back jars to keep public API changes to a minimum.
---
CoreLibs/nbproject/project.properties | 1 -
KeywordSearch/ivy.xml | 5 +++++
KeywordSearch/nbproject/project.properties | 6 ++---
KeywordSearch/nbproject/project.xml | 26 ++++++++++++----------
4 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 4fd3d71a43..fb53508bb4 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -42,7 +42,6 @@ file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.j
file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar
file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar
file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar
-file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar
file.reference.jna-5.6.0.jar=release/modules/ext/jna-5.6.0.jar
file.reference.jna-platform-5.6.0.jar=release/modules/ext/jna-platform-5.6.0.jar
file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 06c925f23a..ee86821bd8 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -38,6 +38,11 @@
<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"/>
+ <!-- Remnants of a past Tika dependency. These jars were being exported from Tika, which has since
+ moved into it's own NBM. For sake of backwards compatibility, these are still provided. -->
+ <dependency conf="autopsy->default" org="org.apache.httpcomponents" name="httpclient" rev="4.5.6"/>
+ <dependency conf="autopsy->default" org="org.apache.httpcomponents" name="httpmime" rev="4.5.6"/>
+
<exclude org="*" ext="*" type="javadoc"/>
</dependencies>
</ivy-module>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index f42ba66c79..b0c06e183e 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -7,9 +7,9 @@ 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-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.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.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
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 11d3c53cc8..6f9de64072 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -184,6 +184,7 @@
<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>
@@ -197,6 +198,7 @@
<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.jute</package>
<package>org.apache.jute.compiler</package>
@@ -240,10 +242,6 @@
<runtime-relative-path>ext/guava-18.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\guava-18.0.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/httpcore-4.3.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpcore-4.3.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/zookeeper-3.4.6.jar</runtime-relative-path>
<binary-origin>release\modules\ext\zookeeper-3.4.6.jar</binary-origin>
@@ -252,6 +250,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/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/commons-validator-1.5.1.jar</runtime-relative-path>
<binary-origin>release\modules\ext\commons-validator-1.5.1.jar</binary-origin>
@@ -268,6 +274,10 @@
<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/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/slf4j-api-1.7.6.jar</runtime-relative-path>
<binary-origin>release\modules\ext\slf4j-api-1.7.6.jar</binary-origin>
@@ -280,10 +290,6 @@
<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/httpclient-4.3.1.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpclient-4.3.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>
@@ -300,10 +306,6 @@
<runtime-relative-path>ext/noggit-0.5.jar</runtime-relative-path>
<binary-origin>release\modules\ext\noggit-0.5.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/httpmime-4.3.1.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpmime-4.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>
--
GitLab