diff --git a/Core/build.xml b/Core/build.xml
index a18745b086..1834bb976d 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -108,8 +108,6 @@
         <copy todir="${ext.dir}">
             <fileset dir="${thirdparty.dir}/jai/"/> 
         </copy>
-        <copy file="${thirdparty.dir}/jdom/jdom-2.0.5.jar" todir="${ext.dir}" />
-        <copy file="${thirdparty.dir}/jdom/jdom-2.0.5-contrib.jar" todir="${ext.dir}" />
 		<copy file="${thirdparty.dir}/DatCon/3.6.9/DatCon.jar" todir="${ext.dir}" />
         <!--Copy YARA to release-->
         <copy todir="${basedir}/release/yara" >
diff --git a/Core/ivy.xml b/Core/ivy.xml
index d0eb39b50c..148351912a 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -69,6 +69,8 @@
 
         <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
         <dependency conf="core->default" org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1.1"/>
+        <dependency org="org.jdom" name="jdom2" rev="2.0.6.1"/>
+
 
         <!-- annotations like guarded by -->
         <dependency conf="core->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
@@ -82,12 +84,27 @@
             <exclude name="jna-platform" />
         </dependency>
 
+        <dependency conf="core->default" org="org.bouncycastle" name="bcprov-jdk18on" rev="${bouncycastle.version}"/>
+        <dependency conf="core->default" org="org.bouncycastle" name="bcpkix-jdk18on" rev="${bouncycastle.version}"/>
+
+        <exclude org="org.bouncycastle" module="bcprov-jdk15on"/>
+        <exclude org="org.bouncycastle" module="bcprov-ext-jdk15on"/>
         <exclude org="org.bouncycastle" module="bcpkix-jdk15on"/>
+        
         <exclude org="*" ext="*" type="javadoc"/>
 
+
+        <override org="xalan" module="xalan" rev="2.7.3"/>
+        <override org="xerces" module="xercesImpl" rev="2.12.2"/>
+        <override org="org.bouncycastle" module="bcprov-jdk18on" rev="${bouncycastle.version}"/>
+        <override org="org.bouncycastle" module="bcpkix-jdk18on" rev="${bouncycastle.version}"/>
         <override org="commons-io" module="commons-io" rev="2.18.0"/>
         <override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
-        <override org="io.netty" module="netty-transport" rev="4.1.116.Final"/>
+        <override org="io.netty" module="netty-transport" rev="${netty.version}"/>
+        <override org="io.netty" module="netty-transport-native-epoll" rev="${netty.version}"/>
+        <override org="io.netty" module="netty-transport-classes-epoll" rev="${netty.version}"/>
+        <override org="io.netty" module="netty-common" rev="${netty.version}"/>
+        <override org="io.netty" module="netty-tcnative-boringssl-static" rev="2.0.69.Final"/>
 
         <override org="junit" module="junit" rev="4.13.2"/>
     </dependencies>
diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml
index 96578e6c40..d1102eaa63 100644
--- a/Core/ivysettings.xml
+++ b/Core/ivysettings.xml
@@ -2,6 +2,8 @@
   <property name="httpcomponents.version" value="4.5.14"/>
   <property name="curator.version" value="5.7.1"/>
   <property name="batik.version" value="1.18"/>
+  <property name="bouncycastle.version" value="1.79"/>
+  <property name="netty.version" value="4.1.116.Final"/>
 
   <settings defaultResolver="main"/>
   <resolvers>
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index c59b4438b9..7408b5fb45 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,5 +1,11 @@
+#Wed Jan 08 19:35:29 UTC 2025
+file.reference.DatCon.jar=release/modules/ext/DatCon.jar
+file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar
+file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar
+file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar
 file.reference.activemq-all-6.1.4.jar=release/modules/ext/activemq-all-6.1.4.jar
 file.reference.angus-activation-2.0.2.jar=release/modules/ext/angus-activation-2.0.2.jar
+file.reference.annotations-13.0.jar=release/modules/ext/annotations-13.0.jar
 file.reference.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar
 file.reference.batik-awt-util-1.18.jar=release/modules/ext/batik-awt-util-1.18.jar
 file.reference.batik-constants-1.18.jar=release/modules/ext/batik-constants-1.18.jar
@@ -13,26 +19,24 @@ file.reference.batik-svg-dom-1.18.jar=release/modules/ext/batik-svg-dom-1.18.jar
 file.reference.batik-svggen-1.18.jar=release/modules/ext/batik-svggen-1.18.jar
 file.reference.batik-util-1.18.jar=release/modules/ext/batik-util-1.18.jar
 file.reference.batik-xml-1.18.jar=release/modules/ext/batik-xml-1.18.jar
-file.reference.bcpkix-jdk15on-1.54.jar=release/modules/ext/bcpkix-jdk15on-1.54.jar
-file.reference.bcprov-ext-jdk15on-1.54.jar=release/modules/ext/bcprov-ext-jdk15on-1.54.jar
-file.reference.bcprov-jdk15on-1.54.jar=release/modules/ext/bcprov-jdk15on-1.54.jar
-file.reference.bcprov-jdk18on-1.72.jar=release/modules/ext/bcprov-jdk18on-1.72.jar
+file.reference.bcpkix-jdk18on-1.79.jar=release/modules/ext/bcpkix-jdk18on-1.79.jar
+file.reference.bcprov-jdk18on-1.79.jar=release/modules/ext/bcprov-jdk18on-1.79.jar
+file.reference.bcutil-jdk18on-1.79.jar=release/modules/ext/bcutil-jdk18on-1.79.jar
 file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar
-file.reference.checker-qual-3.33.0.jar=release/modules/ext/checker-qual-3.33.0.jar
+file.reference.checker-qual-3.43.0.jar=release/modules/ext/checker-qual-3.43.0.jar
 file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar
 file.reference.commons-dbcp2-2.13.0.jar=release/modules/ext/commons-dbcp2-2.13.0.jar
-file.reference.commons-io-2.17.0.jar=release/modules/ext/commons-io-2.17.0.jar
+file.reference.commons-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar
 file.reference.commons-lang3-3.10.jar=release/modules/ext/commons-lang3-3.10.jar
 file.reference.commons-logging-1.3.4.jar=release/modules/ext/commons-logging-1.3.4.jar
 file.reference.commons-pool2-2.12.0.jar=release/modules/ext/commons-pool2-2.12.0.jar
 file.reference.curator-client-5.7.1.jar=release/modules/ext/curator-client-5.7.1.jar
 file.reference.curator-framework-5.7.1.jar=release/modules/ext/curator-framework-5.7.1.jar
 file.reference.curator-recipes-5.7.1.jar=release/modules/ext/curator-recipes-5.7.1.jar
