From e2f9dfaaceae5ad0683c93bf3002ffea799f9a88 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dgrove" <dgrove@WIN-DGROV-4999.basistech.net>
Date: Mon, 22 Oct 2018 15:18:23 -0400
Subject: [PATCH] Upgraded Jackcess for Autopsy-Core.

---
 Core/ivy.xml                      | 2 ++
 Core/nbproject/project.properties | 4 ++--
 Core/nbproject/project.xml        | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index f20453a141..cbe45d8c33 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -23,6 +23,8 @@
         <dependency conf="core->default" org="com.adobe.xmp" name="xmpcore" rev="5.1.2"/>
         <dependency conf="core->default" org="org.apache.zookeeper" name="zookeeper" rev="3.4.6"/>
 
+        <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess" rev="2.2.0"/>
+        <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="2.1.4"/>
         
         <dependency conf="core->default" org="org.apache.commons" name="commons-dbcp2" rev="2.1.1"/>
         <dependency conf="core->default" org="org.apache.commons" name="commons-pool2" rev="2.4.2"/>
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 1b0a695edd..1e73b82e21 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -18,8 +18,8 @@ file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
 file.reference.sqlite-jdbc-3.8.11.jar=release\\modules\\ext\\sqlite-jdbc-3.8.11.jar
 file.reference.StixLib.jar=release/modules/ext/StixLib.jar
 file.reference.bcprov-jdk15on-1.54.jar=release/modules/ext/bcprov-jdk15on-1.54.jar
-file.reference.jackcess-2.1.8.jar=release/modules/ext/jackcess-2.1.8.jar
-file.reference.jackcess-encrypt-2.1.2.jar=release/modules/ext/jackcess-encrypt-2.1.2.jar
+file.reference.jackcess-2.2.0.jar=release/modules/ext/jackcess-2.2.0.jar
+file.reference.jackcess-encrypt-2.1.4.jar=release/modules/ext/jackcess-encrypt-2.1.4.jar
 file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar
 file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0.1.jar
 file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index d142e0b8c9..5b97c2c6fa 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -342,8 +342,8 @@
                 <package>org.sleuthkit.datamodel</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jackcess-2.1.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackcess-2.1.8.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-2.2.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-2.2.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/zookeeper-3.4.6.jar</runtime-relative-path>
@@ -482,8 +482,8 @@
                 <binary-origin>release\modules\ext\commons-pool2-2.4.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackcess-encrypt-2.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackcess-encrypt-2.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-encrypt-2.1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-encrypt-2.1.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsoup-1.10.3.jar</runtime-relative-path>