Merge pull request #2088 from sleuthkit/6966_postgresql_jdbc

6966 postgresql jdbc upgrade

bindings/java/build-windows.xml

@@ -75,26 +75,9 @@
 		<copy file="${tsk.jni.32}" todir="${i686}/win" overwrite="true"/>
 	</target>
 
-	<target name="copyWinTskLibsToBuild-PostgreSQL" depends="copyWinTskLibs64ToBuild-PostgreSQL,copyWinTskLibs32ToBuild-PostgreSQL" description="Copy Windows DLLs to the correct location, PostgreSQL build." />
-
 	<target name="checkTskLibDirs">
 		<available property="win64.TskLib.exists" type="file" file="${basedir}/../../win32/x64/${tsk.config}/libtsk_jni.dll" />
 		<available property="win32.TskLib.exists" type="file" file="${basedir}/../../win32/${tsk.config}/libtsk_jni.dll" />
 	</target>
 
-	<target name="copyWinTskLibs64ToBuild-PostgreSQL" depends="checkTskLibDirs" if="win64.TskLib.exists">
-		<property name="tsk.jni.64" location="${basedir}/../../win32/x64/${tsk.config}/libtsk_jni.dll" />
-
-		<copy file="${tsk.jni.64}" todir="${amd64}/win" overwrite="true"/>
-		<copy file="${tsk.jni.64}" todir="${x86_64}/win" overwrite="true"/>
-	</target>
-
-	<target name="copyWinTskLibs32ToBuild-PostgreSQL" depends="checkTskLibDirs" if="win32.TskLib.exists">
-		<property name="tsk.jni.32" location="${basedir}/../../win32/${tsk.config}/libtsk_jni.dll" />
-
-		<copy file="${tsk.jni.32}" todir="${i386}/win" overwrite="true"/>
-		<copy file="${tsk.jni.32}" todir="${x86}/win" overwrite="true"/>
-		<copy file="${tsk.jni.32}" todir="${i586}/win" overwrite="true"/>
-		<copy file="${tsk.jni.32}" todir="${i686}/win" overwrite="true"/>
-	</target>
 </project>

bindings/java/ivy.xml

@@ -15,7 +15,7 @@
           debian/sleuthkit-java.install so that it gets packaged correctly on Linux -->
 		<dependency org="org.xerial" name="sqlite-jdbc" rev="3.25.2"/>
 
-		<dependency org="org.postgresql" name="postgresql" rev="9.4.1211.jre7" >
+		<dependency org="org.postgresql" name="postgresql" rev="42.2.18" >
 			<artifact name="postgresql" type="jar" />
 		</dependency>
 		<dependency org="com.mchange" name="c3p0" rev="0.9.5" />

bindings/java/nbproject/project.xml

@@ -114,7 +114,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">lib;lib/diffutils-1.2.1.jar;lib/junit-4.8.2.jar;lib/postgresql-9.4-1201.jdbc41.jar;lib/c3p0-0.9.5.jar;lib/mchange-commons-java-0.2.9.jar;lib/c3p0-0.9.5-sources.jar;lib/c3p0-0.9.5-javadoc.jar;lib/joda-time-2.4.jar;lib/commons-lang3-3.0.jar;lib/guava-19.0.jar;lib/SparseBitSet-1.1.jar;lib/gson-2.8.5.jar;lib/commons-validator-1.6.jar</classpath>
+                <classpath mode="compile">lib;lib/diffutils-1.2.1.jar;lib/junit-4.8.2.jar;lib/postgresql-42.2.18.jar;lib/c3p0-0.9.5.jar;lib/mchange-commons-java-0.2.9.jar;lib/c3p0-0.9.5-sources.jar;lib/c3p0-0.9.5-javadoc.jar;lib/joda-time-2.4.jar;lib/commons-lang3-3.0.jar;lib/guava-19.0.jar;lib/SparseBitSet-1.1.jar;lib/gson-2.8.5.jar;lib/commons-validator-1.6.jar</classpath>
                 <built-to>build</built-to>
                 <source-level>1.8</source-level>
             </compilation-unit>