-file.reference.DatCon.jar=release/modules/ext/DatCon.jar
 file.reference.decodetect-core-0.3.jar=release/modules/ext/decodetect-core-0.3.jar
-file.reference.error_prone_annotations-2.18.0.jar=release/modules/ext/error_prone_annotations-2.18.0.jar
+file.reference.error_prone_annotations-2.36.0.jar=release/modules/ext/error_prone_annotations-2.36.0.jar
 file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar
-file.reference.guava-32.0.0-jre.jar=release/modules/ext/guava-32.0.0-jre.jar
+file.reference.guava-33.4.0-jre.jar=release/modules/ext/guava-33.4.0-jre.jar
 file.reference.httpclient-4.5.14.jar=release/modules/ext/httpclient-4.5.14.jar
 file.reference.httpclient-win-4.5.14.jar=release/modules/ext/httpclient-win-4.5.14.jar
 file.reference.httpcore-4.4.16.jar=release/modules/ext/httpcore-4.4.16.jar
@@ -40,14 +44,13 @@ file.reference.httpmime-4.5.14.jar=release/modules/ext/httpmime-4.5.14.jar
 file.reference.icepdf-core-6.2.2.jar=release/modules/ext/icepdf-core-6.2.2.jar
 file.reference.icepdf-viewer-6.2.2.jar=release/modules/ext/icepdf-viewer-6.2.2.jar
 file.reference.istack-commons-runtime-4.1.2.jar=release/modules/ext/istack-commons-runtime-4.1.2.jar
-file.reference.j2objc-annotations-2.8.jar=release/modules/ext/j2objc-annotations-2.8.jar
+file.reference.j2objc-annotations-3.0.0.jar=release/modules/ext/j2objc-annotations-3.0.0.jar
 file.reference.jackcess-4.0.7.jar=release/modules/ext/jackcess-4.0.7.jar
 file.reference.jackcess-encrypt-4.0.2.jar=release/modules/ext/jackcess-encrypt-4.0.2.jar
 file.reference.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar
 file.reference.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar
 file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar
 file.reference.jakarta.annotation-api-2.1.1.jar=release/modules/ext/jakarta.annotation-api-2.1.1.jar
-file.reference.jakarta.jms-api-3.1.0-javadoc.jar=release/modules/ext/jakarta.jms-api-3.1.0-javadoc.jar
 file.reference.jakarta.jms-api-3.1.0-sources.jar=release/modules/ext/jakarta.jms-api-3.1.0-sources.jar
 file.reference.jakarta.jms-api-3.1.0.jar=release/modules/ext/jakarta.jms-api-3.1.0.jar
 file.reference.jakarta.transaction-api-1.3.3.jar=release/modules/ext/jakarta.transaction-api-1.3.3.jar
@@ -58,8 +61,9 @@ file.reference.javax.ws.rs-api-2.1.1.jar=release/modules/ext/javax.ws.rs-api-2.1
 file.reference.jaxb-api-2.3.1.jar=release/modules/ext/jaxb-api-2.3.1.jar
 file.reference.jaxb-core-4.0.5.jar=release/modules/ext/jaxb-core-4.0.5.jar
 file.reference.jaxb-runtime-4.0.5.jar=release/modules/ext/jaxb-runtime-4.0.5.jar
-file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar
-file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar
+file.reference.jaxen-1.2.0.jar=release/modules/ext/jaxen-1.2.0.jar
+file.reference.jdom2-2.0.6.1-sources.jar=release/modules/ext/jdom2-2.0.6.1-sources.jar
+file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar
 file.reference.jfreechart-1.5.5.jar=release/modules/ext/jfreechart-1.5.5.jar
 file.reference.jgraphx-4.2.2.jar=release/modules/ext/jgraphx-4.2.2.jar
 file.reference.jsoup-1.18.3.jar=release/modules/ext/jsoup-1.18.3.jar
@@ -67,6 +71,10 @@ file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
 file.reference.jutf7-1.0.0.jar=release/modules/ext/jutf7-1.0.0.jar
 file.reference.jxmapviewer2-2.8.jar=release/modules/ext/jxmapviewer2-2.8.jar
 file.reference.jython-standalone-2.7.4.jar=release/modules/ext/jython-standalone-2.7.4.jar
+file.reference.kotlin-stdlib-1.8.21.jar=release/modules/ext/kotlin-stdlib-1.8.21.jar
+file.reference.kotlin-stdlib-common-1.9.10.jar=release/modules/ext/kotlin-stdlib-common-1.9.10.jar
+file.reference.kotlin-stdlib-jdk7-1.8.21.jar=release/modules/ext/kotlin-stdlib-jdk7-1.8.21.jar
+file.reference.kotlin-stdlib-jdk8-1.8.21.jar=release/modules/ext/kotlin-stdlib-jdk8-1.8.21.jar
 file.reference.libphonenumber-8.13.52.jar=release/modules/ext/libphonenumber-8.13.52.jar
 file.reference.license4j-runtime-library-4.7.3.jar=release/modules/ext/license4j-runtime-library-4.7.3.jar
 file.reference.listenablefuture-1.0.jar=release/modules/ext/listenablefuture-1.0.jar
@@ -74,40 +82,40 @@ file.reference.mchange-commons-java-0.3.0.jar=release/modules/ext/mchange-common
 file.reference.metadata-extractor-2.19.0.jar=release/modules/ext/metadata-extractor-2.19.0.jar
 file.reference.netty-buffer-4.1.113.Final.jar=release/modules/ext/netty-buffer-4.1.113.Final.jar
 file.reference.netty-codec-4.1.113.Final.jar=release/modules/ext/netty-codec-4.1.113.Final.jar
-file.reference.netty-common-4.1.113.Final.jar=release/modules/ext/netty-common-4.1.113.Final.jar
+file.reference.netty-common-4.1.116.Final.jar=release/modules/ext/netty-common-4.1.116.Final.jar
 file.reference.netty-handler-4.1.113.Final.jar=release/modules/ext/netty-handler-4.1.113.Final.jar
 file.reference.netty-resolver-4.1.113.Final.jar=release/modules/ext/netty-resolver-4.1.113.Final.jar
-file.reference.netty-tcnative-boringssl-static-2.0.66.Final.jar=release/modules/ext/netty-tcnative-boringssl-static-2.0.66.Final.jar
+file.reference.netty-tcnative-boringssl-static-2.0.69.Final.jar=release/modules/ext/netty-tcnative-boringssl-static-2.0.69.Final.jar
 file.reference.netty-tcnative-classes-2.0.66.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar
