From be0e2cf05973d5a7f793bb51a3b55e3c4f088fb6 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 18 Apr 2019 17:09:30 -0400
Subject: [PATCH] Removed erroneous Image Gallery project property and manually
downloaded the cleartk-ml package in attempt to fix Travis
---
Core/ivy.xml | 7 +++----
ImageGallery/nbproject/project.properties | 1 -
KeywordSearch/ivy.xml | 7 ++++---
KeywordSearch/nbproject/project.properties | 8 +++-----
KeywordSearch/nbproject/project.xml | 12 ++++++------
5 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/Core/ivy.xml b/Core/ivy.xml
index e085dc8411..ab4045edfb 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -22,10 +22,12 @@
<!-- Exclude the version of cxf-rt-rs-client from Tika 1.20, one of its depedencies breaks Ivy -->
<dependency conf="core->default" org="org.apache.tika" name="tika-parsers" rev="1.20">
<exclude module="cxf-rt-rs-client"/>
+ <exclude module="cleartk-ml"/>
</dependency>
<!-- Pull down the latest cxf-rt-rs-client which has the Ivy fix -->
<dependency conf="core->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.3.0"/>
+ <dependency conf="core->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/>
<dependency conf="core->default" org="com.adobe.xmp" name="xmpcore" rev="5.1.2"/>
<dependency conf="core->default" org="org.apache.zookeeper" name="zookeeper" rev="3.4.6"/>
@@ -43,10 +45,7 @@
<dependency conf="core->default" org="commons-validator" name="commons-validator" rev="1.6"/>
<dependency conf="core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
-
- <!-- Tika 1.14 seems to declare a (transitive?) dependency on cleartk-util 3.2.2, but the most recent
- version available is 2.0.0 Overriding the version worked-->
- <override org="org.cleartk" module="cleartk-util" rev="2.0.0"/>
+
<override org="jakarta.ws.rs" module="jakarta.ws.rs-api" rev="2.1.5"/>
</dependencies>
</ivy-module>
diff --git a/ImageGallery/nbproject/project.properties b/ImageGallery/nbproject/project.properties
index 0e4afc928e..e400c96aab 100644
--- a/ImageGallery/nbproject/project.properties
+++ b/ImageGallery/nbproject/project.properties
@@ -1,4 +1,3 @@
-file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar
file.reference.sqlite-jdbc-3.7.8-SNAPSHOT.jar=release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 56a606816f..b84b739696 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -24,8 +24,12 @@
<!-- Exclude the version of cxf-rt-rs-client from Tika 1.20, one of its depedencies breaks Ivy -->
<dependency conf="autopsy->*" org="org.apache.tika" name="tika-parsers" rev="1.20">
<exclude module="cxf-rt-rs-client"/>
+ <exclude module="cleartk-ml"/>
</dependency>
+ <dependency conf="autopsy->*" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.3.0"/>
+ <dependency conf="autopsy->*" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/>
+
<!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
<dependency conf="autopsy->*" org="com.ibm.icu" name="icu4j" rev="3.8"/>
<dependency conf="autopsy->*" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
@@ -41,9 +45,6 @@
<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"/>
- <!-- Travis is trying to pull down cleartk-ml-4.0.0 which doesn't exist.
- Overriding to 2.0.0 (latest version) works.-->
- <override org="org.cleartk" module="cleartk-ml" rev="2.0.0"/>
<override org="commons-io" module="commons-io" rev="2.3"/>
<override org="org.apache.httpcomponents" module="httpclient" rev="4.3.1"/>
<override org="org.apache.httpcomponents" module="httpcore" rev="4.3"/>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 36eec859c7..1adf8293ec 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -20,11 +20,9 @@ file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.j
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.3.1.jar
-file.reference.httpcore-4.3.jar=release\\modules\\ext\\httpcore-4.3.jar
-file.reference.httpcore-4.4.1.jar=release/modules/ext/httpcore-4.4.1.jar
-file.reference.httpmime-4.3.1.jar=release\\modules\\ext\\httpmime-4.3.1.jar
-file.reference.httpmime-4.4.1.jar=release/modules/ext/httpmime-4.4.1.jar
+file.reference.httpclient-4.3.1.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.httpmime-4.3.1.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.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
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 87e41f805b..88ce4efdb8 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -304,8 +304,8 @@
<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.3.1.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpclient-4.3.1.jar</binary-origin>
+ <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>
@@ -468,8 +468,8 @@
<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.7.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/httpcore-4.4.7.jar</binary-origin>
+ <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>
@@ -524,8 +524,8 @@
<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.3.1.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpmime-4.3.1.jar</binary-origin>
+ <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/jcip-annotations-1.0.jar</runtime-relative-path>
--
GitLab