From 049e250756993ab1face1be7f07f0a5d2bf18ddb Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Tue, 21 Apr 2020 13:01:23 -0400
Subject: [PATCH] Removed postgres build version

---
 Core/build.xml                              |  6 ++----
 Core/nbproject/project.properties           |  2 +-
 Core/nbproject/project.xml                  |  4 ++--
 release_scripts/update_sleuthkit_version.pl | 12 ++++++------
 unix_setup.sh                               |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Core/build.xml b/Core/build.xml
index 5d91ade7e1..2f06ed237e 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -91,12 +91,10 @@
     
     <target name="getTSKJars" depends="findTSK">
         <property environment="env"/>
-        <copy file="${env.TSK_HOME}/bindings/java/dist/sleuthkit-postgresql-${TSK_VERSION}.jar" 
-              tofile="${ext.dir}/sleuthkit-postgresql-${TSK_VERSION}.jar"/>
+        <copy file="${env.TSK_HOME}/bindings/java/dist/sleuthkit-${TSK_VERSION}.jar" 
+              tofile="${ext.dir}/sleuthkit-${TSK_VERSION}.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.25.2.jar"
               tofile="${ext.dir}/sqlite-jdbc-3.25.2.jar"/>
-        <copy file="${env.TSK_HOME}/bindings/java/lib/postgresql-9.4.1211.jre7.jar" 
-              tofile="${ext.dir}/postgresql-9.4.1211.jre7.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/mchange-commons-java-0.2.9.jar"
               tofile="${ext.dir}/mchange-commons-java-0.2.9.jar"/>
         <copy file="${env.TSK_HOME}/bindings/java/lib/c3p0-0.9.5.jar"
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 22af0f87c8..233c71c3d5 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -78,7 +78,7 @@ file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0
 file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar
 file.reference.cxf-rt-frontend-jaxrs-3.0.16.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar
 file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-transports-http-3.0.16.jar
-file.reference.sleuthkit-postgresql-4.9.0.jar=release/modules/ext/sleuthkit-postgresql-4.9.0.jar
+file.reference.sleuthkit-4.9.0.jar=release/modules/ext/sleuthkit-4.9.0.jar
 file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar
 file.reference.curator-framework-2.8.0.jar=release/modules/ext/curator-framework-2.8.0.jar
 file.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 79c518eeaa..ff3edc46aa 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -536,8 +536,8 @@
                 <binary-origin>release/modules/ext/google-http-client-1.29.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sleuthkit-postgresql-4.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sleuthkit-postgresql-4.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/sleuthkit-4.9.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-4.9.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/bcpkix-jdk15on-1.60.jar</runtime-relative-path>
diff --git a/release_scripts/update_sleuthkit_version.pl b/release_scripts/update_sleuthkit_version.pl
index 89b0c42de5..26d8be5073 100755
--- a/release_scripts/update_sleuthkit_version.pl
+++ b/release_scripts/update_sleuthkit_version.pl
@@ -131,8 +131,8 @@ sub update_core_project_properties {
 
     my $found = 0;
     while (<CONF_IN>) {
-        if (/^file\.reference\.sleuthkit\-postgresql-/) {
-            print CONF_OUT "file.reference.sleuthkit-postgresql-${VER}.jar=release/modules/ext/sleuthkit-postgresql-${VER}.jar\n";
+        if (/^file\.reference\.sleuthkit\-/) {
+            print CONF_OUT "file.reference.sleuthkit-${VER}.jar=release/modules/ext/sleuthkit-${VER}.jar\n";
             $found++;
         }
             
@@ -167,12 +167,12 @@ sub update_core_project_xml {
 
     my $found = 0;
     while (<CONF_IN>) {
-        if (/<runtime-relative-path>ext\/sleuthkit-postgresql/) {
-            print CONF_OUT "                <runtime-relative-path>ext/sleuthkit-postgresql-${VER}.jar</runtime-relative-path>\n";
+        if (/<runtime-relative-path>ext\/sleuthkit-/) {
+            print CONF_OUT "                <runtime-relative-path>ext/sleuthkit-${VER}.jar</runtime-relative-path>\n";
             $found++;
         }
-        elsif (/<binary-origin>release\/modules\/ext\/sleuthkit-postgresql/) {
-            print CONF_OUT "                <binary-origin>release/modules/ext/sleuthkit-postgresql-${VER}.jar</binary-origin>\n";
+        elsif (/<binary-origin>release\/modules\/ext\/sleuthkit-/) {
+            print CONF_OUT "                <binary-origin>release/modules/ext/sleuthkit-${VER}.jar</binary-origin>\n";
             $found++;
         }    
         else {
diff --git a/unix_setup.sh b/unix_setup.sh
index dc92f38236..2a75ab72c7 100644
--- a/unix_setup.sh
+++ b/unix_setup.sh
@@ -55,7 +55,7 @@ else
     exit 1
 fi
 
-ext_jar_filepath=$PWD/autopsy/modules/ext/sleuthkit-postgresql-$TSK_VERSION.jar;
+ext_jar_filepath=$PWD/autopsy/modules/ext/sleuthkit-$TSK_VERSION.jar;
 echo -n "Copying sleuthkit-$TSK_VERSION.jar into the Autopsy directory..."
 rm -f $ext_jar_filepath;
 if [ "$?" -gt 0 ]; then  #checking if remove operation failed