-file.reference.netty-transport-4.1.113.Final.jar=release/modules/ext/netty-transport-4.1.113.Final.jar
-file.reference.netty-transport-classes-epoll-4.1.113.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.113.Final.jar
-file.reference.netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar=release/modules/ext/netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar
+file.reference.netty-transport-4.1.116.Final.jar=release/modules/ext/netty-transport-4.1.116.Final.jar
+file.reference.netty-transport-classes-epoll-4.1.116.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar
+file.reference.netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar=release/modules/ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar
 file.reference.netty-transport-native-unix-common-4.1.113.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.113.Final.jar
-file.reference.okhttp-2.7.5.jar=release/modules/ext/okhttp-2.7.5.jar
-file.reference.okio-1.6.0.jar=release/modules/ext/okio-1.6.0.jar
+file.reference.okhttp-4.12.0.jar=release/modules/ext/okhttp-4.12.0.jar
+file.reference.okio-3.6.0.jar=release/modules/ext/okio-3.6.0.jar
+file.reference.okio-jvm-3.6.0.jar=release/modules/ext/okio-jvm-3.6.0.jar
 file.reference.postgresql-42.7.3.jar=release/modules/ext/postgresql-42.7.3.jar
-file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar
 file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar
 file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
 file.reference.sleuthkit-4.12.1.jar=release/modules/ext/sleuthkit-4.12.1.jar
 file.reference.sleuthkit-caseuco-4.12.1.jar=release/modules/ext/sleuthkit-caseuco-4.12.1.jar
 file.reference.slf4j-api-1.7.30.jar=release/modules/ext/slf4j-api-1.7.30.jar
 file.reference.snakeyaml-2.3.jar=release/modules/ext/snakeyaml-2.3.jar
-file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar
 file.reference.spotbugs-annotations-4.8.6.jar=release/modules/ext/spotbugs-annotations-4.8.6.jar
 file.reference.sqlite-jdbc-3.47.1.0.jar=release/modules/ext/sqlite-jdbc-3.47.1.0.jar
 file.reference.txw2-4.0.5.jar=release/modules/ext/txw2-4.0.5.jar
+file.reference.xalan-2.7.3.jar=release/modules/ext/xalan-2.7.3.jar
+file.reference.xercesImpl-2.12.2.jar=release/modules/ext/xercesImpl-2.12.2.jar
 file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar
 file.reference.xml-apis-ext-1.3.04.jar=release/modules/ext/xml-apis-ext-1.3.04.jar
 file.reference.xmlgraphics-commons-2.10.jar=release/modules/ext/xmlgraphics-commons-2.10.jar
 file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar
-file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar
 file.reference.zookeeper-3.9.3.jar=release/modules/ext/zookeeper-3.9.3.jar
 file.reference.zookeeper-jute-3.9.3.jar=release/modules/ext/zookeeper-jute-3.9.3.jar
+javac.compilerargs=-Xlint -Xlint\:-serial
 javac.source=17
-javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/
+nbm.homepage=http\://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
 spec.version.base=10.25
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index c1f7418b98..8d8e59e94e 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -377,6 +377,10 @@
                 <runtime-relative-path>ext/angus-activation-2.0.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/angus-activation-2.0.2.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/annotations-13.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/annotations-13.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/audience-annotations-0.12.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/audience-annotations-0.12.0.jar</binary-origin>
@@ -430,28 +434,24 @@
                 <binary-origin>release/modules/ext/batik-xml-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcpkix-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcpkix-jdk15on-1.54.jar</binary-origin>
+                <runtime-relative-path>ext/bcpkix-jdk18on-1.79.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcpkix-jdk18on-1.79.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-ext-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-ext-jdk15on-1.54.jar</binary-origin>
+                <runtime-relative-path>ext/bcprov-jdk18on-1.79.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcprov-jdk18on-1.79.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-jdk15on-1.54.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk18on-1.72.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-jdk18on-1.72.jar</binary-origin>
+                <runtime-relative-path>ext/bcutil-jdk18on-1.79.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcutil-jdk18on-1.79.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/c3p0-0.9.5.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/c3p0-0.9.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/checker-qual-3.33.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/checker-qual-3.33.0.jar</binary-origin>
+                <runtime-relative-path>ext/checker-qual-3.43.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/checker-qual-3.43.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
@@ -462,8 +462,8 @@
                 <binary-origin>release/modules/ext/commons-dbcp2-2.13.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-io-2.17.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-io-2.17.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-io-2.18.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-io-2.18.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang3-3.10.jar</runtime-relative-path>
@@ -498,16 +498,16 @@
                 <binary-origin>release/modules/ext/decodetect-core-0.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/error_prone_annotations-2.18.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/error_prone_annotations-2.18.0.jar</binary-origin>
+                <runtime-relative-path>ext/error_prone_annotations-2.36.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/error_prone_annotations-2.36.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/failureaccess-1.0.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/failureaccess-1.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/guava-32.0.0-jre.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-32.0.0-jre.jar</binary-origin>
+                <runtime-relative-path>ext/guava-33.4.0-jre.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-33.4.0-jre.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/httpclient-4.5.14.jar</runtime-relative-path>
@@ -538,8 +538,8 @@
                 <binary-origin>release/modules/ext/istack-commons-runtime-4.1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/j2objc-annotations-2.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/j2objc-annotations-2.8.jar</binary-origin>
+                <runtime-relative-path>ext/j2objc-annotations-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/j2objc-annotations-3.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jackcess-4.0.7.jar</runtime-relative-path>
@@ -565,10 +565,6 @@
                 <runtime-relative-path>ext/jakarta.annotation-api-2.1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jakarta.annotation-api-2.1.1.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jakarta.jms-api-3.1.0-javadoc.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.jms-api-3.1.0-javadoc.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jakarta.jms-api-3.1.0-sources.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jakarta.jms-api-3.1.0-sources.jar</binary-origin>
@@ -610,12 +606,16 @@
                 <binary-origin>release/modules/ext/jaxb-runtime-4.0.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jdom-2.0.5-contrib.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jdom-2.0.5-contrib.jar</binary-origin>
+                <runtime-relative-path>ext/jaxen-1.2.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jaxen-1.2.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jdom-2.0.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jdom-2.0.5.jar</binary-origin>
+                <runtime-relative-path>ext/jdom2-2.0.6.1-sources.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom2-2.0.6.1-sources.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jdom2-2.0.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom2-2.0.6.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jfreechart-1.5.5.jar</runtime-relative-path>
@@ -645,6 +645,22 @@
                 <runtime-relative-path>ext/jython-standalone-2.7.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jython-standalone-2.7.4.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/kotlin-stdlib-1.8.21.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/kotlin-stdlib-1.8.21.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/kotlin-stdlib-common-1.9.10.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/kotlin-stdlib-common-1.9.10.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/kotlin-stdlib-jdk7-1.8.21.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/kotlin-stdlib-jdk7-1.8.21.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/kotlin-stdlib-jdk8-1.8.21.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/kotlin-stdlib-jdk8-1.8.21.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/libphonenumber-8.13.52.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/libphonenumber-8.13.52.jar</binary-origin>
