diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 017c3fbf7a6966a4000e73c6583bd0af82855c42..dda711f544756a12ab574ce2cc809381da9163b0 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -1,11 +1,52 @@
-<ivy-module version="2.0">
+<!DOCTYPE ivy-module [
+ <!ENTITY javafx.version "17.0.7">
+]>
+<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
<info organisation="org.sleuthkit.autopsy" module="corelibs"/>
<configurations >
<!-- module dependencies -->
<conf name="autopsy_core"/>
</configurations>
- <dependencies>
+ <dependencies>
+ <!-- <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-fxml" rev="&javafx.version;"/>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-graphics" rev="&javafx.version;"/>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-controls" rev="&javafx.version;"/>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-base" rev="&javafx.version;"/>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-swing" rev="&javafx.version;"/>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-web" rev="&javafx.version;"/>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-media" rev="&javafx.version;"/> -->
+
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-fxml" rev="&javafx.version;">
+ <artifact name="javafx-fxml" type="jar" />
+ <artifact name="javafx-fxml" type="jar" e:classifier="win"/>
+ </dependency>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-graphics" rev="&javafx.version;">
+ <artifact name="javafx-graphics" type="jar" />
+ <artifact name="javafx-graphics" type="jar" e:classifier="win"/>
+ </dependency>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-controls" rev="&javafx.version;">
+ <artifact name="javafx-controls" type="jar" />
+ <artifact name="javafx-controls" type="jar" e:classifier="win"/>
+ </dependency>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-base" rev="&javafx.version;">
+ <artifact name="javafx-base" type="jar" />
+ <artifact name="javafx-base" type="jar" e:classifier="win"/>
+ </dependency>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-swing" rev="&javafx.version;" >
+ <artifact name="javafx-swing" type="jar" />
+ <artifact name="javafx-swing" type="jar" e:classifier="win"/>
+ </dependency>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-web" rev="&javafx.version;" >
+ <artifact name="javafx-web" type="jar" />
+ <artifact name="javafx-web" type="jar" e:classifier="win"/>
+ </dependency>
+ <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-media" rev="&javafx.version;">
+ <artifact name="javafx-media" type="jar" />
+ <artifact name="javafx-media" type="jar" e:classifier="win"/>
+ </dependency>
+
+
<dependency conf="autopsy_core->default" org="org.apache.ant" name="ant-launcher" rev="1.10.12"/>
<dependency conf="autopsy_core->default" org="org.apache.ant" name="ant" rev="1.10.12"/>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 6a6ace636185734995875aea2031f79c7dce7d75..893842a47801f34897d8c9a18ff4cbc1c0c0902f 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -60,7 +60,7 @@ file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar
file.reference.grpc-xds-1.44.1.jar=release/modules/ext/grpc-xds-1.44.1.jar
file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar
file.reference.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar
-file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar
+file.reference.guava-31.1.jar=release/modules/ext/guava-31.1.jar
file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar
file.reference.httpcore-4.4.15.jar=release/modules/ext/httpcore-4.4.15.jar
file.reference.imageio-bmp-3.8.2.jar=release/modules/ext/imageio-bmp-3.8.2.jar
@@ -83,6 +83,20 @@ file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annota
file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar
file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar
file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar
+file.reference.javafx-base-17.0.7-win.jar=release/modules/ext/javafx-base-17.0.7-win.jar
+file.reference.javafx-base-17.0.7.jar=release/modules/ext/javafx-base-17.0.7.jar
+file.reference.javafx-controls-17.0.7-win.jar=release/modules/ext/javafx-controls-17.0.7-win.jar
+file.reference.javafx-controls-17.0.7.jar=release/modules/ext/javafx-controls-17.0.7.jar
+file.reference.javafx-fxml-17.0.7-win.jar=release/modules/ext/javafx-fxml-17.0.7-win.jar
+file.reference.javafx-fxml-17.0.7.jar=release/modules/ext/javafx-fxml-17.0.7.jar
+file.reference.javafx-graphics-17.0.7-win.jar=release/modules/ext/javafx-graphics-17.0.7-win.jar
+file.reference.javafx-graphics-17.0.7.jar=release/modules/ext/javafx-graphics-17.0.7.jar
+file.reference.javafx-media-17.0.7-win.jar=release/modules/ext/javafx-media-17.0.7-win.jar
+file.reference.javafx-media-17.0.7.jar=release/modules/ext/javafx-media-17.0.7.jar
+file.reference.javafx-swing-17.0.7-win.jar=release/modules/ext/javafx-swing-17.0.7-win.jar
+file.reference.javafx-swing-17.0.7.jar=release/modules/ext/javafx-swing-17.0.7.jar
+file.reference.javafx-web-17.0.7-win.jar=release/modules/ext/javafx-web-17.0.7-win.jar
+file.reference.javafx-web-17.0.7.jar=release/modules/ext/javafx-web-17.0.7.jar
file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar
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
@@ -93,7 +107,7 @@ file.reference.jna-platform-5.13.0.jar=release/modules/ext/jna-platform-5.13.0.j
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
-file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+file.reference.listenablefuture-9999.0.jar=release/modules/ext/listenablefuture-9999.0.jar
file.reference.log4j-api-2.17.2.jar=release/modules/ext/log4j-api-2.17.2.jar
file.reference.log4j-core-2.17.2.jar=release/modules/ext/log4j-core-2.17.2.jar
file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 39c4e8786ba93a673864c1bae4e84fa793d2c4f5..1794db756ba29b06049acb7baf574c68d55a0163 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -246,6 +246,44 @@
<package>javax.annotation</package>
<package>javax.annotation.concurrent</package>
<package>javax.annotation.meta</package>
+ <package>javafx.animation</package>
+ <package>javafx.application</package>
+ <package>javafx.base</package>
+ <package>javafx.beans</package>
+ <package>javafx.beans.binding</package>
+ <package>javafx.beans.property</package>
+ <package>javafx.beans.property.adapter</package>
+ <package>javafx.beans.value</package>
+ <package>javafx.collections</package>
+ <package>javafx.collections.transformation</package>
+ <package>javafx.concurrent</package>
+ <package>javafx.css</package>
+ <package>javafx.css.converter</package>
+ <package>javafx.embed.swing </package>
+ <package>javafx.event</package>
+ <package>javafx.fxml </package>
+ <package>javafx.geometry</package>
+ <package>javafx.graphics</package>
+ <package>javafx.print</package>
+ <package>javafx.scene</package>
+ <package>javafx.scene.canvas</package>
+ <package>javafx.scene.chart</package>
+ <package>javafx.scene.control</package>
+ <package>javafx.scene.control.cell</package>
+ <package>javafx.scene.control.skin</package>
+ <package>javafx.scene.effect</package>
+ <package>javafx.scene.image</package>
+ <package>javafx.scene.input</package>
+ <package>javafx.scene.layout</package>
+ <package>javafx.scene.paint</package>
+ <package>javafx.scene.robot</package>
+ <package>javafx.scene.shape</package>
+ <package>javafx.scene.text</package>
+ <package>javafx.scene.transform</package>
+ <package>javafx.scene.web </package>
+ <package>javafx.stage</package>
+ <package>javafx.util</package>
+ <package>javafx.util.converter</package>
<package>javax.jms</package>
<package>javax.mail</package>
<package>javax.mail.event</package>
@@ -471,7 +509,7 @@
<package>org.slf4j.helpers</package>
<package>org.slf4j.spi</package>
</public-packages>
- <class-path-extension>
+ <class-path-extension>
<runtime-relative-path>ext/animal-sniffer-annotations-1.21.jar</runtime-relative-path>
<binary-origin>release/modules/ext/animal-sniffer-annotations-1.21.jar</binary-origin>
</class-path-extension>
@@ -720,8 +758,8 @@
<binary-origin>release/modules/ext/gst1-java-core-1.4.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/guava-31.1-jre.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin>
+ <runtime-relative-path>ext/guava-31.1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/guava-31.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
@@ -811,6 +849,62 @@
<runtime-relative-path>ext/jackson-dataformat-csv-2.13.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jackson-dataformat-csv-2.13.2.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-base-17.0.7-win.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-base-17.0.7-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-base-17.0.7.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-base-17.0.7.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-controls-17.0.7-win.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-controls-17.0.7-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-controls-17.0.7.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-controls-17.0.7.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-fxml-17.0.7-win.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-fxml-17.0.7-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-fxml-17.0.7.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-fxml-17.0.7.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-graphics-17.0.7-win.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-graphics-17.0.7-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-graphics-17.0.7.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-graphics-17.0.7.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-media-17.0.7-win.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-media-17.0.7-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-media-17.0.7.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-media-17.0.7.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-swing-17.0.7-win.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-swing-17.0.7-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-swing-17.0.7.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-swing-17.0.7.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-web-17.0.7-win.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-web-17.0.7-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-web-17.0.7.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/javafx-web-17.0.7.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javax.annotation-api-1.3.2.jar</binary-origin>
@@ -852,8 +946,8 @@
<binary-origin>release/modules/ext/LGoodDatePicker-11.2.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</binary-origin>
+ <runtime-relative-path>ext/listenablefuture-9999.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/listenablefuture-9999.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/log4j-api-2.17.2.jar</runtime-relative-path>