codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-29 22:09:52 +00:00
Code Issues Releases Wiki Activity

can build; now resolving classpath conflicts

Browse Source
This commit is contained in:
Greg DiCristofaro
2020-10-15 08:19:54 -04:00
parent b74da4f342
commit eb4bb14be2
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/ivy.xml
+3
View File
@@ -42,6 +42,9 @@
<dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/>
<dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.0.19"/>
<!-- for yaml reading/writing -->
<dependency org="org.yaml" name="snakeyaml" rev="1.27"/>
<!-- map support for geolocation -->
<dependency conf="core->default" org="org.jxmapviewer" name="jxmapviewer2" rev="2.4"/>
Core/nbproject/project.xml
+4
View File
@@ -818,6 +818,10 @@
<class-path-extension>
<runtime-relative-path>ext/grpc-netty-shaded-1.19.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\grpc-netty-shaded-1.19.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/snakeyaml-1.27.jar</runtime-relative-path>
<binary-origin>release\modules\ext\snakeyaml-1.27.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java
-1
View File
@@ -26,7 +26,6 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import org.sleuthkit.autopsy.integrationtesting.config.IntegrationTestConfig;
import java.lang.reflect.Method;
import java.nio.file.Path;
import java.nio.file.Paths;