@@ -674,8 +690,8 @@
                 <binary-origin>release/modules/ext/netty-codec-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-common-4.1.113.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-common-4.1.113.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-common-4.1.116.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-common-4.1.116.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/netty-handler-4.1.113.Final.jar</runtime-relative-path>
@@ -686,36 +702,40 @@
                 <binary-origin>release/modules/ext/netty-resolver-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-tcnative-boringssl-static-2.0.66.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-tcnative-boringssl-static-2.0.66.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-tcnative-boringssl-static-2.0.69.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-tcnative-boringssl-static-2.0.69.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/netty-tcnative-classes-2.0.66.Final.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-4.1.113.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-4.1.113.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-transport-4.1.116.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-4.1.116.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-classes-epoll-4.1.113.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-classes-epoll-4.1.113.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-transport-classes-epoll-4.1.116.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.113.Final-linux-x86_64.jar</binary-origin>
+                <runtime-relative-path>ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/netty-transport-native-unix-common-4.1.113.Final.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/okhttp-2.7.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/okhttp-2.7.5.jar</binary-origin>
+                <runtime-relative-path>ext/okhttp-4.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/okhttp-4.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/okio-1.6.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/okio-1.6.0.jar</binary-origin>
+                <runtime-relative-path>ext/okio-3.6.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/okio-3.6.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/okio-jvm-3.6.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/okio-jvm-3.6.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/postgresql-42.7.3.jar</runtime-relative-path>
@@ -765,6 +785,14 @@
                 <runtime-relative-path>ext/txw2-4.0.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/txw2-4.0.5.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xalan-2.7.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xalan-2.7.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xercesImpl-2.12.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xercesImpl-2.12.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/xml-apis-1.4.01.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xml-apis-1.4.01.jar</binary-origin>
diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java
index 574cc44313..c9ecf11a9d 100644
--- a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java
+++ b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java
@@ -21,13 +21,14 @@ package org.sleuthkit.autopsy.texttranslation.translators;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
+
 import java.io.IOException;
 import javax.swing.JPanel;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.openide.util.NbBundle.Messages;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.coreutils.ThreadConfined;
diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java
index a679dccd13..1f0cf2c9df 100644
--- a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java
@@ -22,11 +22,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonObject;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
 import java.io.IOException;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -36,6 +31,11 @@ import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import java.awt.Desktop;
 import java.net.URISyntaxException;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.util.NbBundle.Messages;
 
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index c89ce8cdb1..cef555e3b1 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -1,9 +1,11 @@
+#Wed Jan 08 19:35:29 UTC 2025
+file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar
+file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar
 file.reference.animal-sniffer-annotations-1.24.jar=release/modules/ext/animal-sniffer-annotations-1.24.jar
 file.reference.annotations-4.1.1.4.jar=release/modules/ext/annotations-4.1.1.4.jar
 file.reference.ant-1.10.15.jar=release/modules/ext/ant-1.10.15.jar
 file.reference.ant-launcher-1.10.15.jar=release/modules/ext/ant-launcher-1.10.15.jar
 file.reference.api-common-2.41.0.jar=release/modules/ext/api-common-2.41.0.jar
-file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar
 file.reference.auto-value-annotations-1.11.0.jar=release/modules/ext/auto-value-annotations-1.11.0.jar
 file.reference.checker-qual-3.47.0.jar=release/modules/ext/checker-qual-3.47.0.jar
 file.reference.common-image-3.12.0.jar=release/modules/ext/common-image-3.12.0.jar
@@ -62,7 +64,7 @@ file.reference.grpc-util-1.68.1.jar=release/modules/ext/grpc-util-1.68.1.jar
 file.reference.grpc-xds-1.68.1.jar=release/modules/ext/grpc-xds-1.68.1.jar
 file.reference.gson-2.11.0.jar=release/modules/ext/gson-2.11.0.jar
 file.reference.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar
-file.reference.guava-33.3.1-jre.jar=release/modules/ext/guava-33.3.1-jre.jar
+file.reference.guava-33.4.0-jre.jar=release/modules/ext/guava-33.4.0-jre.jar
 file.reference.httpclient-4.5.14.jar=release/modules/ext/httpclient-4.5.14.jar
 file.reference.httpcore-4.4.16.jar=release/modules/ext/httpcore-4.4.16.jar
 file.reference.imageio-bmp-3.12.0.jar=release/modules/ext/imageio-bmp-3.12.0.jar
@@ -123,7 +125,6 @@ file.reference.jna-5.16.0.jar=release/modules/ext/jna-5.16.0.jar
 file.reference.jna-platform-5.16.0.jar=release/modules/ext/jna-platform-5.16.0.jar
 file.reference.joda-time-2.13.0.jar=release/modules/ext/joda-time-2.13.0.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.log4j-api-2.24.3.jar=release/modules/ext/log4j-api-2.24.3.jar
 file.reference.log4j-core-2.24.3.jar=release/modules/ext/log4j-core-2.24.3.jar
@@ -143,6 +144,6 @@ file.reference.slf4j-api-2.0.16.jar=release/modules/ext/slf4j-api-2.0.16.jar
 file.reference.slf4j-reload4j-2.0.16.jar=release/modules/ext/slf4j-reload4j-2.0.16.jar
 file.reference.threetenbp-1.7.0.jar=release/modules/ext/threetenbp-1.7.0.jar
 file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar
+javac.compilerargs=-Xlint -Xlint\:-serial
 javac.source=17
-javac.compilerargs=-Xlint -Xlint:-serial
 nbm.needs.restart=true
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 0b2daee78f..3aefaa6d83 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -818,8 +818,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-33.3.1-jre.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-33.3.1-jre.jar</binary-origin>
+                <runtime-relative-path>ext/guava-33.4.0-jre.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-33.4.0-jre.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/httpclient-4.5.14.jar</runtime-relative-path>
diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties
index 5830504c3e..82d59d6fa3 100644
--- a/CoreTestLibs/nbproject/project.properties
+++ b/CoreTestLibs/nbproject/project.properties
@@ -1,8 +1,9 @@
+#Wed Jan 08 19:28:01 UTC 2025
 file.reference.byte-buddy-1.15.11.jar=release/modules/ext/byte-buddy-1.15.11.jar
 file.reference.byte-buddy-agent-1.15.11.jar=release/modules/ext/byte-buddy-agent-1.15.11.jar
 file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
 file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar
 file.reference.mockito-core-4.8.1.jar=release/modules/ext/mockito-core-4.8.1.jar
 file.reference.objenesis-3.4.jar=release/modules/ext/objenesis-3.4.jar
