From 24c81a822bad4bcd2c25c43e559725592ecc57e7 Mon Sep 17 00:00:00 2001
From: Mark McKinnon <Mark.McKinnon13@outlook.com>
Date: Wed, 3 Jan 2024 10:40:54 -0500
Subject: [PATCH] Revert "Revert "Merge branch 'develop' of
 https://github.com/markmckinnon/autopsy into develop""

This reverts commit 82ef6a41d378d3028ec3da8621c8ab08cda53ca7.
---
 CoreLibs/ivy.xml                      | 2 +-
 CoreLibs/nbproject/project.properties | 4 ++--
 CoreLibs/nbproject/project.xml        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index d60ce17600..3566041703 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -62,7 +62,7 @@
 
         <!-- for viewers -->
         <dependency conf="autopsy_core->default" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.4.0"/>
-        <dependency conf="autopsy_core->default" org="net.java.dev.jna" name="jna-platform" rev="5.13.0"/>
+        <dependency conf="autopsy_core->default" org="net.java.dev.jna" name="jna-platform" rev="5.14.0"/>
         
         <!-- for file search -->
         <dependency conf="autopsy_core->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="11.2.1"/>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 320a1e36e5..9bd3153105 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -118,8 +118,8 @@ file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar
 file.reference.jfxtras-common-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar
 file.reference.jfxtras-controls-17-r1.jar=release/modules/ext/jfxtras-controls-17-r1.jar
 file.reference.jfxtras-fxml-17-r1.jar=release/modules/ext/jfxtras-fxml-17-r1.jar
-file.reference.jna-5.13.0.jar=release/modules/ext/jna-5.13.0.jar
-file.reference.jna-platform-5.13.0.jar=release/modules/ext/jna-platform-5.13.0.jar
+file.reference.jna-5.14.0.jar=release/modules/ext/jna-5.14.0.jar
+file.reference.jna-platform-5.14.0.jar=release/modules/ext/jna-platform-5.14.0.jar
 file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar
 file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
 file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index ff5e70f4e8..49cdfcd0c1 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -1041,12 +1041,12 @@
                 <binary-origin>release/modules/ext/jfxtras-fxml-17-r1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-5.13.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-5.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-5.14.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jna-5.14.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-platform-5.13.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-platform-5.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-platform-5.14.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jna-platform-5.14.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/joda-time-2.10.14.jar</runtime-relative-path>