From 822e184bccd5ade12b1885c4c84ab73247cd6a4d Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 23 Mar 2022 21:21:20 -0400
Subject: [PATCH] updated c3p0
---
bindings/java/ivy.xml | 6 ++++--
bindings/java/nbproject/project.xml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/bindings/java/ivy.xml b/bindings/java/ivy.xml
index 67518a656..f97b0c9e3 100644
--- a/bindings/java/ivy.xml
+++ b/bindings/java/ivy.xml
@@ -2,7 +2,7 @@
<info organisation="org.sleuthkit" module="datamodel"/>
<dependencies>
<dependency org="joda-time" name="joda-time" rev="2.4" />
- <dependency org="com.google.guava" name="guava" rev="19.0"/>
+ <dependency org="com.google.guava" name="guava" rev="31.0.1-jre"/>
<dependency org="org.apache.commons" name="commons-lang3" rev="3.0"/>
<dependency org="commons-validator" name="commons-validator" rev="1.6"/>
@@ -18,7 +18,9 @@
<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" />
+ <dependency conf="default" org="com.mchange" name="c3p0" rev="0.9.5.5" />
+ <dependency conf="default" org="com.mchange" name="mchange-commons-java" rev="0.2.20"/>
+
<dependency org="com.zaxxer" name="SparseBitSet" rev="1.1" />
</dependencies>
</ivy-module>
diff --git a/bindings/java/nbproject/project.xml b/bindings/java/nbproject/project.xml
index 2b34d8ff4..ceb209aa3 100755
--- a/bindings/java/nbproject/project.xml
+++ b/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.12.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>
+ <classpath mode="compile">lib;lib/diffutils-1.2.1.jar;lib/junit-4.12.jar;lib/postgresql-42.2.18.jar;lib/c3p0-0.9.5.5.jar;lib/mchange-commons-java-0.2.20.jar;lib/joda-time-2.4.jar;lib/commons-lang3-3.0.jar;lib/guava-31.0.1-jre.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>
--
GitLab