+javac.compilerargs=-Xlint -Xlint\:-serial
 javac.source=17
-javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties
index 5f135c60e4..52c13e3bf7 100644
--- a/Experimental/nbproject/project.properties
+++ b/Experimental/nbproject/project.properties
@@ -1,4 +1,5 @@
+#Wed Jan 08 19:10:38 UTC 2025
 file.reference.jtidy-r938.jar=release/modules/ext/jtidy-r938.jar
+javac.compilerargs=-Xlint -Xlint\:-serial
 javac.source=17
-javac.compilerargs=-Xlint -Xlint:-serial
 spec.version.base=1.0
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 72036aa262..0a1d040ce5 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -21,7 +21,7 @@
         <!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
         <dependency conf="autopsy->default" org="org.apache.lucene" name="lucene-core" rev="9.12.1"/>     
         <!-- Autopsy -->
-        <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.4"/>
+        <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="9.7.0"/>
         <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>       
         <!-- <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.1"/> -->
         <!-- <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/> -->
@@ -30,6 +30,8 @@
         <dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="76.1"/>
         <dependency conf="autopsy->default" org="junit" name="junit" rev="4.13.2"/>
 
+        <dependency conf="autopsy->default" org="org.eclipse.jetty.http2" name="http2-client" rev="${http2-client.version}"/>
+
         <!-- Jetty -->
 		<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="${jetty.version}"/>
         <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="${jetty.version}"/>
@@ -41,9 +43,10 @@
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"/>
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="${slf4j.version}"/> 
 
-        <exclude org="*" ext="*" type="javadoc"/>
+        <exclude org="org.eclipse.jetty.http2" ext="*"/>
+        <exclude org="" ext="*" type="javadoc"/>
         
-        <override org="commons-io" module="commons-io" rev="2.18"/>
+        <override org="commons-io" module="commons-io" rev="2.18.0"/>
         <override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
         
         <override org="org.apache.logging.log4j" module="log4j-api" rev="${log4j.version}"/>
@@ -52,10 +55,15 @@
         <override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="${log4j.version}"/>
         <override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="${log4j.version}"/>
         <override org="org.apache.logging.log4j" module="log4j-web" rev="${log4j.version}"/>
+        <override org="org.eclipse.jetty.http2" module="http2-client" rev="${http2-client.version}"/>
 
-        <override org="io.netty" module="netty-transport" rev="4.1.116.Final"/>
-        <override org="io.netty" module="netty-common" rev="4.1.116.Final"/>
+        <override org="org.xerial.snappy" module="snappy-java" rev="1.1.10.7"/>
 
+        <override org="io.netty" module="netty-transport" rev="${netty.version}"/>
+        <override org="io.netty" module="netty-common" rev="${netty.version}"/>
+        <override org="io.netty" module="netty-transport-native-epoll" rev="${netty.version}"/>
+        <override org="io.netty" module="netty-transport-classes-epoll" rev="${netty.version}"/>
+        
         <override org="org.apache.zookeeper" module="zookeeper" rev="3.9.3"/>
         <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.9.3"/>
     </dependencies>
diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml
index 9a6d79ecdc..8f76a6c352 100644
--- a/KeywordSearch/ivysettings.xml
+++ b/KeywordSearch/ivysettings.xml
@@ -2,6 +2,8 @@
   <property name="jetty.version" value="12.0.16"/>
   <property name="slf4j.version" value="2.0.16"/>
   <property name="log4j.version" value="2.24.3"/>
+  <property name="http2-client.version" value="11.0.24"/>
+  <property name="netty.version" value="4.1.116.Final"/>
 
   <settings defaultResolver="main"/>
   <resolvers>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index cbf856e56d..862a8772a3 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,48 +1,58 @@
+#Wed Jan 08 19:35:29 UTC 2025
 file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.jar
-file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar
-file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
+file.reference.checker-qual-3.43.0.jar=release/modules/ext/checker-qual-3.43.0.jar
+file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar
+file.reference.commons-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar
 file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar
-file.reference.guava-16.0.1.jar=release/modules/ext/guava-16.0.1.jar
+file.reference.error_prone_annotations-2.36.0.jar=release/modules/ext/error_prone_annotations-2.36.0.jar
+file.reference.failureaccess-1.0.2.jar=release/modules/ext/failureaccess-1.0.2.jar
+file.reference.guava-33.4.0-jre.jar=release/modules/ext/guava-33.4.0-jre.jar
 file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
-file.reference.http2-client-9.4.53.v20231009.jar=release/modules/ext/http2-client-9.4.53.v20231009.jar
-file.reference.http2-common-9.4.53.v20231009.jar=release/modules/ext/http2-common-9.4.53.v20231009.jar
-file.reference.http2-hpack-9.4.53.v20231009.jar=release/modules/ext/http2-hpack-9.4.53.v20231009.jar
-file.reference.http2-http-client-transport-9.4.53.v20231009.jar=release/modules/ext/http2-http-client-transport-9.4.53.v20231009.jar
-file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar
-file.reference.httpcore-4.4.14.jar=release/modules/ext/httpcore-4.4.14.jar
-file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar
+file.reference.httpclient-4.5.14.jar=release/modules/ext/httpclient-4.5.14.jar
+file.reference.httpcore-4.4.16.jar=release/modules/ext/httpcore-4.4.16.jar
+file.reference.httpmime-4.5.14.jar=release/modules/ext/httpmime-4.5.14.jar
 file.reference.icu4j-76.1.jar=release/modules/ext/icu4j-76.1.jar
