mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempting to make travis build. Also fixed the mistake with the gson conflict resolution

Browse Source
This commit is contained in:
U-BASIS\dsmyda 2019-04-02 12:10:00 -04:00
parent 926d017370
commit 5eb96d1e72
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CoreLibs/nbproject/project.xml
View File

@ -953,8 +953,8 @@
<binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/gson-2.8.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/gson-2.8.1.jar</binary-origin>
<runtime-relative-path>ext/gson-2.8.5.jar</runtime-relative-path>
<binary-origin>release/modules/ext/gson-2.8.5.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>

6
KeywordSearch/ivy.xml
View File

@ -41,9 +41,9 @@
<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"/>
<!-- 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"/>
<!-- 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"/>