From eb4bb14be29ceca90a2ec5f70cf799b54577aa2a Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Thu, 15 Oct 2020 08:19:54 -0400
Subject: [PATCH] can build; now resolving classpath conflicts

---
 Core/ivy.xml                                                  | 3 +++
 Core/nbproject/project.xml                                    | 4 ++++
 .../sleuthkit/autopsy/integrationtesting/MainTestRunner.java  | 1 -
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index 92be3f86e6..a1118e0f61 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -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"/> 
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 39de996983..68aec2e8ee 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -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>
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java
index e06441c6ae..dfd5db8fcc 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java
@@ -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;