-file.reference.jcl-over-slf4j-1.7.36.jar=release/modules/ext/jcl-over-slf4j-1.7.36.jar
-file.reference.jetty-alpn-client-9.4.53.v20231009.jar=release/modules/ext/jetty-alpn-client-9.4.53.v20231009.jar
-file.reference.jetty-alpn-java-client-9.4.53.v20231009.jar=release/modules/ext/jetty-alpn-java-client-9.4.53.v20231009.jar
-file.reference.jetty-client-9.4.53.v20231009.jar=release/modules/ext/jetty-client-9.4.53.v20231009.jar
-file.reference.jetty-http-9.4.53.v20231009.jar=release/modules/ext/jetty-http-9.4.53.v20231009.jar
-file.reference.jetty-io-9.4.53.v20231009.jar=release/modules/ext/jetty-io-9.4.53.v20231009.jar
-file.reference.jetty-util-9.4.53.v20231009.jar=release/modules/ext/jetty-util-9.4.53.v20231009.jar
+file.reference.j2objc-annotations-3.0.0.jar=release/modules/ext/j2objc-annotations-3.0.0.jar
+file.reference.jackson-annotations-2.17.2.jar=release/modules/ext/jackson-annotations-2.17.2.jar
+file.reference.jackson-core-2.17.2.jar=release/modules/ext/jackson-core-2.17.2.jar
+file.reference.jackson-databind-2.17.2.jar=release/modules/ext/jackson-databind-2.17.2.jar
+file.reference.jakarta.ws.rs-api-3.1.0.jar=release/modules/ext/jakarta.ws.rs-api-3.1.0.jar
+file.reference.jcl-over-slf4j-2.0.13.jar=release/modules/ext/jcl-over-slf4j-2.0.13.jar
+file.reference.jetty-alpn-client-10.0.22.jar=release/modules/ext/jetty-alpn-client-10.0.22.jar
+file.reference.jetty-alpn-java-client-10.0.22.jar=release/modules/ext/jetty-alpn-java-client-10.0.22.jar
+file.reference.jetty-client-10.0.22.jar=release/modules/ext/jetty-client-10.0.22.jar
+file.reference.jetty-http-10.0.22.jar=release/modules/ext/jetty-http-10.0.22.jar
+file.reference.jetty-io-10.0.22.jar=release/modules/ext/jetty-io-10.0.22.jar
+file.reference.jetty-util-10.0.22.jar=release/modules/ext/jetty-util-10.0.22.jar
 file.reference.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar
+file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
 file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar
 file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.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.lucene-core-9.12.1.jar=release/modules/ext/lucene-core-9.12.1.jar
-file.reference.netty-buffer-4.1.99.Final.jar=release/modules/ext/netty-buffer-4.1.99.Final.jar
-file.reference.netty-codec-4.1.99.Final.jar=release/modules/ext/netty-codec-4.1.99.Final.jar
-file.reference.netty-common-4.1.99.Final.jar=release/modules/ext/netty-common-4.1.99.Final.jar
-file.reference.netty-handler-4.1.99.Final.jar=release/modules/ext/netty-handler-4.1.99.Final.jar
-file.reference.netty-resolver-4.1.99.Final.jar=release/modules/ext/netty-resolver-4.1.99.Final.jar
-file.reference.netty-transport-4.1.99.Final.jar=release/modules/ext/netty-transport-4.1.99.Final.jar
-file.reference.netty-transport-classes-epoll-4.1.99.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.99.Final.jar
-file.reference.netty-transport-native-epoll-4.1.99.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.99.Final.jar
-file.reference.netty-transport-native-unix-common-4.1.99.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.99.Final.jar
-file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
-file.reference.snappy-java-1.1.10.1.jar=release/modules/ext/snappy-java-1.1.10.1.jar
-file.reference.solr-solrj-8.11.4.jar=release/modules/ext/solr-solrj-8.11.4.jar
-file.reference.stax-api-1.0.1.jar=release/modules/ext/stax-api-1.0.1.jar
-file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar
-file.reference.woodstox-core-6.5.1.jar=release/modules/ext/woodstox-core-6.5.1.jar
-file.reference.zookeeper-3.6.2.jar=release/modules/ext/zookeeper-3.6.2.jar
-file.reference.zookeeper-jute-3.6.2.jar=release/modules/ext/zookeeper-jute-3.6.2.jar
+file.reference.netty-buffer-4.1.113.Final.jar=release/modules/ext/netty-buffer-4.1.113.Final.jar
+file.reference.netty-codec-4.1.113.Final.jar=release/modules/ext/netty-codec-4.1.113.Final.jar
+file.reference.netty-common-4.1.116.Final.jar=release/modules/ext/netty-common-4.1.116.Final.jar
+file.reference.netty-handler-4.1.113.Final.jar=release/modules/ext/netty-handler-4.1.113.Final.jar
+file.reference.netty-resolver-4.1.113.Final.jar=release/modules/ext/netty-resolver-4.1.113.Final.jar
+file.reference.netty-tcnative-boringssl-static-2.0.66.Final.jar=release/modules/ext/netty-tcnative-boringssl-static-2.0.66.Final.jar
+file.reference.netty-tcnative-classes-2.0.66.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar
+file.reference.netty-transport-4.1.116.Final.jar=release/modules/ext/netty-transport-4.1.116.Final.jar
+file.reference.netty-transport-classes-epoll-4.1.116.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar
+file.reference.netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar=release/modules/ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar
+file.reference.netty-transport-native-unix-common-4.1.113.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.113.Final.jar
+file.reference.semver4j-5.3.0.jar=release/modules/ext/semver4j-5.3.0.jar
+file.reference.slf4j-api-2.0.13.jar=release/modules/ext/slf4j-api-2.0.13.jar
+file.reference.solr-api-9.7.0.jar=release/modules/ext/solr-api-9.7.0.jar
+file.reference.solr-solrj-9.7.0.jar=release/modules/ext/solr-solrj-9.7.0.jar
+file.reference.solr-solrj-streaming-9.7.0.jar=release/modules/ext/solr-solrj-streaming-9.7.0.jar
+file.reference.solr-solrj-zookeeper-9.7.0.jar=release/modules/ext/solr-solrj-zookeeper-9.7.0.jar
+file.reference.swagger-annotations-jakarta-2.2.22.jar=release/modules/ext/swagger-annotations-jakarta-2.2.22.jar
+file.reference.zookeeper-3.9.3.jar=release/modules/ext/zookeeper-3.9.3.jar
+file.reference.zookeeper-jute-3.9.3.jar=release/modules/ext/zookeeper-jute-3.9.3.jar
+javac.compilerargs=-Xlint -Xlint\:-serial
 javac.source=17
-javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/autopsy/
+nbm.homepage=http\://www.sleuthkit.org/autopsy/
 nbm.needs.restart=true
 spec.version.base=6.7
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 40466c4b5f..c557bcd310 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -239,89 +239,109 @@
                 <binary-origin>release/modules/ext/annotations-12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-io-2.11.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-io-2.11.0.jar</binary-origin>
+                <runtime-relative-path>ext/checker-qual-3.43.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/checker-qual-3.43.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
+                <runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-codec-1.11.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-io-2.18.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-io-2.18.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-math3-3.6.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-math3-3.6.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/guava-16.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-16.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/error_prone_annotations-2.36.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/error_prone_annotations-2.36.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/failureaccess-1.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/failureaccess-1.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/guava-33.4.0-jre.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-33.4.0-jre.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/hamcrest-core-1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/http2-client-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-client-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/httpclient-4.5.14.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpclient-4.5.14.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/http2-common-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-common-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/httpcore-4.4.16.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpcore-4.4.16.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/http2-hpack-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-hpack-9.4.53.v20231009.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/http2-http-client-transport-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-http-client-transport-9.4.53.v20231009.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpclient-4.5.13.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpcore-4.4.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpcore-4.4.14.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpmime-4.5.13.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpmime-4.5.13.jar</binary-origin>
+                <runtime-relative-path>ext/httpmime-4.5.14.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpmime-4.5.14.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/icu4j-76.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/icu4j-76.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jcl-over-slf4j-1.7.36.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcl-over-slf4j-1.7.36.jar</binary-origin>
+                <runtime-relative-path>ext/j2objc-annotations-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/j2objc-annotations-3.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-alpn-client-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-alpn-client-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-annotations-2.17.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-annotations-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-alpn-java-client-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-alpn-java-client-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-core-2.17.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-core-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-client-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-client-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-databind-2.17.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-databind-2.17.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-http-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-http-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/jakarta.ws.rs-api-3.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jakarta.ws.rs-api-3.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-io-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-io-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/jcl-over-slf4j-2.0.13.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcl-over-slf4j-2.0.13.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-util-9.4.53.v20231009.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-util-9.4.53.v20231009.jar</binary-origin>
+                <runtime-relative-path>ext/jetty-alpn-client-10.0.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jetty-alpn-client-10.0.22.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jetty-alpn-java-client-10.0.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jetty-alpn-java-client-10.0.22.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jetty-client-10.0.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jetty-client-10.0.22.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jetty-http-10.0.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jetty-http-10.0.22.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jetty-io-10.0.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jetty-io-10.0.22.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jetty-util-10.0.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jetty-util-10.0.22.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsonic-1.2.11.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jsonic-1.2.11.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsr305-3.0.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/junit-4.13.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/junit-4.13.2.jar</binary-origin>
@@ -330,77 +350,93 @@
                 <runtime-relative-path>ext/language-detector-0.6.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/language-detector-0.6.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>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/lucene-core-9.12.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/lucene-core-9.12.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-buffer-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-buffer-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-buffer-4.1.113.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-buffer-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-codec-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-codec-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-codec-4.1.113.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-codec-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-common-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-common-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-common-4.1.116.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-common-4.1.116.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-handler-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-handler-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-handler-4.1.113.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-handler-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-resolver-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-resolver-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-resolver-4.1.113.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-resolver-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-tcnative-boringssl-static-2.0.66.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-tcnative-boringssl-static-2.0.66.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-classes-epoll-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-classes-epoll-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-tcnative-classes-2.0.66.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-native-epoll-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-transport-4.1.116.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-4.1.116.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-native-unix-common-4.1.99.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.99.Final.jar</binary-origin>
+                <runtime-relative-path>ext/netty-transport-classes-epoll-4.1.116.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/slf4j-api-1.7.36.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin>
+                <runtime-relative-path>ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/snappy-java-1.1.10.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/snappy-java-1.1.10.1.jar</binary-origin>
+                <runtime-relative-path>ext/netty-transport-native-unix-common-4.1.113.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.113.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/solr-solrj-8.11.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/solr-solrj-8.11.4.jar</binary-origin>
+                <runtime-relative-path>ext/semver4j-5.3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/semver4j-5.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/stax-api-1.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/stax-api-1.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/slf4j-api-2.0.13.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-2.0.13.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/stax2-api-4.2.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/stax2-api-4.2.1.jar</binary-origin>
+                <runtime-relative-path>ext/solr-api-9.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-api-9.7.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/woodstox-core-6.5.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/woodstox-core-6.5.1.jar</binary-origin>
+                <runtime-relative-path>ext/solr-solrj-9.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-9.7.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/zookeeper-3.6.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-3.6.2.jar</binary-origin>
+                <runtime-relative-path>ext/solr-solrj-streaming-9.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-streaming-9.7.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/zookeeper-jute-3.6.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-jute-3.6.2.jar</binary-origin>
+                <runtime-relative-path>ext/solr-solrj-zookeeper-9.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-zookeeper-9.7.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/swagger-annotations-jakarta-2.2.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/swagger-annotations-jakarta-2.2.22.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/zookeeper-3.9.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/zookeeper-3.9.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/zookeeper-jute-3.9.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/zookeeper-jute-3.9.3.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index b918a81054..9786bbd2c2 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -71,6 +71,7 @@ import org.apache.solr.client.solrj.response.CollectionAdminResponse;
 import org.apache.solr.client.solrj.request.CoreAdminRequest;
 import org.apache.solr.client.solrj.response.CoreAdminResponse;
 import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteSolrException;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.TermsResponse;
@@ -393,8 +394,10 @@ public class Server {
         logger.log(Level.INFO, "Creating new CloudSolrClient"); //NON-NLS
         int connectionTimeoutMs = org.sleuthkit.autopsy.keywordsearch.UserPreferences.getConnectionTimeout();
         CloudSolrClient client = new CloudSolrClient.Builder(solrUrls)
-                .withConnectionTimeout(connectionTimeoutMs)
-                .withSocketTimeout(connectionTimeoutMs)
+                .withInternalClientBuilder(new Http2SolrClient.Builder()
+                    .withConnectionTimeout(connectionTimeoutMs, TimeUnit.MILLISECONDS)
+                    .withRequestTimeout(connectionTimeoutMs, TimeUnit.MILLISECONDS)
+                )
                 .withResponseParser(new XMLResponseParser())
                 .build();
         if (!defaultCollectionName.isEmpty()) {
diff --git a/Tika/ivy.xml b/Tika/ivy.xml
index 2c91bf3160..7119a8cf4c 100755
--- a/Tika/ivy.xml
+++ b/Tika/ivy.xml
@@ -9,10 +9,17 @@
 
         <dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
 
+        <dependency conf="tika->default" org="org.bouncycastle" name="bcprov-jdk18on" rev="${bouncycastle.version}"/>
+        <dependency conf="tika->default" org="org.bouncycastle" name="bcpkix-jdk18on" rev="${bouncycastle.version}"/>
+
+        <exclude org="org.bouncycastle" module="${bcpkix-jdk15on"/>
+        <exclude org="org.bouncycastle" module="bcpkix-jdk15on"/>
         <exclude org="*" ext="*" type="javadoc"/>
 
-        <override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
+        <override org="org.bouncycastle" module="bcprov-jdk18on" rev="${bouncycastle.version}"/>
+        <override org="org.bouncycastle" module="bcpkix-jdk18on" rev="${bouncycastle.version}"/>
 
+        <override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
         <override org="org.apache.logging.log4j" module="log4j-api" rev="${log4j.version}"/>
     </dependencies>
 </ivy-module>
diff --git a/Tika/ivysettings.xml b/Tika/ivysettings.xml
index fe242a2517..1d48bc03b3 100755
--- a/Tika/ivysettings.xml
+++ b/Tika/ivysettings.xml
@@ -1,6 +1,7 @@
 <ivysettings>
   <settings defaultResolver="main"/>
   <property name="log4j.version" value="2.24.3"/>
+  <property name="bouncycastle.version" value="1.79"/>
   
   <resolvers>
     <chain name="main">
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index c5c97ab18a..fa82da1fbc 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -1,10 +1,12 @@
+#Wed Jan 08 19:35:29 UTC 2025
+file.reference.SparseBitSet-1.3.jar=release/modules/ext/SparseBitSet-1.3.jar
 file.reference.angus-activation-2.0.2.jar=release/modules/ext/angus-activation-2.0.2.jar
 file.reference.apache-mime4j-core-0.8.11.jar=release/modules/ext/apache-mime4j-core-0.8.11.jar
 file.reference.apache-mime4j-dom-0.8.11.jar=release/modules/ext/apache-mime4j-dom-0.8.11.jar
 file.reference.asm-9.7.1.jar=release/modules/ext/asm-9.7.1.jar
 file.reference.bcjmail-jdk18on-1.78.1.jar=release/modules/ext/bcjmail-jdk18on-1.78.1.jar
-file.reference.bcpkix-jdk18on-1.78.1.jar=release/modules/ext/bcpkix-jdk18on-1.78.1.jar
-file.reference.bcprov-jdk18on-1.78.1.jar=release/modules/ext/bcprov-jdk18on-1.78.1.jar
+file.reference.bcpkix-jdk18on-1.79.jar=release/modules/ext/bcpkix-jdk18on-1.79.jar
+file.reference.bcprov-jdk18on-1.79.jar=release/modules/ext/bcprov-jdk18on-1.79.jar
 file.reference.bcutil-jdk18on-1.78.1.jar=release/modules/ext/bcutil-jdk18on-1.78.1.jar
 file.reference.commons-codec-1.17.1.jar=release/modules/ext/commons-codec-1.17.1.jar
 file.reference.commons-collections4-4.4.jar=release/modules/ext/commons-collections4-4.4.jar
@@ -41,7 +43,7 @@ file.reference.jsoup-1.18.1.jar=release/modules/ext/jsoup-1.18.1.jar
 file.reference.juniversalchardet-2.5.0.jar=release/modules/ext/juniversalchardet-2.5.0.jar
 file.reference.junrar-7.5.5.jar=release/modules/ext/junrar-7.5.5.jar
 file.reference.jwarc-0.30.0.jar=release/modules/ext/jwarc-0.30.0.jar
-file.reference.log4j-api-2.24.1.jar=release/modules/ext/log4j-api-2.24.1.jar
+file.reference.log4j-api-2.24.3.jar=release/modules/ext/log4j-api-2.24.3.jar
 file.reference.metadata-extractor-2.19.0.jar=release/modules/ext/metadata-extractor-2.19.0.jar
 file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar
 file.reference.parso-2.0.14.jar=release/modules/ext/parso-2.0.14.jar
@@ -56,7 +58,6 @@ file.reference.poi-scratchpad-5.3.0.jar=release/modules/ext/poi-scratchpad-5.3.0
 file.reference.rome-2.1.0.jar=release/modules/ext/rome-2.1.0.jar
 file.reference.rome-utils-2.1.0.jar=release/modules/ext/rome-utils-2.1.0.jar
 file.reference.slf4j-api-2.0.16.jar=release/modules/ext/slf4j-api-2.0.16.jar
-file.reference.SparseBitSet-1.3.jar=release/modules/ext/SparseBitSet-1.3.jar
 file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
 file.reference.tika-core-3.0.0.jar=release/modules/ext/tika-core-3.0.0.jar
 file.reference.tika-parser-apple-module-3.0.0.jar=release/modules/ext/tika-parser-apple-module-3.0.0.jar
@@ -89,5 +90,5 @@ file.reference.xmlbeans-5.2.1.jar=release/modules/ext/xmlbeans-5.2.1.jar
 file.reference.xmpbox-3.0.3.jar=release/modules/ext/xmpbox-3.0.3.jar
 file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar
 file.reference.xz-1.10.jar=release/modules/ext/xz-1.10.jar
+javac.compilerargs=-Xlint -Xlint\:-serial
 javac.source=17
-javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index d21d8835df..d1a22b74a8 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -376,12 +376,12 @@
                 <binary-origin>release/modules/ext/bcjmail-jdk18on-1.78.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcpkix-jdk18on-1.78.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcpkix-jdk18on-1.78.1.jar</binary-origin>
+                <runtime-relative-path>ext/bcpkix-jdk18on-1.79.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcpkix-jdk18on-1.79.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk18on-1.78.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-jdk18on-1.78.1.jar</binary-origin>
+                <runtime-relative-path>ext/bcprov-jdk18on-1.79.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcprov-jdk18on-1.79.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/bcutil-jdk18on-1.78.1.jar</runtime-relative-path>
@@ -528,8 +528,8 @@
                 <binary-origin>release/modules/ext/jwarc-0.30.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/log4j-api-2.24.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/log4j-api-2.24.1.jar</binary-origin>
+                <runtime-relative-path>ext/log4j-api-2.24.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/log4j-api-2.24.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/metadata-extractor-2.19.0.jar</runtime-relative-path>
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index 94544bb70f..e162ffa946 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -1,3 +1,4 @@
+#Wed Jan 08 19:10:39 UTC 2025
 file.reference.apache-mime4j-mbox-iterator-0.8.11.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.11.jar
 file.reference.ez-vcard-0.12.1.jar=release/modules/ext/ez-vcard-0.12.1.jar
 file.reference.freemarker-2.3.32.jar=release/modules/ext/freemarker-2.3.32.jar
@@ -5,9 +6,9 @@ file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.j
 file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar
 file.reference.jsoup-1.16.1.jar=release/modules/ext/jsoup-1.16.1.jar
 file.reference.vinnie-2.0.2.jar=release/modules/ext/vinnie-2.0.2.jar
+javac.compilerargs=-Xlint -Xlint\:-serial
 javac.source=17
-javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/autopsy/
+nbm.homepage=http\://www.sleuthkit.org/autopsy/
 nbm.needs.restart=true
 spec.version.base=4.0