From e44cf29272636c0801d7b659c47038ff98cd9ca1 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 17 Dec 2024 14:14:59 -0500
Subject: [PATCH 01/14] updated ivy deps; remove overrides?

---
 Core/ivy.xml              | 58 +++++++++++++-------------
 CoreLibs/ivy.xml          | 88 ++++++++++++++++++++-------------------
 CoreTestLibs/ivy.xml      |  6 +--
 KeywordSearch/ivy.xml     | 35 +++++++++-------
 Tika/ivy.xml              |  8 ++--
 thunderbirdparser/ivy.xml |  8 ++--
 6 files changed, 105 insertions(+), 98 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index 3d2352648d..3fe1576e97 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -1,5 +1,7 @@
 <!DOCTYPE ivy-module [
     <!ENTITY httpcomponents.version "4.5.14">
+    <!ENTITY curator.version "5.7.1">
+    <!ENTITY batik.version "5.18">
 ]>
 <ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="core"/>
@@ -10,43 +12,43 @@
     <dependencies >
         <dependency conf="core->default" org="com.github.vlsi.mxgraph" name="jgraphx" rev="4.2.2" />
 
-        <dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="5.16.4"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="5.2.1"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="5.2.1"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="5.2.1"/>
+        <dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="6.1.4"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="&curator.version;"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="&curator.version;"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="&curator.version;"/>
 
-        <dependency conf="core->default" org="org.python" name="jython-standalone" rev="2.7.2" />
+        <dependency conf="core->default" org="org.python" name="jython-standalone" rev="2.7.4" />
 
         <dependency conf="core->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
-        <dependency conf="core->default" org="org.apache.zookeeper" name="zookeeper" rev="3.8.0"/>
+        <dependency conf="core->default" org="org.apache.zookeeper" name="zookeeper" rev="3.9.3"/>
 
-        <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess" rev="4.0.1"/>
-        <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="4.0.1"/>
+        <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess" rev="4.0.7"/>
+        <dependency conf="core->default" org="com.healthmarketscience.jackcess" name="jackcess-encrypt" rev="4.0.2"/>
 
-        <dependency conf="core->default" org="org.apache.commons" name="commons-dbcp2" rev="2.9.0"/>
+        <dependency conf="core->default" org="org.apache.commons" name="commons-dbcp2" rev="2.13.0"/>
 
-        <dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.16.1"/>
+        <dependency conf="core->default" org="org.jsoup" name="jsoup" rev="1.18.3"/>
 
-        <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.18.0"/>
+        <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0"/>
         <dependency conf="core->default" org="com.ethteck.decodetect" name="decodetect-core" rev="0.3"/>
 
-        <dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="8.12.45" />
+        <dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="8.13.52" />
 
         <dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/>
-        <dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.5.3"/>
+        <dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.5.5"/>
 
         <!-- for yaml reading/writing -->
-        <dependency conf="core->default" org="org.yaml" name="snakeyaml" rev="2.0"/>
+        <dependency conf="core->default" org="org.yaml" name="snakeyaml" rev="2.3"/>
 
         <!-- map support for geolocation -->
-        <dependency conf="core->default" org="org.jxmapviewer" name="jxmapviewer2" rev="2.6"/>
+        <dependency conf="core->default" org="org.jxmapviewer" name="jxmapviewer2" rev="2.8"/>
 
         <!-- for handling diffs -->
-        <dependency conf="core->default" org="io.github.java-diff-utils" name="java-diff-utils" rev="4.11"/>
+        <dependency conf="core->default" org="io.github.java-diff-utils" name="java-diff-utils" rev="4.15"/>
         
         <!-- JAXB -->
         <dependency conf="core->default" org="javax.xml.bind" name="jaxb-api" rev="2.3.1"/>
-        <dependency conf="core->default" org="org.glassfish.jaxb" name="jaxb-runtime" rev="2.3.3"/>
+        <dependency conf="core->default" org="org.glassfish.jaxb" name="jaxb-runtime" rev="4.0.5"/>
 
         <dependency conf="core->default" org="org.icepdf.os" name="icepdf-viewer" rev="6.2.2">
             <!-- get the new latest batik items below, override bouncy castle -->
@@ -62,20 +64,20 @@
             <exclude org="com.sun.media" module="jai_imageio"/>
         </dependency>
 
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="1.14"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="1.14"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="1.14"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="1.14"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="1.14"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="1.14"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="&batik.version;"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="&batik.version;"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="&batik.version;"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="&batik.version;"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="&batik.version;"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="&batik.version;"/>
 
         <!-- 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"/>
 
         <!-- annotations like guarded by -->
-        <dependency conf="core->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.6.0"/>
+        <dependency conf="core->default" org="com.github.spotbugs" name="spotbugs-annotations" rev="4.8.6"/>
 
-        <dependency conf="core->default" org="com.license4j" name="license4j-runtime-library" rev="4.7.1"/>
+        <dependency conf="core->default" org="com.license4j" name="license4j-runtime-library" rev="4.7.3"/>
 
         <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient" rev="&httpcomponents.version;"/>
         <dependency conf="core->default" org="org.apache.httpcomponents" name="httpmime" rev="&httpcomponents.version;"/>
@@ -83,7 +85,7 @@
             <exclude name="jna" />
             <exclude name="jna-platform" />
         </dependency>
-
+<!-- 
         <override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
         <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
         
@@ -92,10 +94,10 @@
         <override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
         <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/>
 
-        <!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 -->
+        //changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
         <override org="org.bouncycastle" module="bcprov-ext-jdk15on" rev="1.70"/>
         <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/>
+        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
         <override org="junit" module="junit" rev="4.13.2"/>
     </dependencies>
 </ivy-module>
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 446106e111..33d5226fd4 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -1,6 +1,8 @@
 <!DOCTYPE ivy-module [
-    <!ENTITY javafx.version "17.0.7">
-    <!ENTITY jackson.version "2.15.2">
+    <!ENTITY javafx.version "17.0.14-ea+2">
+    <!ENTITY jackson.version "2.18.2">
+    <!ENTITY jfxtras.version "17-r1">
+    <!ENTITY twelvemonkeys.version "3.12.0">
 ]>
 <ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
     <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
@@ -54,8 +56,8 @@
         </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"/>
+        <dependency conf="autopsy_core->default" org="org.apache.ant" name="ant-launcher" rev="1.10.15"/>
+        <dependency conf="autopsy_core->default" org="org.apache.ant" name="ant" rev="1.10.15"/>
 
         <!-- apple for swing -->
         <dependency conf="autopsy_core->default" org="com.apple" name="AppleJavaExtensions" rev="1.4"/>
@@ -67,23 +69,23 @@
         <!-- for file search -->
         <dependency conf="autopsy_core->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="11.2.1"/>
         
-        <dependency conf="autopsy_core->default" org="commons-codec" name="commons-codec" rev="1.15"/>
+        <dependency conf="autopsy_core->default" org="commons-codec" name="commons-codec" rev="1.17.1"/>
 
         <!-- Google dependencies (translate needs to be kept with guava because translate depends on guava)-->
-        <dependency conf="autopsy_core->default" org="com.google.cloud" name="google-cloud-translate" rev="2.1.11"/>
+        <dependency conf="autopsy_core->default" org="com.google.cloud" name="google-cloud-translate" rev="2.54.0"/>
         
         <!-- commmon -->
-        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-lang3" rev="3.12.0"/>
-        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-csv" rev="1.9.0"/>
-        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-text" rev="1.10.0"/>
+        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-lang3" rev="3.17.0"/>
+        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-csv" rev="1.12.0"/>
+        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-text" rev="1.13.0"/>
     
         <!-- keep old commons-lang because some deps may need it at runtime. 
         Note there is no namespace collision with ver 3 -->
         <dependency conf="autopsy_core->default" org="commons-lang" name="commons-lang" rev="2.6"/> 
-        <dependency conf="autopsy_core->default" org="commons-logging" name="commons-logging" rev="1.2"/>
-        <dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.11.0"/>
-        <dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.7"/>
-        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.4"/>
+        <dependency conf="autopsy_core->default" org="commons-logging" name="commons-logging" rev="1.3.4"/>
+        <dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.18.0"/>
+        <dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.9.0"/>
+        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.5.0-M2"/>
         <dependency conf="autopsy_core->default" org="commons-collections" name="commons-collections" rev="3.2.2"/>
 
         <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.4"/>
@@ -101,45 +103,45 @@
              
              https://github.com/controlsfx/controlsfx/issues/1241
         -->
-        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="11.1.2" />
+        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="11.2.1" />
 
-        <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.10.14" />
+        <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.13.0" />
 
         <!-- timeline  -->
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="17-r1" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="17-r1" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="17-r1" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="&jfxtras.version;" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="&jfxtras.version;" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="&jfxtras.version;" />
         <!-- templateing engine used by timeline to generate its snapshot report -->
-        <dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.10" />
+        <dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.14" />
         
         <!-- image support for autopsy and image gallery -->
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="3.8.2" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="3.8.2" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="&twelvemonkeys.version;" />
         <dependency conf="autopsy_core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/>
-        <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.23"/>
-        <dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="1.7.36"/>
+        <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.28"/>
+        <dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="2.0.16"/>
         
-        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-api" rev="2.17.2" transitive="false"/>
-        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="2.17.2" transitive="false"/>
+        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-api" rev="2.24.3" transitive="false"/>
+        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="2.24.3" transitive="false"/>
         
         <exclude org="*" ext="*" type="javadoc"/>
         <exclude org="log4j" module="log4j"/>
-
+<!-- 
         <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
         
         <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
@@ -147,8 +149,8 @@
         <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="&jackson.version;"/>
         <override org="com.fasterxml.jackson.core" module="jackson-core" rev="&jackson.version;"/>
         
-        <!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 -->
+        // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
         <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/>
+        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
     </dependencies>
 </ivy-module>
diff --git a/CoreTestLibs/ivy.xml b/CoreTestLibs/ivy.xml
index 7cbcd8e48d..4a8ad3cb43 100644
--- a/CoreTestLibs/ivy.xml
+++ b/CoreTestLibs/ivy.xml
@@ -5,9 +5,9 @@
     </configurations>
     <dependencies >
         <dependency conf="coretestlibs->default" org="org.mockito" name="mockito-core" rev="4.8.1"/>
-        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy" rev="1.12.18"/>
-        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.12.18"/>
-        <dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.3"/>
+        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy" rev="1.15.11"/>
+        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.15.11"/>
+        <dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.4"/>
         <dependency conf="coretestlibs->default" org="junit" name="junit" rev="4.13.2"/>
     </dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index a2bf2cb14c..9ea3eeee4a 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -1,5 +1,9 @@
 
-<ivy-module version="2.0">
+<!DOCTYPE ivy-module [
+    <!ENTITY version "2.0">
+    <!ENTITY jetty.version "12.0.16">
+    <!ENTITY slf4j.version "2.0.16">
+]>
     <info organisation="org.sleuthkit.autopsy" module="keywordsearch"/>
     <configurations >
         <!-- module dependencies -->
@@ -17,32 +21,31 @@
         <!-- Solr -->
 	    <dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.10.4" transitive="false" /> <!-- the war file for embedded Solr 4 -->
         
-        <dependency conf="solr-libs->default" name="solr-cell" rev="8.11.2" org="org.apache.solr"/>
+        <dependency conf="solr-libs->default" name="solr-cell" rev="8.11.4" org="org.apache.solr"/>
         <!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
-        <dependency conf="autopsy->default" org="org.apache.lucene" name="lucene-core" rev="8.11.2"/>     
+        <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.2"/>
-        <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>       
+        <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.4"/>
+        <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.4"/>       
         <!-- <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"/> -->
         
         <!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
-        <dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="70.1"/>
+        <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"/>
 
         <!-- Jetty -->
-		<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="11.0.15"/>
-        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="11.0.15"/>
-        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="11.0.15"/>
+		<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;"/>
+        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="&jetty.version;"/>
         <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
 
         <!-- logging -->
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="1.7.36"/>
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="1.7.36"/>
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="1.7.36"/> 
+        <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="&slf4j.version;"/>
+        <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="*" ext="*" type="javadoc"/>
         
         <override org="org.apache.logging.log4j" module="log4j-api" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-core" rev="2.17.2"/>
@@ -50,12 +53,12 @@
         <override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-web" rev="2.17.2"/>
-        <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
+        <override org="org.slf4j" module="slf4j-api" rev="&slf4j.version;"/>
 
         <override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
         <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
         <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
         <override org="com.google.guava" module="guava" rev="31.1-jre"/>
-        <override org="joda-time" module="joda-time" rev="2.10.14" />
+        <override org="joda-time" module="joda-time" rev="2.10.14" /> -->
     </dependencies>
 </ivy-module>
diff --git a/Tika/ivy.xml b/Tika/ivy.xml
index 62b93e7cae..58a7337faa 100755
--- a/Tika/ivy.xml
+++ b/Tika/ivy.xml
@@ -4,10 +4,10 @@
         <conf name="tika"/>
     </configurations>
     <dependencies >
-        <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers" rev="1.28.1"/>
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers" rev="3.0.0"/>
         <dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
         
-        <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
+        <!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
         <override org="org.apache.poi" module="poi-ooxml-schemas" rev="4.1.2"/>
         <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
         <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
@@ -16,9 +16,9 @@
         <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.15.2"/>
         <override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.15.2"/>
         
-        <!-- changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 -->
+        // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
         <override org="org.bouncycastle" module="bcmail-jdk15on" rev="1.70"/>
         <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/>
+        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
     </dependencies>
 </ivy-module>
diff --git a/thunderbirdparser/ivy.xml b/thunderbirdparser/ivy.xml
index df9efc8130..fce2d5e95e 100644
--- a/thunderbirdparser/ivy.xml
+++ b/thunderbirdparser/ivy.xml
@@ -7,9 +7,9 @@
      
     </configurations>
     <dependencies>
-        <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.4"/>
-        <dependency conf="autopsy->default" org="com.googlecode.ez-vcard" name="ez-vcard" rev="0.11.3"/>
-        <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/>
+        <dependency conf="autopsy->default" org="org.apache.james" name="apache-mime4j-mbox-iterator" rev="0.8.11"/>
+        <dependency conf="autopsy->default" org="com.googlecode.ez-vcard" name="ez-vcard" rev="0.12.1"/>
+        <!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
+        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/> -->
     </dependencies>
 </ivy-module>

From bf7ab84422c785cb8f7c2b84a5837f8c2c3b5223 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 17 Dec 2024 14:41:02 -0500
Subject: [PATCH 02/14] updates and fixes

---
 Core/ivy.xml                              |   2 +-
 Core/nbproject/project.properties         | 122 ++---
 Core/nbproject/project.xml                | 262 +++++------
 CoreLibs/nbproject/project.properties     | 250 +++++------
 CoreLibs/nbproject/project.xml            | 516 +++++++++++-----------
 CoreTestLibs/nbproject/project.properties |   6 +-
 CoreTestLibs/nbproject/project.xml        |  12 +-
 KeywordSearch/ivy.xml                     |   2 +-
 8 files changed, 586 insertions(+), 586 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index 3fe1576e97..8c9626fae5 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE ivy-module [
     <!ENTITY httpcomponents.version "4.5.14">
     <!ENTITY curator.version "5.7.1">
-    <!ENTITY batik.version "5.18">
+    <!ENTITY batik.version "1.18">
 ]>
 <ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="core"/>
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 927bf11766..6dff2bc257 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,106 +1,106 @@
-file.reference.activemq-all-5.16.4.jar=release/modules/ext/activemq-all-5.16.4.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.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar
-file.reference.batik-awt-util-1.14.jar=release/modules/ext/batik-awt-util-1.14.jar
-file.reference.batik-constants-1.14.jar=release/modules/ext/batik-constants-1.14.jar
-file.reference.batik-css-1.14.jar=release/modules/ext/batik-css-1.14.jar
-file.reference.batik-dom-1.14.jar=release/modules/ext/batik-dom-1.14.jar
-file.reference.batik-ext-1.14.jar=release/modules/ext/batik-ext-1.14.jar
-file.reference.batik-i18n-1.14.jar=release/modules/ext/batik-i18n-1.14.jar
-file.reference.batik-parser-1.14.jar=release/modules/ext/batik-parser-1.14.jar
-file.reference.batik-shared-resources-1.14.jar=release/modules/ext/batik-shared-resources-1.14.jar
-file.reference.batik-svg-dom-1.14.jar=release/modules/ext/batik-svg-dom-1.14.jar
-file.reference.batik-svggen-1.14.jar=release/modules/ext/batik-svggen-1.14.jar
-file.reference.batik-util-1.14.jar=release/modules/ext/batik-util-1.14.jar
-file.reference.batik-xml-1.14.jar=release/modules/ext/batik-xml-1.14.jar
-file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar
-file.reference.bcprov-ext-jdk15on-1.70.jar=release/modules/ext/bcprov-ext-jdk15on-1.70.jar
-file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar
-file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.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
+file.reference.batik-css-1.18.jar=release/modules/ext/batik-css-1.18.jar
+file.reference.batik-dom-1.18.jar=release/modules/ext/batik-dom-1.18.jar
+file.reference.batik-ext-1.18.jar=release/modules/ext/batik-ext-1.18.jar
+file.reference.batik-i18n-1.18.jar=release/modules/ext/batik-i18n-1.18.jar
+file.reference.batik-parser-1.18.jar=release/modules/ext/batik-parser-1.18.jar
+file.reference.batik-shared-resources-1.18.jar=release/modules/ext/batik-shared-resources-1.18.jar
+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.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.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar
-file.reference.commons-dbcp2-2.9.0.jar=release/modules/ext/commons-dbcp2-2.9.0.jar
-file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.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-lang3-3.10.jar=release/modules/ext/commons-lang3-3.10.jar
-file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
-file.reference.commons-pool2-2.10.0.jar=release/modules/ext/commons-pool2-2.10.0.jar
-file.reference.curator-client-5.2.1.jar=release/modules/ext/curator-client-5.2.1.jar
-file.reference.curator-framework-5.2.1.jar=release/modules/ext/curator-framework-5.2.1.jar
-file.reference.curator-recipes-5.2.1.jar=release/modules/ext/curator-recipes-5.2.1.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.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar
-file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.jar
+file.reference.guava-32.0.0-jre.jar=release/modules/ext/guava-32.0.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
 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-3.0.11.jar=release/modules/ext/istack-commons-runtime-3.0.11.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.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar
-file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.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-1.2.2.jar=release/modules/ext/jakarta.activation-1.2.2.jar
-file.reference.jakarta.xml.bind-api-2.3.3.jar=release/modules/ext/jakarta.xml.bind-api-2.3.3.jar
-file.reference.java-diff-utils-4.11.jar=release/modules/ext/java-diff-utils-4.11.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.transaction-api-1.3.3.jar=release/modules/ext/jakarta.transaction-api-1.3.3.jar
+file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar
+file.reference.java-diff-utils-4.15.jar=release/modules/ext/java-diff-utils-4.15.jar
 file.reference.javax.activation-api-1.2.0.jar=release/modules/ext/javax.activation-api-1.2.0.jar
 file.reference.javax.ws.rs-api-2.1.1.jar=release/modules/ext/javax.ws.rs-api-2.1.1.jar
 file.reference.jaxb-api-2.3.1.jar=release/modules/ext/jaxb-api-2.3.1.jar
-file.reference.jaxb-runtime-2.3.3.jar=release/modules/ext/jaxb-runtime-2.3.3.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.jfreechart-1.5.3.jar=release/modules/ext/jfreechart-1.5.3.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.16.1.jar=release/modules/ext/jsoup-1.16.1.jar
+file.reference.jsoup-1.18.3.jar=release/modules/ext/jsoup-1.18.3.jar
 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.6.jar=release/modules/ext/jxmapviewer2-2.6.jar
-file.reference.jython-standalone-2.7.2.jar=release/modules/ext/jython-standalone-2.7.2.jar
-file.reference.libphonenumber-8.12.45.jar=release/modules/ext/libphonenumber-8.12.45.jar
-file.reference.license4j-runtime-library-4.7.1.jar=release/modules/ext/license4j-runtime-library-4.7.1.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.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
-file.reference.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar
-file.reference.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar
 file.reference.mchange-commons-java-0.3.0.jar=release/modules/ext/mchange-commons-java-0.3.0.jar
-file.reference.metadata-extractor-2.18.0.jar=release/modules/ext/metadata-extractor-2.18.0.jar
-file.reference.netty-buffer-4.1.73.Final.jar=release/modules/ext/netty-buffer-4.1.73.Final.jar
-file.reference.netty-codec-4.1.73.Final.jar=release/modules/ext/netty-codec-4.1.73.Final.jar
-file.reference.netty-common-4.1.73.Final.jar=release/modules/ext/netty-common-4.1.73.Final.jar
-file.reference.netty-handler-4.1.73.Final.jar=release/modules/ext/netty-handler-4.1.73.Final.jar
-file.reference.netty-resolver-4.1.73.Final.jar=release/modules/ext/netty-resolver-4.1.73.Final.jar
-file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.Final.jar
-file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar
-file.reference.netty-transport-4.1.73.Final.jar=release/modules/ext/netty-transport-4.1.73.Final.jar
-file.reference.netty-transport-classes-epoll-4.1.73.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.73.Final.jar
-file.reference.netty-transport-native-epoll-4.1.73.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.73.Final.jar
-file.reference.netty-transport-native-unix-common-4.1.73.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.73.Final.jar
+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-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.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-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.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.serializer-2.7.2.jar=release/modules/ext/serializer-2.7.2.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.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
-file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.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.6.0.jar=release/modules/ext/spotbugs-annotations-4.6.0.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-2.3.3.jar=release/modules/ext/txw2-2.3.3.jar
-file.reference.xalan-2.7.2.jar=release/modules/ext/xalan-2.7.2.jar
+file.reference.txw2-4.0.5.jar=release/modules/ext/txw2-4.0.5.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.6.jar=release/modules/ext/xmlgraphics-commons-2.6.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.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar
-file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.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.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 7db7273bc1..deb06cbb28 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -370,76 +370,80 @@
                 <package>org.sleuthkit.datamodel.blackboardutils.attributes</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/activemq-all-5.16.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/activemq-all-5.16.4.jar</binary-origin>
+                <runtime-relative-path>ext/activemq-all-6.1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/activemq-all-6.1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <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/audience-annotations-0.12.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/audience-annotations-0.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-awt-util-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-awt-util-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-awt-util-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-awt-util-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-constants-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-constants-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-constants-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-constants-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-css-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-css-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-css-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-css-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-dom-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-dom-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-dom-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-dom-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-ext-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-ext-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-ext-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-ext-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-i18n-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-i18n-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-i18n-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-i18n-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-parser-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-parser-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-parser-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-parser-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-shared-resources-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-shared-resources-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-shared-resources-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-shared-resources-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-svg-dom-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-svg-dom-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-svg-dom-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-svg-dom-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-svggen-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-svggen-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-svggen-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-svggen-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-util-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-util-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-util-1.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-util-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-xml-1.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/batik-xml-1.14.jar</binary-origin>
+                <runtime-relative-path>ext/batik-xml-1.18.jar</runtime-relative-path>
+                <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.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcpkix-jdk15on-1.70.jar</binary-origin>
+                <runtime-relative-path>ext/bcpkix-jdk15on-1.54.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcpkix-jdk15on-1.54.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-ext-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-ext-jdk15on-1.70.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-jdk15on-1.70.jar</binary-origin>
+                <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/bcutil-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcutil-jdk15on-1.70.jar</binary-origin>
+                <runtime-relative-path>ext/bcprov-jdk18on-1.72.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcprov-jdk18on-1.72.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/c3p0-0.9.5.5.jar</runtime-relative-path>
@@ -454,36 +458,36 @@
                 <binary-origin>release/modules/ext/commons-codec-1.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-dbcp2-2.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-dbcp2-2.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-dbcp2-2.13.0.jar</runtime-relative-path>
+                <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.11.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-io-2.11.0.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang3-3.10.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-lang3-3.10.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.2.jar</binary-origin>
+                <runtime-relative-path>ext/commons-logging-1.3.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.3.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-pool2-2.10.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-pool2-2.10.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-pool2-2.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-pool2-2.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/curator-client-5.2.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/curator-client-5.2.1.jar</binary-origin>
+                <runtime-relative-path>ext/curator-client-5.7.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-client-5.7.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/curator-framework-5.2.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/curator-framework-5.2.1.jar</binary-origin>
+                <runtime-relative-path>ext/curator-framework-5.7.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-framework-5.7.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/curator-recipes-5.2.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/curator-recipes-5.2.1.jar</binary-origin>
+                <runtime-relative-path>ext/curator-recipes-5.7.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-recipes-5.7.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/DatCon.jar</runtime-relative-path>
@@ -502,8 +506,8 @@
                 <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.1-jre.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-32.0.1-jre.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/httpclient-4.5.14.jar</runtime-relative-path>
@@ -530,20 +534,20 @@
                 <binary-origin>release/modules/ext/icepdf-viewer-6.2.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/istack-commons-runtime-3.0.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/istack-commons-runtime-3.0.11.jar</binary-origin>
+                <runtime-relative-path>ext/istack-commons-runtime-4.1.2.jar</runtime-relative-path>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackcess-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackcess-4.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-4.0.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-4.0.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackcess-encrypt-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackcess-encrypt-4.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-encrypt-4.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-encrypt-4.0.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jai_core-1.1.3.jar</runtime-relative-path>
@@ -554,16 +558,24 @@
                 <binary-origin>release/modules/ext/jai_imageio-1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jakarta.activation-1.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.activation-1.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/jakarta.activation-api-2.1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jakarta.activation-api-2.1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jakarta.xml.bind-api-2.3.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.xml.bind-api-2.3.3.jar</binary-origin>
+                <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/java-diff-utils-4.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/java-diff-utils-4.11.jar</binary-origin>
+                <runtime-relative-path>ext/jakarta.transaction-api-1.3.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jakarta.transaction-api-1.3.3.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jakarta.xml.bind-api-4.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jakarta.xml.bind-api-4.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/java-diff-utils-4.15.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/java-diff-utils-4.15.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.activation-api-1.2.0.jar</runtime-relative-path>
@@ -578,8 +590,12 @@
                 <binary-origin>release/modules/ext/jaxb-api-2.3.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jaxb-runtime-2.3.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jaxb-runtime-2.3.3.jar</binary-origin>
+                <runtime-relative-path>ext/jaxb-core-4.0.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jaxb-core-4.0.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jaxb-runtime-4.0.5.jar</runtime-relative-path>
+                <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>
@@ -590,16 +606,16 @@
                 <binary-origin>release/modules/ext/jdom-2.0.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jfreechart-1.5.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jfreechart-1.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/jfreechart-1.5.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jfreechart-1.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jgraphx-4.2.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jgraphx-4.2.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jsoup-1.16.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jsoup-1.16.1.jar</binary-origin>
+                <runtime-relative-path>ext/jsoup-1.18.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsoup-1.18.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
@@ -610,84 +626,76 @@
                 <binary-origin>release/modules/ext/jutf7-1.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jxmapviewer2-2.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jxmapviewer2-2.6.jar</binary-origin>
+                <runtime-relative-path>ext/jxmapviewer2-2.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jxmapviewer2-2.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jython-standalone-2.7.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jython-standalone-2.7.2.jar</binary-origin>
+                <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/libphonenumber-8.12.45.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/libphonenumber-8.12.45.jar</binary-origin>
+                <runtime-relative-path>ext/libphonenumber-8.13.52.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/libphonenumber-8.13.52.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/license4j-runtime-library-4.7.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/license4j-runtime-library-4.7.1.jar</binary-origin>
+                <runtime-relative-path>ext/license4j-runtime-library-4.7.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/license4j-runtime-library-4.7.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/listenablefuture-1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/listenablefuture-1.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/logback-classic-1.2.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/logback-classic-1.2.10.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/logback-core-1.2.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/logback-core-1.2.10.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/mchange-commons-java-0.3.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/mchange-commons-java-00.3.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/mchange-commons-java-0.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/metadata-extractor-2.18.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/metadata-extractor-2.18.0.jar</binary-origin>
+                <runtime-relative-path>ext/metadata-extractor-2.19.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/metadata-extractor-2.19.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-buffer-4.1.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-buffer-4.1.73.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.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-codec-4.1.73.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.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-common-4.1.73.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-handler-4.1.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-handler-4.1.73.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.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-resolver-4.1.73.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-tcnative-2.0.48.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-tcnative-2.0.48.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-tcnative-classes-2.0.48.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-tcnative-classes-2.0.48.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-4.1.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-4.1.73.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-classes-epoll-4.1.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-classes-epoll-4.1.73.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-native-epoll-4.1.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.73.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-native-unix-common-4.1.73.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.73.Final.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/okhttp-2.7.5.jar</runtime-relative-path>
@@ -705,10 +713,6 @@
                 <runtime-relative-path>ext/Rejistry-1.1-SNAPSHOT.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/Rejistry-1.1-SNAPSHOT.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/serializer-2.7.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/serializer-2.7.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
@@ -726,32 +730,28 @@
                 <binary-origin>release/modules/ext/sleuthkit-caseuco-4.12.1.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/slf4j-api-1.7.30.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.7.30.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/snakeyaml-2.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/snakeyaml-2.0.jar</binary-origin>
+                <runtime-relative-path>ext/snakeyaml-2.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/snakeyaml-2.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/SparseBitSet-1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/SparseBitSet-1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/spotbugs-annotations-4.6.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/spotbugs-annotations-4.6.0.jar</binary-origin>
+                <runtime-relative-path>ext/spotbugs-annotations-4.8.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/spotbugs-annotations-4.8.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sqlite-jdbc-3.47.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sqlite-jdbc-3.47.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/txw2-2.3.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/txw2-2.3.3.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xalan-2.7.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xalan-2.7.2.jar</binary-origin>
+                <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/xml-apis-1.4.01.jar</runtime-relative-path>
@@ -762,8 +762,8 @@
                 <binary-origin>release/modules/ext/xml-apis-ext-1.3.04.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmlgraphics-commons-2.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlgraphics-commons-2.6.jar</binary-origin>
+                <runtime-relative-path>ext/xmlgraphics-commons-2.10.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlgraphics-commons-2.10.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/xmpcore-6.1.11.jar</runtime-relative-path>
@@ -774,12 +774,12 @@
                 <binary-origin>release/modules/ext/YaraJNIWrapper.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/zookeeper-3.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-3.8.0.jar</binary-origin>
+                <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.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-jute-3.8.0.jar</binary-origin>
+                <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/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 3dcee33819..6b71060122 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -1,118 +1,119 @@
-file.reference.animal-sniffer-annotations-1.21.jar=release/modules/ext/animal-sniffer-annotations-1.21.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.12.jar=release/modules/ext/ant-1.10.12.jar
-file.reference.ant-launcher-1.10.12.jar=release/modules/ext/ant-launcher-1.10.12.jar
-file.reference.api-common-2.1.4.jar=release/modules/ext/api-common-2.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.9.jar=release/modules/ext/auto-value-annotations-1.9.jar
-file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar
-file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar
-file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.jar
-file.reference.checker-qual-3.21.3.jar=release/modules/ext/checker-qual-3.21.3.jar
-file.reference.common-image-3.8.2.jar=release/modules/ext/common-image-3.8.2.jar
-file.reference.common-io-3.8.2.jar=release/modules/ext/common-io-3.8.2.jar
-file.reference.common-lang-3.8.2.jar=release/modules/ext/common-lang-3.8.2.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
+file.reference.common-io-3.12.0.jar=release/modules/ext/common-io-3.12.0.jar
+file.reference.common-lang-3.12.0.jar=release/modules/ext/common-lang-3.12.0.jar
 file.reference.commons-beanutils-1.9.4.jar=release/modules/ext/commons-beanutils-1.9.4.jar
-file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.jar
+file.reference.commons-codec-1.17.1.jar=release/modules/ext/commons-codec-1.17.1.jar
 file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar
-file.reference.commons-collections4-4.4.jar=release/modules/ext/commons-collections4-4.4.jar
-file.reference.commons-csv-1.9.0.jar=release/modules/ext/commons-csv-1.9.0.jar
+file.reference.commons-collections4-4.5.0-M2.jar=release/modules/ext/commons-collections4-4.5.0-M2.jar
+file.reference.commons-csv-1.12.0.jar=release/modules/ext/commons-csv-1.12.0.jar
 file.reference.commons-digester-2.1.jar=release/modules/ext/commons-digester-2.1.jar
-file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar
+file.reference.commons-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar
 file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
-file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar
-file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
-file.reference.commons-text-1.10.0.jar=release/modules/ext/commons-text-1.10.0.jar
-file.reference.commons-validator-1.7.jar=release/modules/ext/commons-validator-1.7.jar
-file.reference.compiler-0.9.10.jar=release/modules/ext/compiler-0.9.10.jar
-file.reference.conscrypt-openjdk-uber-2.5.1.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar
-file.reference.controlsfx-11.1.2-sources.jar=release/modules/ext/controlsfx-11.1.2-sources.jar
-file.reference.controlsfx-11.1.2.jar=release/modules/ext/controlsfx-11.1.2.jar
-file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar
-file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar
-file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar
-file.reference.gax-2.12.2.jar=release/modules/ext/gax-2.12.2.jar
-file.reference.gax-grpc-2.12.2.jar=release/modules/ext/gax-grpc-2.12.2.jar
-file.reference.gax-httpjson-0.97.2.jar=release/modules/ext/gax-httpjson-0.97.2.jar
-file.reference.google-api-client-1.33.2.jar=release/modules/ext/google-api-client-1.33.2.jar
-file.reference.google-api-services-translate-v2-rev20170525-1.32.1.jar=release/modules/ext/google-api-services-translate-v2-rev20170525-1.32.1.jar
-file.reference.google-auth-library-credentials-1.5.3.jar=release/modules/ext/google-auth-library-credentials-1.5.3.jar
-file.reference.google-auth-library-oauth2-http-1.5.3.jar=release/modules/ext/google-auth-library-oauth2-http-1.5.3.jar
-file.reference.google-cloud-core-2.5.6.jar=release/modules/ext/google-cloud-core-2.5.6.jar
-file.reference.google-cloud-core-http-2.5.6.jar=release/modules/ext/google-cloud-core-http-2.5.6.jar
-file.reference.google-cloud-translate-2.1.11.jar=release/modules/ext/google-cloud-translate-2.1.11.jar
-file.reference.google-http-client-1.41.4.jar=release/modules/ext/google-http-client-1.41.4.jar
-file.reference.google-http-client-apache-v2-1.41.4.jar=release/modules/ext/google-http-client-apache-v2-1.41.4.jar
-file.reference.google-http-client-appengine-1.41.4.jar=release/modules/ext/google-http-client-appengine-1.41.4.jar
-file.reference.google-http-client-gson-1.41.4.jar=release/modules/ext/google-http-client-gson-1.41.4.jar
-file.reference.google-http-client-jackson2-1.41.4.jar=release/modules/ext/google-http-client-jackson2-1.41.4.jar
-file.reference.google-oauth-client-1.33.1.jar=release/modules/ext/google-oauth-client-1.33.1.jar
-file.reference.grpc-alts-1.44.1.jar=release/modules/ext/grpc-alts-1.44.1.jar
-file.reference.grpc-api-1.44.1.jar=release/modules/ext/grpc-api-1.44.1.jar
-file.reference.grpc-auth-1.44.1.jar=release/modules/ext/grpc-auth-1.44.1.jar
-file.reference.grpc-context-1.44.1.jar=release/modules/ext/grpc-context-1.44.1.jar
-file.reference.grpc-core-1.44.1.jar=release/modules/ext/grpc-core-1.44.1.jar
-file.reference.grpc-grpclb-1.44.1.jar=release/modules/ext/grpc-grpclb-1.44.1.jar
-file.reference.grpc-netty-shaded-1.44.1.jar=release/modules/ext/grpc-netty-shaded-1.44.1.jar
-file.reference.grpc-protobuf-1.44.1.jar=release/modules/ext/grpc-protobuf-1.44.1.jar
-file.reference.grpc-protobuf-lite-1.44.1.jar=release/modules/ext/grpc-protobuf-lite-1.44.1.jar
-file.reference.grpc-services-1.44.1.jar=release/modules/ext/grpc-services-1.44.1.jar
-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.commons-lang3-3.17.0.jar=release/modules/ext/commons-lang3-3.17.0.jar
+file.reference.commons-logging-1.3.4.jar=release/modules/ext/commons-logging-1.3.4.jar
+file.reference.commons-text-1.13.0.jar=release/modules/ext/commons-text-1.13.0.jar
+file.reference.commons-validator-1.9.0.jar=release/modules/ext/commons-validator-1.9.0.jar
+file.reference.compiler-0.9.14.jar=release/modules/ext/compiler-0.9.14.jar
+file.reference.conscrypt-openjdk-uber-2.5.2.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.2.jar
+file.reference.controlsfx-11.2.1-sources.jar=release/modules/ext/controlsfx-11.2.1-sources.jar
+file.reference.controlsfx-11.2.1.jar=release/modules/ext/controlsfx-11.2.1.jar
+file.reference.dd-plist-1.28.jar=release/modules/ext/dd-plist-1.28.jar
+file.reference.error_prone_annotations-2.35.1.jar=release/modules/ext/error_prone_annotations-2.35.1.jar
+file.reference.failureaccess-1.0.2.jar=release/modules/ext/failureaccess-1.0.2.jar
+file.reference.gax-2.58.0.jar=release/modules/ext/gax-2.58.0.jar
+file.reference.gax-grpc-2.58.0.jar=release/modules/ext/gax-grpc-2.58.0.jar
+file.reference.gax-httpjson-2.58.0.jar=release/modules/ext/gax-httpjson-2.58.0.jar
+file.reference.google-api-client-2.7.0.jar=release/modules/ext/google-api-client-2.7.0.jar
+file.reference.google-api-services-translate-v2-rev20170525-2.0.0.jar=release/modules/ext/google-api-services-translate-v2-rev20170525-2.0.0.jar
+file.reference.google-auth-library-credentials-1.30.0.jar=release/modules/ext/google-auth-library-credentials-1.30.0.jar
+file.reference.google-auth-library-oauth2-http-1.30.0.jar=release/modules/ext/google-auth-library-oauth2-http-1.30.0.jar
+file.reference.google-cloud-core-2.48.0.jar=release/modules/ext/google-cloud-core-2.48.0.jar
+file.reference.google-cloud-core-http-2.48.0.jar=release/modules/ext/google-cloud-core-http-2.48.0.jar
+file.reference.google-cloud-translate-2.54.0.jar=release/modules/ext/google-cloud-translate-2.54.0.jar
+file.reference.google-http-client-1.45.0.jar=release/modules/ext/google-http-client-1.45.0.jar
+file.reference.google-http-client-apache-v2-1.45.0.jar=release/modules/ext/google-http-client-apache-v2-1.45.0.jar
+file.reference.google-http-client-appengine-1.45.0.jar=release/modules/ext/google-http-client-appengine-1.45.0.jar
+file.reference.google-http-client-gson-1.45.0.jar=release/modules/ext/google-http-client-gson-1.45.0.jar
+file.reference.google-http-client-jackson2-1.45.0.jar=release/modules/ext/google-http-client-jackson2-1.45.0.jar
+file.reference.google-oauth-client-1.36.0.jar=release/modules/ext/google-oauth-client-1.36.0.jar
+file.reference.grpc-alts-1.68.1.jar=release/modules/ext/grpc-alts-1.68.1.jar
+file.reference.grpc-api-1.68.1.jar=release/modules/ext/grpc-api-1.68.1.jar
+file.reference.grpc-auth-1.68.1.jar=release/modules/ext/grpc-auth-1.68.1.jar
+file.reference.grpc-context-1.68.1.jar=release/modules/ext/grpc-context-1.68.1.jar
+file.reference.grpc-core-1.68.1.jar=release/modules/ext/grpc-core-1.68.1.jar
+file.reference.grpc-googleapis-1.68.1.jar=release/modules/ext/grpc-googleapis-1.68.1.jar
+file.reference.grpc-grpclb-1.68.1.jar=release/modules/ext/grpc-grpclb-1.68.1.jar
+file.reference.grpc-inprocess-1.68.1.jar=release/modules/ext/grpc-inprocess-1.68.1.jar
+file.reference.grpc-netty-shaded-1.68.1.jar=release/modules/ext/grpc-netty-shaded-1.68.1.jar
+file.reference.grpc-protobuf-1.68.1.jar=release/modules/ext/grpc-protobuf-1.68.1.jar
+file.reference.grpc-protobuf-lite-1.68.1.jar=release/modules/ext/grpc-protobuf-lite-1.68.1.jar
+file.reference.grpc-s2a-1.68.1.jar=release/modules/ext/grpc-s2a-1.68.1.jar
+file.reference.grpc-services-1.68.1.jar=release/modules/ext/grpc-services-1.68.1.jar
+file.reference.grpc-stub-1.68.1.jar=release/modules/ext/grpc-stub-1.68.1.jar
+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-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.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
-file.reference.imageio-core-3.8.2.jar=release/modules/ext/imageio-core-3.8.2.jar
-file.reference.imageio-icns-3.8.2.jar=release/modules/ext/imageio-icns-3.8.2.jar
-file.reference.imageio-iff-3.8.2.jar=release/modules/ext/imageio-iff-3.8.2.jar
-file.reference.imageio-jpeg-3.8.2.jar=release/modules/ext/imageio-jpeg-3.8.2.jar
-file.reference.imageio-metadata-3.8.2.jar=release/modules/ext/imageio-metadata-3.8.2.jar
-file.reference.imageio-pcx-3.8.2.jar=release/modules/ext/imageio-pcx-3.8.2.jar
-file.reference.imageio-pict-3.8.2.jar=release/modules/ext/imageio-pict-3.8.2.jar
-file.reference.imageio-pnm-3.8.2.jar=release/modules/ext/imageio-pnm-3.8.2.jar
-file.reference.imageio-psd-3.8.2.jar=release/modules/ext/imageio-psd-3.8.2.jar
-file.reference.imageio-sgi-3.8.2.jar=release/modules/ext/imageio-sgi-3.8.2.jar
-file.reference.imageio-tga-3.8.2.jar=release/modules/ext/imageio-tga-3.8.2.jar
-file.reference.imageio-thumbsdb-3.8.2.jar=release/modules/ext/imageio-thumbsdb-3.8.2.jar
-file.reference.imageio-tiff-3.8.2.jar=release/modules/ext/imageio-tiff-3.8.2.jar
+file.reference.guava-33.3.1-jre.jar=release/modules/ext/guava-33.3.1-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
+file.reference.imageio-core-3.12.0.jar=release/modules/ext/imageio-core-3.12.0.jar
+file.reference.imageio-icns-3.12.0.jar=release/modules/ext/imageio-icns-3.12.0.jar
+file.reference.imageio-iff-3.12.0.jar=release/modules/ext/imageio-iff-3.12.0.jar
+file.reference.imageio-jpeg-3.12.0.jar=release/modules/ext/imageio-jpeg-3.12.0.jar
+file.reference.imageio-metadata-3.12.0.jar=release/modules/ext/imageio-metadata-3.12.0.jar
+file.reference.imageio-pcx-3.12.0.jar=release/modules/ext/imageio-pcx-3.12.0.jar
+file.reference.imageio-pict-3.12.0.jar=release/modules/ext/imageio-pict-3.12.0.jar
+file.reference.imageio-pnm-3.12.0.jar=release/modules/ext/imageio-pnm-3.12.0.jar
+file.reference.imageio-psd-3.12.0.jar=release/modules/ext/imageio-psd-3.12.0.jar
+file.reference.imageio-sgi-3.12.0.jar=release/modules/ext/imageio-sgi-3.12.0.jar
+file.reference.imageio-tga-3.12.0.jar=release/modules/ext/imageio-tga-3.12.0.jar
+file.reference.imageio-thumbsdb-3.12.0.jar=release/modules/ext/imageio-thumbsdb-3.12.0.jar
+file.reference.imageio-tiff-3.12.0.jar=release/modules/ext/imageio-tiff-3.12.0.jar
 file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar
-file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar
-file.reference.jackson-annotations-2.15.2.jar=release/modules/ext/jackson-annotations-2.15.2.jar
-file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar
-file.reference.jackson-databind-2.15.2.jar=release/modules/ext/jackson-databind-2.15.2.jar
-file.reference.jackson-dataformat-csv-2.15.2.jar=release/modules/ext/jackson-dataformat-csv-2.15.2.jar
-file.reference.jackson-datatype-jsr310-2.15.2.jar=release/modules/ext/jackson-datatype-jsr310-2.15.2.jar
-file.reference.javafx-base-17.0.7-linux.jar=release/modules/ext/javafx-base-17.0.7-linux.jar
-file.reference.javafx-base-17.0.7-mac.jar=release/modules/ext/javafx-base-17.0.7-mac.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-linux.jar=release/modules/ext/javafx-controls-17.0.7-linux.jar
-file.reference.javafx-controls-17.0.7-mac.jar=release/modules/ext/javafx-controls-17.0.7-mac.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-linux.jar=release/modules/ext/javafx-fxml-17.0.7-linux.jar
-file.reference.javafx-fxml-17.0.7-mac.jar=release/modules/ext/javafx-fxml-17.0.7-mac.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-linux.jar=release/modules/ext/javafx-graphics-17.0.7-linux.jar
-file.reference.javafx-graphics-17.0.7-mac.jar=release/modules/ext/javafx-graphics-17.0.7-mac.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-linux.jar=release/modules/ext/javafx-media-17.0.7-linux.jar
-file.reference.javafx-media-17.0.7-mac.jar=release/modules/ext/javafx-media-17.0.7-mac.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-linux.jar=release/modules/ext/javafx-swing-17.0.7-linux.jar
-file.reference.javafx-swing-17.0.7-mac.jar=release/modules/ext/javafx-swing-17.0.7-mac.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-linux.jar=release/modules/ext/javafx-web-17.0.7-linux.jar
-file.reference.javafx-web-17.0.7-mac.jar=release/modules/ext/javafx-web-17.0.7-mac.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.j2objc-annotations-3.0.0.jar=release/modules/ext/j2objc-annotations-3.0.0.jar
+file.reference.jackson-annotations-2.18.2.jar=release/modules/ext/jackson-annotations-2.18.2.jar
+file.reference.jackson-core-2.18.2.jar=release/modules/ext/jackson-core-2.18.2.jar
+file.reference.jackson-databind-2.18.2.jar=release/modules/ext/jackson-databind-2.18.2.jar
+file.reference.jackson-dataformat-csv-2.18.2.jar=release/modules/ext/jackson-dataformat-csv-2.18.2.jar
+file.reference.jackson-datatype-jsr310-2.18.2.jar=release/modules/ext/jackson-datatype-jsr310-2.18.2.jar
+file.reference.javafx-base-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-base-17.0.14-ea+2-linux.jar
+file.reference.javafx-base-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-base-17.0.14-ea+2-mac.jar
+file.reference.javafx-base-17.0.14-ea+2-win.jar=release/modules/ext/javafx-base-17.0.14-ea+2-win.jar
+file.reference.javafx-base-17.0.14-ea+2.jar=release/modules/ext/javafx-base-17.0.14-ea+2.jar
+file.reference.javafx-controls-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-controls-17.0.14-ea+2-linux.jar
+file.reference.javafx-controls-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-controls-17.0.14-ea+2-mac.jar
+file.reference.javafx-controls-17.0.14-ea+2-win.jar=release/modules/ext/javafx-controls-17.0.14-ea+2-win.jar
+file.reference.javafx-controls-17.0.14-ea+2.jar=release/modules/ext/javafx-controls-17.0.14-ea+2.jar
+file.reference.javafx-fxml-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2-linux.jar
+file.reference.javafx-fxml-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2-mac.jar
+file.reference.javafx-fxml-17.0.14-ea+2-win.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2-win.jar
+file.reference.javafx-fxml-17.0.14-ea+2.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2.jar
+file.reference.javafx-graphics-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2-linux.jar
+file.reference.javafx-graphics-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2-mac.jar
+file.reference.javafx-graphics-17.0.14-ea+2-win.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2-win.jar
+file.reference.javafx-graphics-17.0.14-ea+2.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2.jar
+file.reference.javafx-media-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-media-17.0.14-ea+2-linux.jar
+file.reference.javafx-media-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-media-17.0.14-ea+2-mac.jar
+file.reference.javafx-media-17.0.14-ea+2-win.jar=release/modules/ext/javafx-media-17.0.14-ea+2-win.jar
+file.reference.javafx-media-17.0.14-ea+2.jar=release/modules/ext/javafx-media-17.0.14-ea+2.jar
+file.reference.javafx-swing-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-swing-17.0.14-ea+2-linux.jar
+file.reference.javafx-swing-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-swing-17.0.14-ea+2-mac.jar
+file.reference.javafx-swing-17.0.14-ea+2-win.jar=release/modules/ext/javafx-swing-17.0.14-ea+2-win.jar
+file.reference.javafx-swing-17.0.14-ea+2.jar=release/modules/ext/javafx-swing-17.0.14-ea+2.jar
+file.reference.javafx-web-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-web-17.0.14-ea+2-linux.jar
+file.reference.javafx-web-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-web-17.0.14-ea+2-mac.jar
+file.reference.javafx-web-17.0.14-ea+2-win.jar=release/modules/ext/javafx-web-17.0.14-ea+2-win.jar
+file.reference.javafx-web-17.0.14-ea+2.jar=release/modules/ext/javafx-web-17.0.14-ea+2.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
@@ -120,28 +121,27 @@ file.reference.jfxtras-controls-17-r1.jar=release/modules/ext/jfxtras-controls-1
 file.reference.jfxtras-fxml-17-r1.jar=release/modules/ext/jfxtras-fxml-17-r1.jar
 file.reference.jna-5.15.0.jar=release/modules/ext/jna-5.15.0.jar
 file.reference.jna-platform-5.15.0.jar=release/modules/ext/jna-platform-5.15.0.jar
-file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.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.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
-file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar
-file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.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
+file.reference.opencensus-api-0.31.1.jar=release/modules/ext/opencensus-api-0.31.1.jar
+file.reference.opencensus-contrib-http-util-0.31.1.jar=release/modules/ext/opencensus-contrib-http-util-0.31.1.jar
 file.reference.opencv-2413.jar=release/modules/ext/opencv-2413.jar
-file.reference.perfmark-api-0.23.0.jar=release/modules/ext/perfmark-api-0.23.0.jar
-file.reference.proto-google-cloud-translate-v3-2.1.11.jar=release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar
-file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar
-file.reference.proto-google-common-protos-2.7.4.jar=release/modules/ext/proto-google-common-protos-2.7.4.jar
-file.reference.proto-google-iam-v1-1.2.6.jar=release/modules/ext/proto-google-iam-v1-1.2.6.jar
-file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar
-file.reference.protobuf-java-util-3.19.4.jar=release/modules/ext/protobuf-java-util-3.19.4.jar
-file.reference.re2j-1.5.jar=release/modules/ext/re2j-1.5.jar
-file.reference.reload4j-1.2.19.jar=release/modules/ext/reload4j-1.2.19.jar
-file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
-file.reference.slf4j-reload4j-1.7.36.jar=release/modules/ext/slf4j-reload4j-1.7.36.jar
-file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar
+file.reference.perfmark-api-0.27.0.jar=release/modules/ext/perfmark-api-0.27.0.jar
+file.reference.proto-google-cloud-translate-v3-2.54.0.jar=release/modules/ext/proto-google-cloud-translate-v3-2.54.0.jar
+file.reference.proto-google-cloud-translate-v3beta1-0.136.0.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.136.0.jar
+file.reference.proto-google-common-protos-2.49.0.jar=release/modules/ext/proto-google-common-protos-2.49.0.jar
+file.reference.proto-google-iam-v1-1.44.0.jar=release/modules/ext/proto-google-iam-v1-1.44.0.jar
+file.reference.protobuf-java-3.25.5.jar=release/modules/ext/protobuf-java-3.25.5.jar
+file.reference.protobuf-java-util-3.25.5.jar=release/modules/ext/protobuf-java-util-3.25.5.jar
+file.reference.re2j-1.7.jar=release/modules/ext/re2j-1.7.jar
+file.reference.reload4j-1.2.22.jar=release/modules/ext/reload4j-1.2.22.jar
+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.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index ba5941acfb..74cd8450cc 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -561,464 +561,468 @@
                 <package>org.slf4j.spi</package>
             </public-packages>
             <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>
+                <runtime-relative-path>ext/animal-sniffer-annotations-1.24.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/animal-sniffer-annotations-1.24.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/annotations-4.1.1.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/annotations-4.1.1.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/ant-1.10.12.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/ant-1.10.12.jar</binary-origin>
+                <runtime-relative-path>ext/ant-1.10.15.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/ant-1.10.15.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/ant-launcher-1.10.12.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/ant-launcher-1.10.12.jar</binary-origin>
+                <runtime-relative-path>ext/ant-launcher-1.10.15.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/ant-launcher-1.10.15.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/api-common-2.1.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/api-common-2.1.4.jar</binary-origin>
+                <runtime-relative-path>ext/api-common-2.41.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/api-common-2.41.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/AppleJavaExtensions-1.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/auto-value-annotations-1.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/auto-value-annotations-1.9.jar</binary-origin>
+                <runtime-relative-path>ext/auto-value-annotations-1.11.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/auto-value-annotations-1.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcpkix-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcpkix-jdk15on-1.70.jar</binary-origin>
+                <runtime-relative-path>ext/checker-qual-3.47.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/checker-qual-3.47.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-jdk15on-1.70.jar</binary-origin>
+                <runtime-relative-path>ext/common-image-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/common-image-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcutil-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcutil-jdk15on-1.70.jar</binary-origin>
+                <runtime-relative-path>ext/common-io-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/common-io-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/checker-qual-3.21.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/checker-qual-3.21.3.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/common-image-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/common-image-3.8.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/common-io-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/common-io-3.8.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/common-lang-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/common-lang-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/common-lang-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/common-lang-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-beanutils-1.9.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-beanutils-1.9.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.15.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-codec-1.15.jar</binary-origin>
+                <runtime-relative-path>ext/commons-codec-1.17.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-codec-1.17.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-collections-3.2.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-collections-3.2.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-collections4-4.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-collections4-4.4.jar</binary-origin>
+                <runtime-relative-path>ext/commons-collections4-4.5.0-M2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-collections4-4.5.0-M2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-csv-1.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-csv-1.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-csv-1.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-csv-1.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-digester-2.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-digester-2.1.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/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-lang-2.6.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.12.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang3-3.12.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang3-3.17.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang3-3.17.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.2.jar</binary-origin>
+                <runtime-relative-path>ext/commons-logging-1.3.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.3.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-text-1.10.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-text-1.10.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-text-1.13.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-text-1.13.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-validator-1.7.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-validator-1.7.jar</binary-origin>
+                <runtime-relative-path>ext/commons-validator-1.9.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-validator-1.9.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/compiler-0.9.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/compiler-0.9.10.jar</binary-origin>
+                <runtime-relative-path>ext/compiler-0.9.14.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/compiler-0.9.14.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/conscrypt-openjdk-uber-2.5.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar</binary-origin>
+                <runtime-relative-path>ext/conscrypt-openjdk-uber-2.5.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/conscrypt-openjdk-uber-2.5.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/controlsfx-11.1.2-sources.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/controlsfx-11.1.2-sources.jar</binary-origin>
+                <runtime-relative-path>ext/controlsfx-11.2.1-sources.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/controlsfx-11.2.1-sources.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/controlsfx-11.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/controlsfx-11.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/controlsfx-11.2.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/controlsfx-11.2.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/dd-plist-1.23.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dd-plist-1.23.jar</binary-origin>
+                <runtime-relative-path>ext/dd-plist-1.28.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/dd-plist-1.28.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/error_prone_annotations-2.11.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/error_prone_annotations-2.11.0.jar</binary-origin>
+                <runtime-relative-path>ext/error_prone_annotations-2.35.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/error_prone_annotations-2.35.1.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>
+                <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/gax-2.12.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gax-2.12.2.jar</binary-origin>
+                <runtime-relative-path>ext/gax-2.58.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-2.58.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gax-grpc-2.12.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gax-grpc-2.12.2.jar</binary-origin>
+                <runtime-relative-path>ext/gax-grpc-2.58.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-grpc-2.58.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gax-httpjson-0.97.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gax-httpjson-0.97.2.jar</binary-origin>
+                <runtime-relative-path>ext/gax-httpjson-2.58.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-httpjson-2.58.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-api-client-1.33.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-api-client-1.33.2.jar</binary-origin>
+                <runtime-relative-path>ext/google-api-client-2.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-api-client-2.7.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-api-services-translate-v2-rev20170525-1.32.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-api-services-translate-v2-rev20170525-1.32.1.jar</binary-origin>
+                <runtime-relative-path>ext/google-api-services-translate-v2-rev20170525-2.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-api-services-translate-v2-rev20170525-2.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-auth-library-credentials-1.5.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-auth-library-credentials-1.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/google-auth-library-credentials-1.30.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-auth-library-credentials-1.30.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-auth-library-oauth2-http-1.5.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-auth-library-oauth2-http-1.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/google-auth-library-oauth2-http-1.30.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-auth-library-oauth2-http-1.30.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-core-2.5.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-cloud-core-2.5.6.jar</binary-origin>
+                <runtime-relative-path>ext/google-cloud-core-2.48.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-core-2.48.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-core-http-2.5.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-cloud-core-http-2.5.6.jar</binary-origin>
+                <runtime-relative-path>ext/google-cloud-core-http-2.48.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-core-http-2.48.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-translate-2.1.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-cloud-translate-2.1.11.jar</binary-origin>
+                <runtime-relative-path>ext/google-cloud-translate-2.54.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-translate-2.54.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-1.41.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-http-client-1.41.4.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-1.45.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-1.45.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-apache-v2-1.41.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-http-client-apache-v2-1.41.4.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-apache-v2-1.45.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-apache-v2-1.45.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-appengine-1.41.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-http-client-appengine-1.41.4.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-appengine-1.45.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-appengine-1.45.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-gson-1.41.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-http-client-gson-1.41.4.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-gson-1.45.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-gson-1.45.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-jackson2-1.41.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-http-client-jackson2-1.41.4.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-jackson2-1.45.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-jackson2-1.45.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-oauth-client-1.33.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/google-oauth-client-1.33.1.jar</binary-origin>
+                <runtime-relative-path>ext/google-oauth-client-1.36.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-oauth-client-1.36.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-alts-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-alts-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-alts-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-alts-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-api-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-api-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-api-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-api-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-auth-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-auth-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-auth-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-auth-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-context-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-context-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-context-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-context-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-core-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-core-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-core-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-core-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-grpclb-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-grpclb-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-googleapis-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-googleapis-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-netty-shaded-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-netty-shaded-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-grpclb-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-grpclb-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-protobuf-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-protobuf-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-inprocess-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-inprocess-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-protobuf-lite-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-protobuf-lite-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-netty-shaded-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-netty-shaded-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-services-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-services-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-protobuf-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-protobuf-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-stub-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-stub-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-protobuf-lite-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-protobuf-lite-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-xds-1.44.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grpc-xds-1.44.1.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-s2a-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-s2a-1.68.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gson-2.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gson-2.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-services-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-services-1.68.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/grpc-stub-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-stub-1.68.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/grpc-util-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-util-1.68.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/grpc-xds-1.68.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-xds-1.68.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gson-2.11.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gson-2.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/gst1-java-core-1.4.0.jar</runtime-relative-path>
                 <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-32.0.1-jre.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-32.0.1-jre.jar</binary-origin>
+                <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>
             </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>
+                <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/httpcore-4.4.15.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpcore-4.4.15.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/imageio-bmp-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-bmp-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-bmp-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-bmp-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-core-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-core-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-core-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-core-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-icns-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-icns-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-icns-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-icns-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-iff-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-iff-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-iff-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-iff-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-jpeg-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-jpeg-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-jpeg-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-jpeg-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-metadata-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-metadata-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-metadata-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-metadata-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-pcx-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-pcx-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-pcx-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-pcx-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-pict-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-pict-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-pict-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-pict-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-pnm-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-pnm-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-pnm-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-pnm-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-psd-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-psd-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-psd-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-psd-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-sgi-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-sgi-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-sgi-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-sgi-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-tga-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-tga-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-tga-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-tga-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-thumbsdb-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-thumbsdb-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-thumbsdb-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-thumbsdb-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/imageio-tiff-3.8.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/imageio-tiff-3.8.2.jar</binary-origin>
+                <runtime-relative-path>ext/imageio-tiff-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/imageio-tiff-3.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imgscalr-lib-4.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imgscalr-lib-4.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/j2objc-annotations-1.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/j2objc-annotations-1.3.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/jackson-annotations-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-annotations-2.15.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-annotations-2.18.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-annotations-2.18.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-core-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-core-2.15.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-core-2.18.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-core-2.18.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-databind-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-databind-2.15.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-databind-2.18.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-databind-2.18.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-dataformat-csv-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-dataformat-csv-2.15.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-dataformat-csv-2.18.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-dataformat-csv-2.18.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-datatype-jsr310-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-datatype-jsr310-2.15.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-datatype-jsr310-2.18.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-datatype-jsr310-2.18.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.7-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.7-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.7-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.7-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2-mac.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>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2-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>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.7-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.7-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.7-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.7-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2-mac.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>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2-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>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.7-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.7-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.7-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.7-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2-mac.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>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2-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>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.7-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.7-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.7-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.7-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2-mac.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>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2-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>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.7-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.7-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.7-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.7-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2-mac.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>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2-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>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.7-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.7-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.7-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.7-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2-mac.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>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2-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>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.7-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.7-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.7-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.7-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2-mac.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>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2-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>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
@@ -1049,8 +1053,8 @@
                 <binary-origin>release/modules/ext/jna-platform-5.15.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/joda-time-2.10.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/joda-time-2.10.14.jar</binary-origin>
+                <runtime-relative-path>ext/joda-time-2.13.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/joda-time-2.13.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
@@ -1065,76 +1069,72 @@
                 <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/log4j-api-2.17.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/log4j-api-2.17.2.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/log4j-core-2.17.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/log4j-core-2.17.2.jar</binary-origin>
+                <runtime-relative-path>ext/log4j-core-2.24.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/log4j-core-2.24.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/opencensus-api-0.31.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/opencensus-api-0.31.0.jar</binary-origin>
+                <runtime-relative-path>ext/opencensus-api-0.31.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/opencensus-api-0.31.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/opencensus-contrib-http-util-0.31.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/opencensus-contrib-http-util-0.31.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/opencensus-proto-0.2.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/opencensus-proto-0.2.0.jar</binary-origin>
+                <runtime-relative-path>ext/opencensus-contrib-http-util-0.31.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/opencensus-contrib-http-util-0.31.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opencv-2413.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opencv-2413.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/perfmark-api-0.23.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/perfmark-api-0.23.0.jar</binary-origin>
+                <runtime-relative-path>ext/perfmark-api-0.27.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/perfmark-api-0.27.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/proto-google-cloud-translate-v3-2.1.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar</binary-origin>
+                <runtime-relative-path>ext/proto-google-cloud-translate-v3-2.54.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/proto-google-cloud-translate-v3-2.54.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/proto-google-cloud-translate-v3beta1-0.83.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar</binary-origin>
+                <runtime-relative-path>ext/proto-google-cloud-translate-v3beta1-0.136.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/proto-google-cloud-translate-v3beta1-0.136.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/proto-google-common-protos-2.7.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/proto-google-common-protos-2.7.4.jar</binary-origin>
+                <runtime-relative-path>ext/proto-google-common-protos-2.49.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/proto-google-common-protos-2.49.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/proto-google-iam-v1-1.2.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/proto-google-iam-v1-1.2.6.jar</binary-origin>
+                <runtime-relative-path>ext/proto-google-iam-v1-1.44.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/proto-google-iam-v1-1.44.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/protobuf-java-3.19.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/protobuf-java-3.19.4.jar</binary-origin>
+                <runtime-relative-path>ext/protobuf-java-3.25.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/protobuf-java-3.25.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/protobuf-java-util-3.19.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/protobuf-java-util-3.19.4.jar</binary-origin>
+                <runtime-relative-path>ext/protobuf-java-util-3.25.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/protobuf-java-util-3.25.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/re2j-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/re2j-1.5.jar</binary-origin>
+                <runtime-relative-path>ext/re2j-1.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/re2j-1.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/reload4j-1.2.19.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/reload4j-1.2.19.jar</binary-origin>
+                <runtime-relative-path>ext/reload4j-1.2.22.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/reload4j-1.2.22.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/slf4j-api-2.0.16.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-2.0.16.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/slf4j-reload4j-1.7.36.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-reload4j-1.7.36.jar</binary-origin>
+                <runtime-relative-path>ext/slf4j-reload4j-2.0.16.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-reload4j-2.0.16.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/threetenbp-1.5.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/threetenbp-1.5.2.jar</binary-origin>
+                <runtime-relative-path>ext/threetenbp-1.7.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/threetenbp-1.7.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/webp-imageio-sejda-0.1.0.jar</runtime-relative-path>
diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties
index 6ea6cbac47..fed65b4808 100644
--- a/CoreTestLibs/nbproject/project.properties
+++ b/CoreTestLibs/nbproject/project.properties
@@ -1,8 +1,8 @@
-file.reference.byte-buddy-1.10.13.jar=release/modules/ext/byte-buddy-1.10.13.jar
-file.reference.byte-buddy-agent-1.10.13.jar=release/modules/ext/byte-buddy-agent-1.10.13.jar
+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.1.jar=release/modules/ext/objenesis-3.1.jar
+file.reference.objenesis-3.4.jar=release/modules/ext/objenesis-3.4.jar
 javac.source=11
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/CoreTestLibs/nbproject/project.xml b/CoreTestLibs/nbproject/project.xml
index 94d755e3b9..38125bd744 100644
--- a/CoreTestLibs/nbproject/project.xml
+++ b/CoreTestLibs/nbproject/project.xml
@@ -44,12 +44,12 @@
                 <package>org.junit.validator</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/byte-buddy-1.12.18.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/byte-buddy-1.12.18.jar</binary-origin>
+                <runtime-relative-path>ext/byte-buddy-1.15.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/byte-buddy-1.15.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/byte-buddy-agent-1.12.18.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/byte-buddy-agent-1.12.18.jar</binary-origin>
+                <runtime-relative-path>ext/byte-buddy-agent-1.15.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/byte-buddy-agent-1.15.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path>
@@ -64,8 +64,8 @@
                 <binary-origin>release/modules/ext/mockito-core-4.8.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/objenesis-3.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/objenesis-3.3.jar</binary-origin>
+                <runtime-relative-path>ext/objenesis-3.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/objenesis-3.4.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 9ea3eeee4a..a5e9af68a0 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -1,9 +1,9 @@
 
 <!DOCTYPE ivy-module [
-    <!ENTITY version "2.0">
     <!ENTITY jetty.version "12.0.16">
     <!ENTITY slf4j.version "2.0.16">
 ]>
+<ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="keywordsearch"/>
     <configurations >
         <!-- module dependencies -->

From 499fe3fb8b0fbbf3546887cd4f8677ab5edd6a68 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 3 Jan 2025 17:17:08 -0500
Subject: [PATCH 03/14] version updates

---
 Tika/ivy.xml                                  |   2 +-
 Tika/nbproject/project.properties             | 184 +++----
 Tika/nbproject/project.xml                    | 500 +++++++-----------
 .../netbeans/core/startup/Bundle.properties   |   4 +-
 .../core/windows/view/ui/Bundle.properties    |   6 +-
 5 files changed, 278 insertions(+), 418 deletions(-)

diff --git a/Tika/ivy.xml b/Tika/ivy.xml
index 58a7337faa..aae3f2492b 100755
--- a/Tika/ivy.xml
+++ b/Tika/ivy.xml
@@ -4,7 +4,7 @@
         <conf name="tika"/>
     </configurations>
     <dependencies >
-        <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers" rev="3.0.0"/>
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers-standard-package" rev="3.0.0"/>
         <dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
         
         <!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index e3794f4203..b4f8046180 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -1,120 +1,92 @@
-file.reference.apache-mime4j-core-0.8.4.jar=release/modules/ext/apache-mime4j-core-0.8.4.jar
-file.reference.apache-mime4j-dom-0.8.4.jar=release/modules/ext/apache-mime4j-dom-0.8.4.jar
-file.reference.asm-9.2.jar=release/modules/ext/asm-9.2.jar
-file.reference.bcmail-jdk15on-1.70.jar=release/modules/ext/bcmail-jdk15on-1.70.jar
-file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar
-file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar
-file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.jar
-file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar
-file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar
-file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar
-file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar
-file.reference.checker-qual-3.33.0.jar=release/modules/ext/checker-qual-3.33.0.jar
-file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.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.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
-file.reference.commons-compress-1.21.jar=release/modules/ext/commons-compress-1.21.jar
-file.reference.commons-csv-1.9.0.jar=release/modules/ext/commons-csv-1.9.0.jar
-file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar
-file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar
-file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar
-file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
+file.reference.commons-compress-1.27.1.jar=release/modules/ext/commons-compress-1.27.1.jar
+file.reference.commons-csv-1.12.0.jar=release/modules/ext/commons-csv-1.12.0.jar
+file.reference.commons-exec-1.4.0.jar=release/modules/ext/commons-exec-1.4.0.jar
+file.reference.commons-io-2.17.0.jar=release/modules/ext/commons-io-2.17.0.jar
+file.reference.commons-lang3-3.17.0.jar=release/modules/ext/commons-lang3-3.17.0.jar
+file.reference.commons-logging-1.3.4.jar=release/modules/ext/commons-logging-1.3.4.jar
 file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar
-file.reference.curvesapi-1.06.jar=release/modules/ext/curvesapi-1.06.jar
-file.reference.cxf-core-3.5.0.jar=release/modules/ext/cxf-core-3.5.0.jar
-file.reference.cxf-rt-frontend-jaxrs-3.5.0.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.5.0.jar
-file.reference.cxf-rt-rs-client-3.5.0.jar=release/modules/ext/cxf-rt-rs-client-3.5.0.jar
-file.reference.cxf-rt-security-3.5.0.jar=release/modules/ext/cxf-rt-security-3.5.0.jar
-file.reference.cxf-rt-transports-http-3.5.0.jar=release/modules/ext/cxf-rt-transports-http-3.5.0.jar
-file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar
+file.reference.curvesapi-1.08.jar=release/modules/ext/curvesapi-1.08.jar
+file.reference.dd-plist-1.28.jar=release/modules/ext/dd-plist-1.28.jar
 file.reference.dec-0.1.2.jar=release/modules/ext/dec-0.1.2.jar
-file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
-file.reference.error_prone_annotations-2.18.0.jar=release/modules/ext/error_prone_annotations-2.18.0.jar
-file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar
-file.reference.fontbox-2.0.25.jar=release/modules/ext/fontbox-2.0.25.jar
-file.reference.geoapi-3.0.1.jar=release/modules/ext/geoapi-3.0.1.jar
-file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar
-file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar
-file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.jar
-file.reference.HikariCP-java7-2.4.13.jar=release/modules/ext/HikariCP-java7-2.4.13.jar
-file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar
-file.reference.httpcore-4.4.13.jar=release/modules/ext/httpcore-4.4.13.jar
-file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar
-file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar
-file.reference.isoparser-1.9.41.7.jar=release/modules/ext/isoparser-1.9.41.7.jar
-file.reference.istack-commons-runtime-3.0.12.jar=release/modules/ext/istack-commons-runtime-3.0.12.jar
-file.reference.j2objc-annotations-2.8.jar=release/modules/ext/j2objc-annotations-2.8.jar
-file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar
-file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar
-file.reference.jackson-annotations-2.15.2.jar=release/modules/ext/jackson-annotations-2.15.2.jar
-file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar
-file.reference.jackson-databind-2.15.2.jar=release/modules/ext/jackson-databind-2.15.2.jar
+file.reference.fontbox-3.0.3.jar=release/modules/ext/fontbox-3.0.3.jar
+file.reference.istack-commons-runtime-4.1.2.jar=release/modules/ext/istack-commons-runtime-4.1.2.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.jackson-annotations-2.18.0.jar=release/modules/ext/jackson-annotations-2.18.0.jar
+file.reference.jackson-core-2.18.0.jar=release/modules/ext/jackson-core-2.18.0.jar
+file.reference.jackson-databind-2.18.0.jar=release/modules/ext/jackson-databind-2.18.0.jar
 file.reference.jai-imageio-core-1.4.0.jar=release/modules/ext/jai-imageio-core-1.4.0.jar
-file.reference.jakarta.activation-1.2.2.jar=release/modules/ext/jakarta.activation-1.2.2.jar
-file.reference.jakarta.activation-api-1.2.2.jar=release/modules/ext/jakarta.activation-api-1.2.2.jar
-file.reference.jakarta.annotation-api-1.3.5.jar=release/modules/ext/jakarta.annotation-api-1.3.5.jar
-file.reference.jakarta.ws.rs-api-2.1.6.jar=release/modules/ext/jakarta.ws.rs-api-2.1.6.jar
-file.reference.jakarta.xml.bind-api-2.3.3.jar=release/modules/ext/jakarta.xml.bind-api-2.3.3.jar
+file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar
+file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar
 file.reference.java-libpst-0.9.3.jar=release/modules/ext/java-libpst-0.9.3.jar
-file.reference.jaxb-runtime-2.3.5.jar=release/modules/ext/jaxb-runtime-2.3.5.jar
-file.reference.jbig2-imageio-3.0.3.jar=release/modules/ext/jbig2-imageio-3.0.3.jar
-file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar
-file.reference.jcl-over-slf4j-1.7.36.jar=release/modules/ext/jcl-over-slf4j-1.7.36.jar
-file.reference.jcommander-1.82.jar=release/modules/ext/jcommander-1.82.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.jbig2-imageio-3.0.4.jar=release/modules/ext/jbig2-imageio-3.0.4.jar
+file.reference.jcl-over-slf4j-2.0.16.jar=release/modules/ext/jcl-over-slf4j-2.0.16.jar
 file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar
-file.reference.jempbox-1.8.16.jar=release/modules/ext/jempbox-1.8.16.jar
-file.reference.jhighlight-1.0.3.jar=release/modules/ext/jhighlight-1.0.3.jar
+file.reference.jempbox-1.8.17.jar=release/modules/ext/jempbox-1.8.17.jar
+file.reference.jhighlight-1.1.0.jar=release/modules/ext/jhighlight-1.1.0.jar
 file.reference.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar
-file.reference.jna-5.16.0.jar=release/modules/ext/jna-5.16.0.jar
-file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
-file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
-file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
-file.reference.jul-to-slf4j-1.7.36.jar=release/modules/ext/jul-to-slf4j-1.7.36.jar
-file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
-file.reference.junrar-7.4.1.jar=release/modules/ext/junrar-7.4.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.mchange-commons-java-0.2.19.jar=release/modules/ext/mchange-commons-java-0.2.19.jar
-file.reference.metadata-extractor-2.15.0.1.jar=release/modules/ext/metadata-extractor-2.15.0.1.jar
-file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar
+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.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.openjson-1.0.12.jar=release/modules/ext/openjson-1.0.12.jar
-file.reference.opennlp-tools-1.9.4.jar=release/modules/ext/opennlp-tools-1.9.4.jar
 file.reference.parso-2.0.14.jar=release/modules/ext/parso-2.0.14.jar
-file.reference.pdfbox-2.0.25.jar=release/modules/ext/pdfbox-2.0.25.jar
-file.reference.pdfbox-tools-2.0.25.jar=release/modules/ext/pdfbox-tools-2.0.25.jar
-file.reference.poi-4.1.2.jar=release/modules/ext/poi-4.1.2.jar
-file.reference.poi-ooxml-4.1.2.jar=release/modules/ext/poi-ooxml-4.1.2.jar
-file.reference.poi-ooxml-schemas-4.1.2.jar=release/modules/ext/poi-ooxml-schemas-4.1.2.jar
-file.reference.poi-scratchpad-4.1.2.jar=release/modules/ext/poi-scratchpad-4.1.2.jar
-file.reference.preflight-2.0.25.jar=release/modules/ext/preflight-2.0.25.jar
-file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar
-file.reference.quartz-2.3.2.jar=release/modules/ext/quartz-2.3.2.jar
-file.reference.rome-1.18.0.jar=release/modules/ext/rome-1.18.0.jar
-file.reference.rome-utils-1.18.0.jar=release/modules/ext/rome-utils-1.18.0.jar
-file.reference.sentiment-analysis-parser-0.1.jar=release/modules/ext/sentiment-analysis-parser-0.1.jar
-file.reference.sis-feature-1.1.jar=release/modules/ext/sis-feature-1.1.jar
-file.reference.sis-metadata-1.1.jar=release/modules/ext/sis-metadata-1.1.jar
-file.reference.sis-netcdf-1.1.jar=release/modules/ext/sis-netcdf-1.1.jar
-file.reference.sis-referencing-1.1.jar=release/modules/ext/sis-referencing-1.1.jar
-file.reference.sis-storage-1.1.jar=release/modules/ext/sis-storage-1.1.jar
-file.reference.sis-utility-1.1.jar=release/modules/ext/sis-utility-1.1.jar
-file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
-file.reference.SparseBitSet-1.2.jar=release/modules/ext/SparseBitSet-1.2.jar
-file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar
+file.reference.pdfbox-3.0.3.jar=release/modules/ext/pdfbox-3.0.3.jar
+file.reference.pdfbox-io-3.0.3.jar=release/modules/ext/pdfbox-io-3.0.3.jar
+file.reference.pdfbox-tools-3.0.3.jar=release/modules/ext/pdfbox-tools-3.0.3.jar
+file.reference.picocli-4.7.6.jar=release/modules/ext/picocli-4.7.6.jar
+file.reference.poi-5.3.0.jar=release/modules/ext/poi-5.3.0.jar
+file.reference.poi-ooxml-5.3.0.jar=release/modules/ext/poi-ooxml-5.3.0.jar
+file.reference.poi-ooxml-lite-5.3.0.jar=release/modules/ext/poi-ooxml-lite-5.3.0.jar
+file.reference.poi-scratchpad-5.3.0.jar=release/modules/ext/poi-scratchpad-5.3.0.jar
+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-1.28.1.jar=release/modules/ext/tika-core-1.28.1.jar
-file.reference.tika-parsers-1.28.1.jar=release/modules/ext/tika-parsers-1.28.1.jar
-file.reference.txw2-2.3.5.jar=release/modules/ext/txw2-2.3.5.jar
-file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar
-file.reference.unit-api-1.0.jar=release/modules/ext/unit-api-1.0.jar
+file.reference.tika-parser-apple-module-3.0.0.jar=release/modules/ext/tika-parser-apple-module-3.0.0.jar
+file.reference.tika-parser-audiovideo-module-3.0.0.jar=release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar
+file.reference.tika-parser-cad-module-3.0.0.jar=release/modules/ext/tika-parser-cad-module-3.0.0.jar
+file.reference.tika-parser-code-module-3.0.0.jar=release/modules/ext/tika-parser-code-module-3.0.0.jar
+file.reference.tika-parser-crypto-module-3.0.0.jar=release/modules/ext/tika-parser-crypto-module-3.0.0.jar
+file.reference.tika-parser-digest-commons-3.0.0.jar=release/modules/ext/tika-parser-digest-commons-3.0.0.jar
+file.reference.tika-parser-font-module-3.0.0.jar=release/modules/ext/tika-parser-font-module-3.0.0.jar
+file.reference.tika-parser-html-module-3.0.0.jar=release/modules/ext/tika-parser-html-module-3.0.0.jar
+file.reference.tika-parser-image-module-3.0.0.jar=release/modules/ext/tika-parser-image-module-3.0.0.jar
+file.reference.tika-parser-mail-commons-3.0.0.jar=release/modules/ext/tika-parser-mail-commons-3.0.0.jar
+file.reference.tika-parser-mail-module-3.0.0.jar=release/modules/ext/tika-parser-mail-module-3.0.0.jar
+file.reference.tika-parser-microsoft-module-3.0.0.jar=release/modules/ext/tika-parser-microsoft-module-3.0.0.jar
+file.reference.tika-parser-miscoffice-module-3.0.0.jar=release/modules/ext/tika-parser-miscoffice-module-3.0.0.jar
+file.reference.tika-parser-news-module-3.0.0.jar=release/modules/ext/tika-parser-news-module-3.0.0.jar
+file.reference.tika-parser-ocr-module-3.0.0.jar=release/modules/ext/tika-parser-ocr-module-3.0.0.jar
+file.reference.tika-parser-pdf-module-3.0.0.jar=release/modules/ext/tika-parser-pdf-module-3.0.0.jar
+file.reference.tika-parser-pkg-module-3.0.0.jar=release/modules/ext/tika-parser-pkg-module-3.0.0.jar
+file.reference.tika-parser-text-module-3.0.0.jar=release/modules/ext/tika-parser-text-module-3.0.0.jar
+file.reference.tika-parser-webarchive-module-3.0.0.jar=release/modules/ext/tika-parser-webarchive-module-3.0.0.jar
+file.reference.tika-parser-xml-module-3.0.0.jar=release/modules/ext/tika-parser-xml-module-3.0.0.jar
+file.reference.tika-parser-xmp-commons-3.0.0.jar=release/modules/ext/tika-parser-xmp-commons-3.0.0.jar
+file.reference.tika-parser-zip-commons-3.0.0.jar=release/modules/ext/tika-parser-zip-commons-3.0.0.jar
+file.reference.tika-parsers-standard-package-3.0.0.jar=release/modules/ext/tika-parsers-standard-package-3.0.0.jar
+file.reference.txw2-4.0.5.jar=release/modules/ext/txw2-4.0.5.jar
 file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar
 file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar
-file.reference.woodstox-core-6.2.8.jar=release/modules/ext/woodstox-core-6.2.8.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.xmlbeans-3.1.0.jar=release/modules/ext/xmlbeans-3.1.0.jar
-file.reference.xmlschema-core-2.3.0.jar=release/modules/ext/xmlschema-core-2.3.0.jar
-file.reference.xmpbox-2.0.25.jar=release/modules/ext/xmpbox-2.0.25.jar
-file.reference.xmpcore-shaded-6.1.11.jar=release/modules/ext/xmpcore-shaded-6.1.11.jar
-file.reference.xz-1.9.jar=release/modules/ext/xz-1.9.jar
+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.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index a653584351..1c52bd8222 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -356,436 +356,340 @@
                 <package>schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/apache-mime4j-core-0.8.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/apache-mime4j-core-0.8.4.jar</binary-origin>
+                <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/apache-mime4j-dom-0.8.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/apache-mime4j-dom-0.8.4.jar</binary-origin>
+                <runtime-relative-path>ext/apache-mime4j-core-0.8.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/apache-mime4j-core-0.8.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/asm-9.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/asm-9.2.jar</binary-origin>
+                <runtime-relative-path>ext/apache-mime4j-dom-0.8.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/apache-mime4j-dom-0.8.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcmail-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcmail-jdk15on-1.70.jar</binary-origin>
+                <runtime-relative-path>ext/asm-9.7.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/asm-9.7.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcpkix-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcpkix-jdk15on-1.70.jar</binary-origin>
+                <runtime-relative-path>ext/bcjmail-jdk18on-1.78.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcjmail-jdk18on-1.78.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcprov-jdk15on-1.70.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcutil-jdk15on-1.70.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bcutil-jdk15on-1.70.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/boilerpipe-1.1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/boilerpipe-1.1.0.jar</binary-origin>
+                <runtime-relative-path>ext/bcutil-jdk18on-1.78.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcutil-jdk18on-1.78.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bzip2-0.9.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/bzip2-0.9.1.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/cdm-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/cdm-4.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.15.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-codec-1.15.jar</binary-origin>
+                <runtime-relative-path>ext/commons-codec-1.17.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-codec-1.17.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-collections4-4.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-collections4-4.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-compress-1.21.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-compress-1.21.jar</binary-origin>
+                <runtime-relative-path>ext/commons-compress-1.27.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-compress-1.27.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-csv-1.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-csv-1.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-csv-1.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-csv-1.12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-exec-1.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-exec-1.3.jar</binary-origin>
+                <runtime-relative-path>ext/commons-exec-1.4.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-exec-1.4.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/commons-io-2.17.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-io-2.17.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.12.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang3-3.12.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang3-3.17.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang3-3.17.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.2.jar</binary-origin>
+                <runtime-relative-path>ext/commons-logging-1.3.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.3.4.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/curvesapi-1.06.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/curvesapi-1.06.jar</binary-origin>
+                <runtime-relative-path>ext/curvesapi-1.08.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curvesapi-1.08.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/cxf-core-3.5.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/cxf-core-3.5.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/cxf-rt-frontend-jaxrs-3.5.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/cxf-rt-frontend-jaxrs-3.5.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/cxf-rt-rs-client-3.5.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/cxf-rt-rs-client-3.5.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/cxf-rt-security-3.5.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/cxf-rt-security-3.5.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/cxf-rt-transports-http-3.5.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/cxf-rt-transports-http-3.5.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/dd-plist-1.23.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dd-plist-1.23.jar</binary-origin>
+                <runtime-relative-path>ext/dd-plist-1.28.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/dd-plist-1.28.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/dec-0.1.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/dec-0.1.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/ehcache-core-2.6.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/ehcache-core-2.6.2.jar</binary-origin>
+                <runtime-relative-path>ext/fontbox-3.0.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/fontbox-3.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/istack-commons-runtime-4.1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/istack-commons-runtime-4.1.2.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>
+                <runtime-relative-path>ext/jackcess-4.0.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-4.0.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/fontbox-2.0.25.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/fontbox-2.0.25.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-encrypt-4.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-encrypt-4.0.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/geoapi-3.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/geoapi-3.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-annotations-2.18.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-annotations-2.18.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grib-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grib-4.5.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-core-2.18.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-core-2.18.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gson-2.9.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gson-2.9.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/guava-32.0.1-jre.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-32.0.1-jre.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/HikariCP-java7-2.4.13.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/HikariCP-java7-2.4.13.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.13.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpcore-4.4.13.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpservices-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpservices-4.5.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/isoparser-1.9.41.7.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/isoparser-1.9.41.7.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/istack-commons-runtime-3.0.12.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/istack-commons-runtime-3.0.12.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackcess-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackcess-4.0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackcess-encrypt-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackcess-encrypt-4.0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-annotations-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-annotations-2.15.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-core-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-core-2.15.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jackson-databind-2.15.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-databind-2.15.2.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-databind-2.18.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-databind-2.18.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jai-imageio-core-1.4.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jai-imageio-core-1.4.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jakarta.activation-1.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.activation-1.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/jakarta.activation-api-2.1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jakarta.activation-api-2.1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jakarta.activation-api-1.2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.activation-api-1.2.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jakarta.annotation-api-1.3.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.annotation-api-1.3.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jakarta.ws.rs-api-2.1.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.ws.rs-api-2.1.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jakarta.xml.bind-api-2.3.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jakarta.xml.bind-api-2.3.3.jar</binary-origin>
+                <runtime-relative-path>ext/jakarta.xml.bind-api-4.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jakarta.xml.bind-api-4.0.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/java-libpst-0.9.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/java-libpst-0.9.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jaxb-runtime-2.3.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jaxb-runtime-2.3.5.jar</binary-origin>
+                <runtime-relative-path>ext/jaxb-core-4.0.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jaxb-core-4.0.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jbig2-imageio-3.0.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jbig2-imageio-3.0.3.jar</binary-origin>
+                <runtime-relative-path>ext/jaxb-runtime-4.0.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jaxb-runtime-4.0.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jcip-annotations-1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcip-annotations-1.0.jar</binary-origin>
+                <runtime-relative-path>ext/jbig2-imageio-3.0.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jbig2-imageio-3.0.4.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jcommander-1.82.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcommander-1.82.jar</binary-origin>
+                <runtime-relative-path>ext/jcl-over-slf4j-2.0.16.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcl-over-slf4j-2.0.16.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/jempbox-1.8.16.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jempbox-1.8.16.jar</binary-origin>
+                <runtime-relative-path>ext/jempbox-1.8.17.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jempbox-1.8.17.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jhighlight-1.0.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jhighlight-1.0.3.jar</binary-origin>
+                <runtime-relative-path>ext/jhighlight-1.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jhighlight-1.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jmatio-1.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jmatio-1.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-5.16.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-5.16.0.jar</binary-origin>
+                <runtime-relative-path>ext/jsoup-1.18.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsoup-1.18.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/joda-time-2.2.jar</binary-origin>
+                <runtime-relative-path>ext/juniversalchardet-2.5.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/juniversalchardet-2.5.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/json-simple-1.1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/json-simple-1.1.1.jar</binary-origin>
+                <runtime-relative-path>ext/junrar-7.5.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/junrar-7.5.5.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>
+                <runtime-relative-path>ext/jwarc-0.30.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jwarc-0.30.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jul-to-slf4j-1.7.36.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jul-to-slf4j-1.7.36.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/juniversalchardet-1.0.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/juniversalchardet-1.0.3.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/junrar-7.4.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/junrar-7.4.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/mchange-commons-java-0.2.19.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/mchange-commons-java-0.2.19.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/metadata-extractor-2.15.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/metadata-extractor-2.15.0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netcdf4-4.5.5.jar</binary-origin>
+                <runtime-relative-path>ext/metadata-extractor-2.19.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/metadata-extractor-2.19.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/ooxml-schemas-1.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/ooxml-schemas-1.4.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/openjson-1.0.12.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/openjson-1.0.12.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/opennlp-tools-1.9.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/opennlp-tools-1.9.4.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/parso-2.0.14.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/parso-2.0.14.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/pdfbox-2.0.25.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/pdfbox-2.0.25.jar</binary-origin>
+                <runtime-relative-path>ext/pdfbox-3.0.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/pdfbox-3.0.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/pdfbox-tools-2.0.25.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/pdfbox-tools-2.0.25.jar</binary-origin>
+                <runtime-relative-path>ext/pdfbox-io-3.0.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/pdfbox-io-3.0.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-4.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-4.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/pdfbox-tools-3.0.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/pdfbox-tools-3.0.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-4.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-4.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/picocli-4.7.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/picocli-4.7.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-schemas-4.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-schemas-4.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/poi-5.3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-5.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-scratchpad-4.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-scratchpad-4.1.2.jar</binary-origin>
+                <runtime-relative-path>ext/poi-ooxml-5.3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-5.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/preflight-2.0.25.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/preflight-2.0.25.jar</binary-origin>
+                <runtime-relative-path>ext/poi-ooxml-lite-5.3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-lite-5.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/protobuf-java-3.19.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/protobuf-java-3.19.4.jar</binary-origin>
+                <runtime-relative-path>ext/poi-scratchpad-5.3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-scratchpad-5.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/quartz-2.3.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/quartz-2.3.2.jar</binary-origin>
+                <runtime-relative-path>ext/rome-2.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/rome-2.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/rome-1.18.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/rome-1.18.0.jar</binary-origin>
+                <runtime-relative-path>ext/rome-utils-2.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/rome-utils-2.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/rome-utils-1.18.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/rome-utils-1.18.0.jar</binary-origin>
+                <runtime-relative-path>ext/slf4j-api-2.0.16.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-2.0.16.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sentiment-analysis-parser-0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sentiment-analysis-parser-0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-feature-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sis-feature-1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-metadata-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sis-metadata-1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-netcdf-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sis-netcdf-1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-referencing-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sis-referencing-1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-storage-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sis-storage-1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sis-utility-1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sis-utility-1.1.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/SparseBitSet-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/SparseBitSet-1.2.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/SparseBitSet-1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/SparseBitSet-1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tagsoup-1.2.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/tika-core-1.28.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/tika-core-1.28.1.jar</binary-origin>
+                <runtime-relative-path>ext/tika-parser-apple-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-apple-module-3.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/tika-parsers-1.28.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/tika-parsers-1.28.1.jar</binary-origin>
+                <runtime-relative-path>ext/tika-parser-audiovideo-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/txw2-2.3.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/txw2-2.3.5.jar</binary-origin>
+                <runtime-relative-path>ext/tika-parser-cad-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-cad-module-3.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/udunits-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/udunits-4.5.5.jar</binary-origin>
+                <runtime-relative-path>ext/tika-parser-code-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-code-module-3.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/unit-api-1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/unit-api-1.0.jar</binary-origin>
+                <runtime-relative-path>ext/tika-parser-crypto-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-crypto-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-digest-commons-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-digest-commons-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-font-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-font-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-html-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-html-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-image-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-image-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-mail-commons-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-mail-commons-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-mail-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-mail-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-microsoft-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-microsoft-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-miscoffice-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-miscoffice-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-news-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-news-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-ocr-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-ocr-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-pdf-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-pdf-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-pkg-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-pkg-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-text-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-text-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-webarchive-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-webarchive-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-xml-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-xml-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-xmp-commons-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-xmp-commons-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-zip-commons-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-zip-commons-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parsers-standard-package-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parsers-standard-package-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <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/vorbis-java-core-0.8.jar</runtime-relative-path>
@@ -796,36 +700,20 @@
                 <binary-origin>release/modules/ext/vorbis-java-tika-0.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/woodstox-core-6.2.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/woodstox-core-6.2.8.jar</binary-origin>
+                <runtime-relative-path>ext/xmlbeans-5.2.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlbeans-5.2.1.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>
+                <runtime-relative-path>ext/xmpbox-3.0.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmpbox-3.0.3.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>
+                <runtime-relative-path>ext/xmpcore-6.1.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmpcore-6.1.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-3.1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlbeans-3.1.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmlschema-core-2.3.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlschema-core-2.3.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmpbox-2.0.25.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmpbox-2.0.25.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmpcore-shaded-6.1.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmpcore-shaded-6.1.11.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xz-1.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xz-1.9.jar</binary-origin>
+                <runtime-relative-path>ext/xz-1.10.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xz-1.10.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 4973262834..c5f050315a 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Thu, 20 Jul 2023 19:55:04 -0400
+#Fri, 03 Jan 2025 17:15:38 -0500
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538
@@ -8,4 +8,4 @@ SplashRunningTextBounds=0,289,538,18
 SplashRunningTextColor=0x0
 SplashRunningTextFontSize=19
 
-currentVersion=Autopsy 4.20.0
+currentVersion=Autopsy 4.21.0
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index a6687c35a0..9f44e2301b 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,4 +1,4 @@
 #Updated by build script
-#Thu, 20 Jul 2023 19:55:04 -0400
-CTL_MainWindow_Title=Autopsy 4.20.0
-CTL_MainWindow_Title_No_Project=Autopsy 4.20.0
+#Fri, 03 Jan 2025 17:15:38 -0500
+CTL_MainWindow_Title=Autopsy 4.21.0
+CTL_MainWindow_Title_No_Project=Autopsy 4.21.0

From ac15a60c802997dd1ebb9c51341f88c1da81fa03 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Sun, 5 Jan 2025 19:37:50 -0500
Subject: [PATCH 04/14] variable update

---
 Core/ivy.xml                  | 29 +++++++--------
 Core/ivysettings.xml          |  4 +++
 CoreLibs/ivy.xml              | 68 ++++++++++++++++-------------------
 CoreLibs/ivysettings.xml      |  5 +++
 KeywordSearch/ivy.xml         | 18 ++++------
 KeywordSearch/ivysettings.xml |  3 ++
 6 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index 8c9626fae5..fab897b728 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -1,8 +1,3 @@
-<!DOCTYPE ivy-module [
-    <!ENTITY httpcomponents.version "4.5.14">
-    <!ENTITY curator.version "5.7.1">
-    <!ENTITY batik.version "1.18">
-]>
 <ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="core"/>
     <configurations >
@@ -13,9 +8,9 @@
         <dependency conf="core->default" org="com.github.vlsi.mxgraph" name="jgraphx" rev="4.2.2" />
 
         <dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="6.1.4"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="&curator.version;"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="&curator.version;"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="&curator.version;"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="${curator.version}"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="${curator.version}"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="${curator.version}"/>
 
         <dependency conf="core->default" org="org.python" name="jython-standalone" rev="2.7.4" />
 
@@ -64,12 +59,12 @@
             <exclude org="com.sun.media" module="jai_imageio"/>
         </dependency>
 
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="&batik.version;"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="${batik.version}"/>
 
         <!-- 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"/>
@@ -79,9 +74,9 @@
 
         <dependency conf="core->default" org="com.license4j" name="license4j-runtime-library" rev="4.7.3"/>
 
-        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient" rev="&httpcomponents.version;"/>
-        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpmime" rev="&httpcomponents.version;"/>
-        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient-win" rev="&httpcomponents.version;">
+        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient" rev="${httpcomponents.version}"/>
+        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpmime" rev="${httpcomponents.version}"/>
+        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient-win" rev="${httpcomponents.version}">
             <exclude name="jna" />
             <exclude name="jna-platform" />
         </dependency>
diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml
index 06c2d9308f..96578e6c40 100644
--- a/Core/ivysettings.xml
+++ b/Core/ivysettings.xml
@@ -1,4 +1,8 @@
 <ivysettings>
+  <property name="httpcomponents.version" value="4.5.14"/>
+  <property name="curator.version" value="5.7.1"/>
+  <property name="batik.version" value="1.18"/>
+
   <settings defaultResolver="main"/>
   <resolvers>
     <chain name="main">
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index dc97173fcc..dca5ebb87e 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -1,9 +1,3 @@
-<!DOCTYPE ivy-module [
-    <!ENTITY javafx.version "17.0.14-ea+2">
-    <!ENTITY jackson.version "2.18.2">
-    <!ENTITY jfxtras.version "17-r1">
-    <!ENTITY twelvemonkeys.version "3.12.0">
-]>
 <ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
     <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
     <configurations >
@@ -12,43 +6,43 @@
         
     </configurations>
     <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-fxml" rev="${javafx.version}">
             <artifact name="javafx-fxml" type="jar" />
             <artifact name="javafx-fxml" type="jar" e:classifier="win"/>
             <artifact name="javafx-fxml" type="jar" e:classifier="mac"/>
             <artifact name="javafx-fxml" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-graphics" rev="&javafx.version;">
+        <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"/>
             <artifact name="javafx-graphics" type="jar" e:classifier="mac"/>
             <artifact name="javafx-graphics" type="jar" e:classifier="linux"/>
         </dependency>
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-controls" rev="&javafx.version;">
+        <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"/>
             <artifact name="javafx-controls" type="jar" e:classifier="mac"/>
             <artifact name="javafx-controls" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-base" rev="&javafx.version;">
+        <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"/>
             <artifact name="javafx-base" type="jar" e:classifier="mac"/>
             <artifact name="javafx-base" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-swing" rev="&javafx.version;"  >
+        <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"/>
             <artifact name="javafx-swing" type="jar" e:classifier="mac"/>
             <artifact name="javafx-swing" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-web" rev="&javafx.version;" >
+        <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"/>
             <artifact name="javafx-web" type="jar" e:classifier="mac"/>
             <artifact name="javafx-web" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-media" rev="&javafx.version;">
+        <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"/>
             <artifact name="javafx-media" type="jar" e:classifier="mac"/>
@@ -90,8 +84,8 @@
 
         <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.4"/>
 
-        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="&jackson.version;"/>
-        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" rev="&jackson.version;"/>
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="${jackson.version}"/>
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" rev="${jackson.version}"/>
         
         <!-- better image resizing -->
         <dependency conf="autopsy_core->default" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
@@ -108,30 +102,30 @@
         <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.13.0" />
 
         <!-- timeline  -->
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="&jfxtras.version;" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="&jfxtras.version;" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="&jfxtras.version;" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="${jfxtras.version}" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="${jfxtras.version}" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="${jfxtras.version}" />
         <!-- templateing engine used by timeline to generate its snapshot report -->
         <dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.14" />
         
         <!-- image support for autopsy and image gallery -->
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="${twelvemonkeys.version}" />
         <dependency conf="autopsy_core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/>
         <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.28"/>
         <dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="2.0.16"/>
@@ -146,8 +140,8 @@
         
         <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
         <override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="&jackson.version;"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="&jackson.version;"/>
+        <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="${jackson.version}"/>
+        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="${jackson.version}"/>
         
         // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
         <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
diff --git a/CoreLibs/ivysettings.xml b/CoreLibs/ivysettings.xml
index da1e8e957b..23bab824f7 100644
--- a/CoreLibs/ivysettings.xml
+++ b/CoreLibs/ivysettings.xml
@@ -1,4 +1,9 @@
 <ivysettings>
+    <property name="javafx.version" value="17.0.14-ea+2"/>
+    <property name="jackson.version" value="2.18.2"/>
+    <property name="jfxtras.version" value="17-r1"/>
+    <property name="twelvemonkeys.version" value="3.12.0"/>
+    
     <settings defaultResolver="main"/>
     <resolvers>
         <chain name="main">
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index a5e9af68a0..eb3c42ba71 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -1,8 +1,4 @@
 
-<!DOCTYPE ivy-module [
-    <!ENTITY jetty.version "12.0.16">
-    <!ENTITY slf4j.version "2.0.16">
-]>
 <ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="keywordsearch"/>
     <configurations >
@@ -35,15 +31,15 @@
         <dependency conf="autopsy->default" org="junit" name="junit" rev="4.13.2"/>
 
         <!-- 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;"/>
-        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="&jetty.version;"/>
+		<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}"/>
+        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="${jetty.version}"/>
         <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
 
         <!-- logging -->
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="&slf4j.version;"/>
-        <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;"/> 
+        <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"/>
+        <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"/>
         
@@ -53,7 +49,7 @@
         <override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-web" rev="2.17.2"/>
-        <override org="org.slf4j" module="slf4j-api" rev="&slf4j.version;"/>
+        <override org="org.slf4j" module="slf4j-api" rev="${slf4j.version}"/>
 
         <override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
         <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml
index a776ab49c3..3ee6f5cba1 100644
--- a/KeywordSearch/ivysettings.xml
+++ b/KeywordSearch/ivysettings.xml
@@ -1,4 +1,7 @@
 <ivysettings>
+  <property name="jetty.version" value="12.0.16"/>
+  <property name="slf4j.version" value="2.0.16"/>
+  
   <settings defaultResolver="main"/>
   <resolvers>
     <chain name="main">

From dd18d571bf97c967a92da162c3ab84c8ed8bc800 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Mon, 6 Jan 2025 21:35:03 -0500
Subject: [PATCH 05/14] updates

---
 Core/ivy.xml                                  |   1 +
 Core/nbproject/project.properties             |   3 +
 Core/nbproject/project.xml                    |  12 ++
 .../autopsy/events/AutopsyEventPublisher.java |   2 +-
 .../events/MessageServiceConnectionInfo.java  |   4 +-
 .../autopsy/events/RemoteEventPublisher.java  |  20 +--
 .../DocumentEmbeddedContentExtractor.java     |   3 +-
 .../PDFAttachmentExtractor.java               |   3 +-
 .../EncryptionDetectionFileIngestModule.java  |   3 +-
 .../textextractors/TikaTextExtractor.java     |  17 ++-
 CoreLibs/nbproject/project.xml                |   1 +
 CoreTestLibs/nbproject/project.properties     |   2 +-
 KeywordSearch/ivy.xml                         |   2 +-
 KeywordSearch/nbproject/project.properties    |  63 ++++----
 KeywordSearch/nbproject/project.xml           | 136 ++++++++----------
 Tika/ivy.xml                                  |   5 +-
 Tika/nbproject/project.properties             |   1 +
 Tika/nbproject/project.xml                    |   4 +
 18 files changed, 151 insertions(+), 131 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index fab897b728..274d2620ca 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -7,6 +7,7 @@
     <dependencies >
         <dependency conf="core->default" org="com.github.vlsi.mxgraph" name="jgraphx" rev="4.2.2" />
 
+        <dependency org="jakarta.jms" name="jakarta.jms-api" rev="3.1.0"/>
         <dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="6.1.4"/>
         <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="${curator.version}"/>
         <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="${curator.version}"/>
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 6dff2bc257..c59b4438b9 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -47,6 +47,9 @@ 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
 file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar
 file.reference.java-diff-utils-4.15.jar=release/modules/ext/java-diff-utils-4.15.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index deb06cbb28..c1f7418b98 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -565,6 +565,18 @@
                 <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>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jakarta.jms-api-3.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jakarta.jms-api-3.1.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jakarta.transaction-api-1.3.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jakarta.transaction-api-1.3.3.jar</binary-origin>
diff --git a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java
index f3fb273bcf..1beac1f4a0 100644
--- a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java
+++ b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java
@@ -24,7 +24,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 import org.sleuthkit.autopsy.core.UserPreferencesException;
 import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.coreutils.Logger;
diff --git a/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java
index f7cf28096d..c2610eb3f7 100644
--- a/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java
+++ b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java
@@ -21,8 +21,8 @@ package org.sleuthkit.autopsy.events;
 import java.net.URI;
 import java.net.URISyntaxException;
 import javax.annotation.concurrent.Immutable;
-import javax.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java
index a301e86010..69948ddbe1 100644
--- a/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java
+++ b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java
@@ -22,16 +22,16 @@ import java.net.URISyntaxException;
 import java.util.logging.Level;
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Connection;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageListener;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java
index e9276a81b7..82e58d381d 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java
@@ -50,6 +50,7 @@ import org.apache.tika.exception.TikaException;
 import org.apache.tika.extractor.EmbeddedDocumentExtractor;
 import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor;
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.mime.MediaType;
 import org.apache.tika.mime.MimeTypeException;
 import org.apache.tika.parser.AutoDetectParser;
@@ -728,7 +729,7 @@ class DocumentEmbeddedContentExtractor {
             }
 
             // try to get the name of the embedded file from the metadata
-            String name = metadata.get(Metadata.RESOURCE_NAME_KEY);
+            String name = metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY);
 
             // TODO: This can be removed after we upgrade to Tika 1.16 or
             // above. The 1.16 version of Tika keeps track of files that 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java
index d898aaa1ca..78ba3a4fbd 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java
@@ -30,6 +30,7 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.extractor.EmbeddedDocumentExtractor;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.ParseContext;
@@ -125,7 +126,7 @@ final class PDFAttachmentExtractor {
             //Resource naming scheme is used internally in autopsy, therefore we can guarentee uniqueness.
             String uniqueExtractedName = "extract_" + attachmentCount++; //NON-NLS
             
-            String name = mtdt.get(Metadata.RESOURCE_NAME_KEY);
+            String name = mtdt.get(TikaCoreProperties.RESOURCE_NAME_KEY);
             String ext = FilenameUtils.getExtension(name);
             
             //Append the extension if we can.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
index 8a40bf339d..e81f069f62 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
@@ -32,6 +32,7 @@ import java.util.Arrays;
 import java.util.logging.Level;
 import org.apache.tika.exception.EncryptedDocumentException;
 import org.apache.tika.exception.TikaException;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.ParseContext;
@@ -287,7 +288,7 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
                     bin = new BufferedInputStream(in);
                     ContentHandler handler = new BodyContentHandler(-1);
                     Metadata metadata = new Metadata();
-                    metadata.add(Metadata.RESOURCE_NAME_KEY, file.getName());
+                    metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, file.getName());
                     AutoDetectParser parser = new AutoDetectParser();
                     parser.parse(bin, handler, metadata, new ParseContext());
                 } catch (EncryptedDocumentException ex) {
diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java
index 788ca39575..0d7d4b9a0f 100644
--- a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java
+++ b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java
@@ -75,6 +75,7 @@ import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Set;
+import org.apache.tika.config.TikaConfig;
 import org.apache.tika.mime.MimeTypes;
 import org.apache.tika.parser.pdf.PDFParserConfig.OCR_STRATEGY;
 import org.sleuthkit.autopsy.coreutils.ExecUtil.HybridTerminator;
@@ -282,11 +283,7 @@ final class TikaTextExtractor implements TextExtractor {
         if (isOcrSupported()) {
             // Configure OCR for Tika if it chooses to run OCR
             // during extraction
-            TesseractOCRConfig ocrConfig = new TesseractOCRConfig();
-            String tesseractFolder = TESSERACT_PATH.getParent();
-            ocrConfig.setTesseractPath(tesseractFolder);
-            ocrConfig.setLanguage(languagePacks);
-            ocrConfig.setTessdataPath(PlatformUtil.getOcrLanguagePacksPath());
+            TesseractOCRConfig ocrConfig = getTesseractConfig();
             parseContext.set(TesseractOCRConfig.class, ocrConfig);
 
             // Configure how Tika handles OCRing PDFs
@@ -347,6 +344,16 @@ final class TikaTextExtractor implements TextExtractor {
             future.cancel(true);
         }
     }
+    
+    private TesseractOCRConfig getTesseractConfig() {
+        // GVDTODO look at this: https://tika.apache.org/3.0.0/configuring.html
+
+        // String tesseractFolder = TESSERACT_PATH.getParent();
+        //     ocrConfig.setTesseractPath(tesseractFolder);
+        //     ocrConfig.setLanguage(languagePacks);
+        //     ocrConfig.setTessdataPath(PlatformUtil.getOcrLanguagePacksPath());
+        return null;    
+    }
 
     /**
      * Run OCR and return the file stream produced by Tesseract.
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index d510eb748e..0b2daee78f 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -405,6 +405,7 @@
                 <package>org.apache.commons.io</package>
                 <package>org.apache.commons.io.comparator</package>
                 <package>org.apache.commons.io.filefilter</package>
+                <package>org.apache.commons.io.function</package>
                 <package>org.apache.commons.io.input</package>
                 <package>org.apache.commons.io.monitor</package>
                 <package>org.apache.commons.io.output</package>
diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties
index fed65b4808..5830504c3e 100644
--- a/CoreTestLibs/nbproject/project.properties
+++ b/CoreTestLibs/nbproject/project.properties
@@ -4,5 +4,5 @@ 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.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index eb3c42ba71..5a29483948 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -22,7 +22,7 @@
         <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="com.optimaize.languagedetector" name="language-detector" rev="0.4"/>       
+        <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"/> -->
         
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 16289e9e73..cbf856e56d 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,48 +1,45 @@
 file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.jar
-file.reference.commons-io-2.8.0.jar=release/modules/ext/commons-io-2.8.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.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar
-file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar
+file.reference.guava-16.0.1.jar=release/modules/ext/guava-16.0.1.jar
 file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
-file.reference.http2-client-9.4.44.v20210927.jar=release/modules/ext/http2-client-9.4.44.v20210927.jar
-file.reference.http2-common-9.4.44.v20210927.jar=release/modules/ext/http2-common-9.4.44.v20210927.jar
-file.reference.http2-hpack-9.4.44.v20210927.jar=release/modules/ext/http2-hpack-9.4.44.v20210927.jar
-file.reference.http2-http-client-transport-9.4.44.v20210927.jar=release/modules/ext/http2-http-client-transport-9.4.44.v20210927.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.icu4j-70.1.jar=release/modules/ext/icu4j-70.1.jar
-file.reference.jcl-over-slf4j-1.7.24.jar=release/modules/ext/jcl-over-slf4j-1.7.24.jar
-file.reference.jetty-alpn-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar
-file.reference.jetty-alpn-java-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar
-file.reference.jetty-alpn-openjdk8-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar
-file.reference.jetty-client-9.4.44.v20210927.jar=release/modules/ext/jetty-client-9.4.44.v20210927.jar
-file.reference.jetty-http-9.4.44.v20210927.jar=release/modules/ext/jetty-http-9.4.44.v20210927.jar
-file.reference.jetty-io-9.4.44.v20210927.jar=release/modules/ext/jetty-io-9.4.44.v20210927.jar
-file.reference.jetty-util-9.4.44.v20210927.jar=release/modules/ext/jetty-util-9.4.44.v20210927.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.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.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.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar
-file.reference.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar
-file.reference.lucene-core-8.11.2.jar=release/modules/ext/lucene-core-8.11.2.jar
-file.reference.netty-buffer-4.1.68.Final.jar=release/modules/ext/netty-buffer-4.1.68.Final.jar
-file.reference.netty-codec-4.1.68.Final.jar=release/modules/ext/netty-codec-4.1.68.Final.jar
-file.reference.netty-common-4.1.68.Final.jar=release/modules/ext/netty-common-4.1.68.Final.jar
-file.reference.netty-handler-4.1.68.Final.jar=release/modules/ext/netty-handler-4.1.68.Final.jar
-file.reference.netty-resolver-4.1.68.Final.jar=release/modules/ext/netty-resolver-4.1.68.Final.jar
-file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.Final.jar
-file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar
-file.reference.netty-transport-4.1.68.Final.jar=release/modules/ext/netty-transport-4.1.68.Final.jar
-file.reference.netty-transport-native-epoll-4.1.68.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar
-file.reference.netty-transport-native-unix-common-4.1.68.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.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.7.6.jar=release/modules/ext/snappy-java-1.1.7.6.jar
-file.reference.solr-solrj-8.11.2.jar=release/modules/ext/solr-solrj-8.11.2.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.2.4.jar=release/modules/ext/woodstox-core-6.2.4.jar
-file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar
-file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.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
 javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 98a84faeb5..40466c4b5f 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -239,8 +239,8 @@
                 <binary-origin>release/modules/ext/annotations-12.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-io-2.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-io-2.8.0.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
@@ -251,28 +251,28 @@
                 <binary-origin>release/modules/ext/commons-math3-3.6.1.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-16.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-16.0.1.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.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-client-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/http2-common-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-common-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/http2-hpack-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-hpack-9.4.44.v20210927.jar</binary-origin>
+                <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.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar</binary-origin>
+                <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>
@@ -287,40 +287,36 @@
                 <binary-origin>release/modules/ext/httpmime-4.5.13.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/icu4j-70.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/icu4j-70.1.jar</binary-origin>
+                <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.24.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcl-over-slf4j-1.7.24.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-alpn-client-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-alpn-java-client-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-client-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-client-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-http-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-http-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jetty-io-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-io-9.4.44.v20210927.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jetty-util-9.4.44.v20210927.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jetty-util-9.4.44.v20210927.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsonic-1.2.11.jar</runtime-relative-path>
@@ -335,84 +331,76 @@
                 <binary-origin>release/modules/ext/language-detector-0.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/logback-classic-1.2.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/logback-classic-1.2.10.jar</binary-origin>
+                <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/logback-core-1.2.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/logback-core-1.2.10.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/lucene-core-8.11.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/lucene-core-8.11.2.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-buffer-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-buffer-4.1.68.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-codec-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-codec-4.1.68.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-common-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-common-4.1.68.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-handler-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-handler-4.1.68.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-resolver-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-resolver-4.1.68.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-tcnative-2.0.48.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-tcnative-2.0.48.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-tcnative-classes-2.0.48.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-4.1.68.Final.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-native-epoll-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/netty-transport-native-unix-common-4.1.68.Final.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar</binary-origin>
+                <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>
             </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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/snappy-java-1.1.7.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/snappy-java-1.1.7.6.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/solr-solrj-8.11.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/solr-solrj-8.11.2.jar</binary-origin>
+                <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>
+            </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>
             </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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/woodstox-core-6.2.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/woodstox-core-6.2.4.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/zookeeper-3.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-3.8.0.jar</binary-origin>
+                <runtime-relative-path>ext/zookeeper-3.6.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/zookeeper-3.6.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/zookeeper-jute-3.8.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-jute-3.8.0.jar</binary-origin>
+                <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>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/Tika/ivy.xml b/Tika/ivy.xml
index aae3f2492b..a2d663e9c2 100755
--- a/Tika/ivy.xml
+++ b/Tika/ivy.xml
@@ -5,8 +5,11 @@
     </configurations>
     <dependencies >
         <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers-standard-package" rev="3.0.0"/>
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-core" rev="3.0.0"/>
+
         <dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
-        
+        <!-- https://mvnrepository.com/artifact/org.apache.tika/tika-core -->
+
         <!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
         <override org="org.apache.poi" module="poi-ooxml-schemas" rev="4.1.2"/>
         <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index b4f8046180..c5c97ab18a 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -58,6 +58,7 @@ 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
 file.reference.tika-parser-audiovideo-module-3.0.0.jar=release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar
 file.reference.tika-parser-cad-module-3.0.0.jar=release/modules/ext/tika-parser-cad-module-3.0.0.jar
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index 1c52bd8222..d21d8835df 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -595,6 +595,10 @@
                 <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tagsoup-1.2.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-core-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-core-3.0.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-parser-apple-module-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parser-apple-module-3.0.0.jar</binary-origin>

From 12e35dc7d6991cca6a5d156fc4622d608d50ba43 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 7 Jan 2025 08:09:13 -0500
Subject: [PATCH 06/14] thunderbird parser updates

---
 KeywordSearch/ivy.xml                          | 10 ++++++++--
 thunderbirdparser/nbproject/project.properties |  6 +++---
 thunderbirdparser/nbproject/project.xml        | 12 ++++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 5a29483948..374d2fa742 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -41,8 +41,14 @@
         <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="*" ext="*" type="javadoc"/>
+        <exclude org="org.apache.logging.log4j" ext="*"/>
+        <exclude org="com.google.code.gson" ext="*"/>
+        <exclude org="com.google.guava" ext="*"/>
+
         <override org="org.apache.logging.log4j" module="log4j-api" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-core" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-1.2-api" rev="2.17.2"/>        
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index 8d13059ed6..94544bb70f 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -1,6 +1,6 @@
-file.reference.apache-mime4j-mbox-iterator-0.8.4.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar
-file.reference.ez-vcard-0.11.3.jar=release/modules/ext/ez-vcard-0.11.3.jar
-file.reference.freemarker-2.3.31.jar=release/modules/ext/freemarker-2.3.31.jar
+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
 file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar
 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
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index abcccdc19c..c9a66fe5db 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -78,16 +78,16 @@
             </module-dependencies>
             <public-packages/>
             <class-path-extension>
-                <runtime-relative-path>ext/apache-mime4j-mbox-iterator-0.8.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar</binary-origin>
+                <runtime-relative-path>ext/apache-mime4j-mbox-iterator-0.8.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/apache-mime4j-mbox-iterator-0.8.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/ez-vcard-0.11.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/ez-vcard-0.11.3.jar</binary-origin>
+                <runtime-relative-path>ext/ez-vcard-0.12.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/ez-vcard-0.12.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/freemarker-2.3.31.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/freemarker-2.3.31.jar</binary-origin>
+                <runtime-relative-path>ext/freemarker-2.3.32.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/freemarker-2.3.32.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jackson-core-2.15.2.jar</runtime-relative-path>

From 445dad824e09e62c0bd3f60edf57bf68c6e9c9b1 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 7 Jan 2025 20:31:28 -0500
Subject: [PATCH 07/14] dependency check ant script

---
 dependency-check.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 dependency-check.xml

diff --git a/dependency-check.xml b/dependency-check.xml
new file mode 100644
index 0000000000..e9b9ba264f
--- /dev/null
+++ b/dependency-check.xml
@@ -0,0 +1,29 @@
+<project name="AutopsyDependencyCheck">
+    <!-- after downloading dependency-check from https://jeremylong.github.io/DependencyCheck and building Autopsy, can be run with a command like
+     `ant dependency-check -f dependency-check.xml -Ddependency-check-dir=/path/to/dir -Ddependency-check-out=/path/to/dir -Djar-dir=%AUTOPSY_SRC_PATH%\build\cluster\modules\ext` -->
+    
+    <!--set up dependency check: https://jeremylong.github.io/DependencyCheck/dependency-check-ant/ -->
+    <path id="dependency-check.path">
+       <pathelement location="${dependency-check-dir}/dependency-check-ant.jar"/>
+        <fileset dir="${dependency-check-dir}/lib">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+    <taskdef resource="dependency-check-taskdefs.properties">
+       <classpath refid="dependency-check.path" />
+    </taskdef>
+    
+    <property name="jar-dir" value="${basedir}/build/cluster/modules/ext"/>
+
+    <!--runs dependency check as an ant task: https://jeremylong.github.io/DependencyCheck/dependency-check-ant/configuration.html -->
+    <target name="dependency-check" description="Dependency-Check Analysis">
+        <dependency-check projectname="Autopsy"
+                          reportoutputdirectory="${dependency-check-out}"
+                          reportformat="ALL">
+            <!--<suppressionfile path="${basedir}/path/to/suppression.xml" />-->
+            <fileset dir="${jar-dir}">
+                <include name="**/*.jar"/>
+            </fileset>
+        </dependency-check>
+    </target>
+</project>
\ No newline at end of file

From 9f295600bed33d92f0c8b57a3374122114673985 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 8 Jan 2025 09:27:33 -0500
Subject: [PATCH 08/14] transitive deps update

---
 Core/ivy.xml                  | 21 ++++++++-------------
 CoreLibs/ivy.xml              | 17 +++++------------
 CoreLibs/ivysettings.xml      |  1 +
 CoreTestLibs/ivy.xml          |  3 +++
 KeywordSearch/ivy.xml         | 34 +++++++++++++++-------------------
 KeywordSearch/ivysettings.xml |  3 ++-
 Tika/ivy.xml                  | 19 +++++--------------
 Tika/ivysettings.xml          |  2 ++
 8 files changed, 41 insertions(+), 59 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index 274d2620ca..d0eb39b50c 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -30,7 +30,7 @@
 
         <dependency conf="core->default" org="com.googlecode.libphonenumber" name="libphonenumber" rev="8.13.52" />
 
-        <dependency conf="core->default" org="com.squareup.okhttp" name="okhttp" rev="2.7.5"/>
+        <dependency conf="core->default" org="com.squareup.okhttp3" name="okhttp" rev="4.12.0"/>
         <dependency conf="core->default" org="org.jfree" name="jfreechart" rev="1.5.5"/>
 
         <!-- for yaml reading/writing -->
@@ -81,19 +81,14 @@
             <exclude name="jna" />
             <exclude name="jna-platform" />
         </dependency>
-<!-- 
-        <override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
-        <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
-        
-        <override org="jakarta.ws.rs" module="jakarta.ws.rs-api" rev="2.1.5"/>
-        <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
-        <override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/>
 
-        //changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
-        <override org="org.bouncycastle" module="bcprov-ext-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
+        <exclude org="org.bouncycastle" module="bcpkix-jdk15on"/>
+        <exclude org="*" ext="*" type="javadoc"/>
+
+        <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="junit" module="junit" rev="4.13.2"/>
     </dependencies>
 </ivy-module>
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index dca5ebb87e..ca1a14089c 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -130,21 +130,14 @@
         <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.28"/>
         <dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="2.0.16"/>
         
-        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-api" rev="2.24.3" transitive="false"/>
-        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="2.24.3" transitive="false"/>
+        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-api" rev="${log4j.version}" transitive="false"/>
+        <dependency conf="autopsy_core->default" org="org.apache.logging.log4j" name="log4j-core" rev="${log4j.version}" transitive="false"/>
         
         <exclude org="*" ext="*" type="javadoc"/>
         <exclude org="log4j" module="log4j"/>
-<!-- 
-        <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
+
+        <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="com.google.code.gson" module="gson" rev="2.9.0"/>
-        <override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="${jackson.version}"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="${jackson.version}"/>
-        
-        // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
-        <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
     </dependencies>
 </ivy-module>
diff --git a/CoreLibs/ivysettings.xml b/CoreLibs/ivysettings.xml
index 23bab824f7..d535512c6e 100644
--- a/CoreLibs/ivysettings.xml
+++ b/CoreLibs/ivysettings.xml
@@ -3,6 +3,7 @@
     <property name="jackson.version" value="2.18.2"/>
     <property name="jfxtras.version" value="17-r1"/>
     <property name="twelvemonkeys.version" value="3.12.0"/>
+    <property name="log4j.version" value="2.24.3"/>
     
     <settings defaultResolver="main"/>
     <resolvers>
diff --git a/CoreTestLibs/ivy.xml b/CoreTestLibs/ivy.xml
index 4a8ad3cb43..ca83f300b3 100644
--- a/CoreTestLibs/ivy.xml
+++ b/CoreTestLibs/ivy.xml
@@ -9,5 +9,8 @@
         <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.15.11"/>
         <dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.4"/>
         <dependency conf="coretestlibs->default" org="junit" name="junit" rev="4.13.2"/>
+
+        <exclude org="*" ext="*" type="javadoc"/>
+
     </dependencies>
 </ivy-module>
\ No newline at end of file
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 374d2fa742..72036aa262 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -34,33 +34,29 @@
 		<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}"/>
         <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="${jetty.version}"/>
-        <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
+        <dependency conf="servlet->default" org="jakarta.servlet" name="jakarta.servlet-api" rev="6.1.0"/>
 
         <!-- logging -->
         <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"/>
         <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.apache.logging.log4j" ext="*"/>
-        <exclude org="com.google.code.gson" ext="*"/>
-        <exclude org="com.google.guava" ext="*"/>
+        
+        <override org="commons-io" module="commons-io" rev="2.18"/>
+        <override org="com.google.guava" module="guava" rev="33.4.0-jre"/>
+        
+        <override org="org.apache.logging.log4j" module="log4j-api" rev="${log4j.version}"/>
+        <override org="org.apache.logging.log4j" module="log4j-core" rev="${log4j.version}"/>
+        <override org="org.apache.logging.log4j" module="log4j-1.2-api" rev="${log4j.version}"/>        
+        <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.apache.logging.log4j" module="log4j-api" rev="2.17.2"/>
-        <override org="org.apache.logging.log4j" module="log4j-core" rev="2.17.2"/>
-        <override org="org.apache.logging.log4j" module="log4j-1.2-api" rev="2.17.2"/>        
-        <override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="2.17.2"/>
-        <override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="2.17.2"/>
-        <override org="org.apache.logging.log4j" module="log4j-web" rev="2.17.2"/>
-        <override org="org.slf4j" module="slf4j-api" rev="${slf4j.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.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
-        <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
-        <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
-        <override org="com.google.guava" module="guava" rev="31.1-jre"/>
-        <override org="joda-time" module="joda-time" rev="2.10.14" /> -->
+        <override org="org.apache.zookeeper" module="zookeeper" rev="3.9.3"/>
+        <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.9.3"/>
     </dependencies>
 </ivy-module>
diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml
index 3ee6f5cba1..9a6d79ecdc 100644
--- a/KeywordSearch/ivysettings.xml
+++ b/KeywordSearch/ivysettings.xml
@@ -1,7 +1,8 @@
 <ivysettings>
   <property name="jetty.version" value="12.0.16"/>
   <property name="slf4j.version" value="2.0.16"/>
-  
+  <property name="log4j.version" value="2.24.3"/>
+
   <settings defaultResolver="main"/>
   <resolvers>
     <chain name="main">
diff --git a/Tika/ivy.xml b/Tika/ivy.xml
index a2d663e9c2..2c91bf3160 100755
--- a/Tika/ivy.xml
+++ b/Tika/ivy.xml
@@ -8,20 +8,11 @@
         <dependency conf="tika->default" org="org.apache.tika" name="tika-core" rev="3.0.0"/>
 
         <dependency conf="tika->default" org="org.apache.poi" name="ooxml-schemas" rev="1.4"/>
-        <!-- https://mvnrepository.com/artifact/org.apache.tika/tika-core -->
 
-        <!-- <override org="org.jsoup" module="jsoup" rev="1.16.1"/>
-        <override org="org.apache.poi" module="poi-ooxml-schemas" rev="4.1.2"/>
-        <override org="org.slf4j" module="slf4j-api" rev="1.7.36"/>
-        <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
-        <override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="2.15.2"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="2.15.2"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-annotations" rev="2.15.2"/>
-        
-        // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
-        <override org="org.bouncycastle" module="bcmail-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
-        <override org="org.bouncycastle" module="bcpkix-jdk15on" rev="1.70"/> -->
+        <exclude org="*" ext="*" type="javadoc"/>
+
+        <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 fd792f6844..fe242a2517 100755
--- a/Tika/ivysettings.xml
+++ b/Tika/ivysettings.xml
@@ -1,5 +1,7 @@
 <ivysettings>
   <settings defaultResolver="main"/>
+  <property name="log4j.version" value="2.24.3"/>
+  
   <resolvers>
     <chain name="main">
         <ibiblio name="central" root="https://repo1.maven.org/maven2" m2compatible="true"/>

From 143b20794d75e2d563da0926f4bdba4132662190 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 8 Jan 2025 14:55:33 -0500
Subject: [PATCH 09/14] building; dependency check looks ok

---
 Core/build.xml                                |   2 -
 Core/ivy.xml                                  |  19 +-
 Core/ivysettings.xml                          |   2 +
 Core/nbproject/project.properties             |  58 +++---
 Core/nbproject/project.xml                    | 112 +++++++----
 .../translators/BingTranslator.java           |  11 +-
 .../BingTranslatorSettingsPanel.java          |  10 +-
 CoreLibs/nbproject/project.properties         |   9 +-
 CoreLibs/nbproject/project.xml                |   4 +-
 CoreTestLibs/nbproject/project.properties     |   3 +-
 Experimental/nbproject/project.properties     |   3 +-
 KeywordSearch/ivy.xml                         |  18 +-
 KeywordSearch/ivysettings.xml                 |   2 +
 KeywordSearch/nbproject/project.properties    |  82 ++++----
 KeywordSearch/nbproject/project.xml           | 188 +++++++++++-------
 .../autopsy/keywordsearch/Server.java         |   7 +-
 Tika/ivy.xml                                  |   9 +-
 Tika/ivysettings.xml                          |   1 +
 Tika/nbproject/project.properties             |  11 +-
 Tika/nbproject/project.xml                    |  12 +-
 .../nbproject/project.properties              |   5 +-
 21 files changed, 347 insertions(+), 221 deletions(-)

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

From cfd3c4e28c98f81601fe24920c5d171e286d6c38 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 8 Jan 2025 15:28:32 -0500
Subject: [PATCH 10/14] update

---
 .../textextractors/TikaTextExtractor.java     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java
index 0d7d4b9a0f..74080e2fc4 100644
--- a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java
+++ b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java
@@ -49,7 +49,6 @@ import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.ParsingReader;
 import org.apache.tika.parser.microsoft.OfficeParserConfig;
-import org.apache.tika.parser.ocr.TesseractOCRConfig;
 import org.apache.tika.parser.pdf.PDFParserConfig;
 import org.openide.util.NbBundle;
 import org.openide.modules.InstalledFileLocator;
@@ -77,6 +76,7 @@ import java.util.ArrayList;
 import java.util.Set;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.mime.MimeTypes;
+import org.apache.tika.parser.ocr.TesseractOCRConfig;
 import org.apache.tika.parser.pdf.PDFParserConfig.OCR_STRATEGY;
 import org.sleuthkit.autopsy.coreutils.ExecUtil.HybridTerminator;
 import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector;
@@ -283,7 +283,12 @@ final class TikaTextExtractor implements TextExtractor {
         if (isOcrSupported()) {
             // Configure OCR for Tika if it chooses to run OCR
             // during extraction
-            TesseractOCRConfig ocrConfig = getTesseractConfig();
+            TesseractOCRConfig ocrConfig = new TesseractOCRConfig();
+            String tesseractFolder = TESSERACT_PATH.getParent();
+            // coming from https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=109454096#TikaOCR-OverridingDefaultConfiguration
+            ocrConfig.getOtherTesseractConfig().put("tessdataPath", PlatformUtil.getOcrLanguagePacksPath());
+            ocrConfig.getOtherTesseractConfig().put("tesseractPath", tesseractFolder);
+            ocrConfig.setLanguage(languagePacks);
             parseContext.set(TesseractOCRConfig.class, ocrConfig);
 
             // Configure how Tika handles OCRing PDFs
@@ -344,16 +349,6 @@ final class TikaTextExtractor implements TextExtractor {
             future.cancel(true);
         }
     }
-    
-    private TesseractOCRConfig getTesseractConfig() {
-        // GVDTODO look at this: https://tika.apache.org/3.0.0/configuring.html
-
-        // String tesseractFolder = TESSERACT_PATH.getParent();
-        //     ocrConfig.setTesseractPath(tesseractFolder);
-        //     ocrConfig.setLanguage(languagePacks);
-        //     ocrConfig.setTessdataPath(PlatformUtil.getOcrLanguagePacksPath());
-        return null;    
-    }
 
     /**
      * Run OCR and return the file stream produced by Tesseract.

From 65865adbde6a8cb254b24141ca7ae4e39952df99 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 8 Jan 2025 17:39:44 -0500
Subject: [PATCH 11/14] preliminary cleanup

---
 Core/nbproject/project.properties          |   1 -
 CoreLibs/build.xml                         |   8 +-
 CoreLibs/nbproject/project.properties      |  57 ++++++-----
 CoreLibs/nbproject/project.xml             | 112 ++++++++++-----------
 KeywordSearch/nbproject/project.properties |   1 -
 Tika/nbproject/project.properties          |   1 -
 6 files changed, 91 insertions(+), 89 deletions(-)

diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 7408b5fb45..e3328807ef 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,4 +1,3 @@
-#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
diff --git a/CoreLibs/build.xml b/CoreLibs/build.xml
index 57ab10853e..fa12044bd3 100644
--- a/CoreLibs/build.xml
+++ b/CoreLibs/build.xml
@@ -40,7 +40,13 @@
         
         <!-- Make a report that lists out the dependencies that our JARs have -->	
         <ivy:report todir='${basedir}/build/ivy-reports' graph='true' xml='false'/>
-        <ivy:retrieve pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
+        <ivy:retrieve pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]">
+            <!-- this is to prevent an issue with '+' in the version identifier which messes with the properties file -->
+            <firstmatchmapper>
+                <regexpmapper from="^(.*)\+(.*)$" to="\1\2"/>
+                <identitymapper/>
+            </firstmatchmapper>
+        </ivy:retrieve>
     </target>
     
     <target name="init" depends="get-deps,harness.init"/>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index cef555e3b1..8eca83e503 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -1,4 +1,3 @@
-#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
@@ -88,34 +87,34 @@ file.reference.jackson-core-2.18.2.jar=release/modules/ext/jackson-core-2.18.2.j
 file.reference.jackson-databind-2.18.2.jar=release/modules/ext/jackson-databind-2.18.2.jar
 file.reference.jackson-dataformat-csv-2.18.2.jar=release/modules/ext/jackson-dataformat-csv-2.18.2.jar
 file.reference.jackson-datatype-jsr310-2.18.2.jar=release/modules/ext/jackson-datatype-jsr310-2.18.2.jar
-file.reference.javafx-base-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-base-17.0.14-ea+2-linux.jar
-file.reference.javafx-base-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-base-17.0.14-ea+2-mac.jar
-file.reference.javafx-base-17.0.14-ea+2-win.jar=release/modules/ext/javafx-base-17.0.14-ea+2-win.jar
-file.reference.javafx-base-17.0.14-ea+2.jar=release/modules/ext/javafx-base-17.0.14-ea+2.jar
-file.reference.javafx-controls-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-controls-17.0.14-ea+2-linux.jar
-file.reference.javafx-controls-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-controls-17.0.14-ea+2-mac.jar
-file.reference.javafx-controls-17.0.14-ea+2-win.jar=release/modules/ext/javafx-controls-17.0.14-ea+2-win.jar
-file.reference.javafx-controls-17.0.14-ea+2.jar=release/modules/ext/javafx-controls-17.0.14-ea+2.jar
-file.reference.javafx-fxml-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2-linux.jar
-file.reference.javafx-fxml-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2-mac.jar
-file.reference.javafx-fxml-17.0.14-ea+2-win.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2-win.jar
-file.reference.javafx-fxml-17.0.14-ea+2.jar=release/modules/ext/javafx-fxml-17.0.14-ea+2.jar
-file.reference.javafx-graphics-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2-linux.jar
-file.reference.javafx-graphics-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2-mac.jar
-file.reference.javafx-graphics-17.0.14-ea+2-win.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2-win.jar
-file.reference.javafx-graphics-17.0.14-ea+2.jar=release/modules/ext/javafx-graphics-17.0.14-ea+2.jar
-file.reference.javafx-media-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-media-17.0.14-ea+2-linux.jar
-file.reference.javafx-media-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-media-17.0.14-ea+2-mac.jar
-file.reference.javafx-media-17.0.14-ea+2-win.jar=release/modules/ext/javafx-media-17.0.14-ea+2-win.jar
-file.reference.javafx-media-17.0.14-ea+2.jar=release/modules/ext/javafx-media-17.0.14-ea+2.jar
-file.reference.javafx-swing-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-swing-17.0.14-ea+2-linux.jar
-file.reference.javafx-swing-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-swing-17.0.14-ea+2-mac.jar
-file.reference.javafx-swing-17.0.14-ea+2-win.jar=release/modules/ext/javafx-swing-17.0.14-ea+2-win.jar
-file.reference.javafx-swing-17.0.14-ea+2.jar=release/modules/ext/javafx-swing-17.0.14-ea+2.jar
-file.reference.javafx-web-17.0.14-ea+2-linux.jar=release/modules/ext/javafx-web-17.0.14-ea+2-linux.jar
-file.reference.javafx-web-17.0.14-ea+2-mac.jar=release/modules/ext/javafx-web-17.0.14-ea+2-mac.jar
-file.reference.javafx-web-17.0.14-ea+2-win.jar=release/modules/ext/javafx-web-17.0.14-ea+2-win.jar
-file.reference.javafx-web-17.0.14-ea+2.jar=release/modules/ext/javafx-web-17.0.14-ea+2.jar
+file.reference.javafx-base-17.0.14-ea2-linux.jar=release/modules/ext/javafx-base-17.0.14-ea2-linux.jar
+file.reference.javafx-base-17.0.14-ea2-mac.jar=release/modules/ext/javafx-base-17.0.14-ea2-mac.jar
+file.reference.javafx-base-17.0.14-ea2-win.jar=release/modules/ext/javafx-base-17.0.14-ea2-win.jar
+file.reference.javafx-base-17.0.14-ea2.jar=release/modules/ext/javafx-base-17.0.14-ea2.jar
+file.reference.javafx-controls-17.0.14-ea2-linux.jar=release/modules/ext/javafx-controls-17.0.14-ea2-linux.jar
+file.reference.javafx-controls-17.0.14-ea2-mac.jar=release/modules/ext/javafx-controls-17.0.14-ea2-mac.jar
+file.reference.javafx-controls-17.0.14-ea2-win.jar=release/modules/ext/javafx-controls-17.0.14-ea2-win.jar
+file.reference.javafx-controls-17.0.14-ea2.jar=release/modules/ext/javafx-controls-17.0.14-ea2.jar
+file.reference.javafx-fxml-17.0.14-ea2-linux.jar=release/modules/ext/javafx-fxml-17.0.14-ea2-linux.jar
+file.reference.javafx-fxml-17.0.14-ea2-mac.jar=release/modules/ext/javafx-fxml-17.0.14-ea2-mac.jar
+file.reference.javafx-fxml-17.0.14-ea2-win.jar=release/modules/ext/javafx-fxml-17.0.14-ea2-win.jar
+file.reference.javafx-fxml-17.0.14-ea2.jar=release/modules/ext/javafx-fxml-17.0.14-ea2.jar
+file.reference.javafx-graphics-17.0.14-ea2-linux.jar=release/modules/ext/javafx-graphics-17.0.14-ea2-linux.jar
+file.reference.javafx-graphics-17.0.14-ea2-mac.jar=release/modules/ext/javafx-graphics-17.0.14-ea2-mac.jar
+file.reference.javafx-graphics-17.0.14-ea2-win.jar=release/modules/ext/javafx-graphics-17.0.14-ea2-win.jar
+file.reference.javafx-graphics-17.0.14-ea2.jar=release/modules/ext/javafx-graphics-17.0.14-ea2.jar
+file.reference.javafx-media-17.0.14-ea2-linux.jar=release/modules/ext/javafx-media-17.0.14-ea2-linux.jar
+file.reference.javafx-media-17.0.14-ea2-mac.jar=release/modules/ext/javafx-media-17.0.14-ea2-mac.jar
+file.reference.javafx-media-17.0.14-ea2-win.jar=release/modules/ext/javafx-media-17.0.14-ea2-win.jar
+file.reference.javafx-media-17.0.14-ea2.jar=release/modules/ext/javafx-media-17.0.14-ea2.jar
+file.reference.javafx-swing-17.0.14-ea2-linux.jar=release/modules/ext/javafx-swing-17.0.14-ea2-linux.jar
+file.reference.javafx-swing-17.0.14-ea2-mac.jar=release/modules/ext/javafx-swing-17.0.14-ea2-mac.jar
+file.reference.javafx-swing-17.0.14-ea2-win.jar=release/modules/ext/javafx-swing-17.0.14-ea2-win.jar
+file.reference.javafx-swing-17.0.14-ea2.jar=release/modules/ext/javafx-swing-17.0.14-ea2.jar
+file.reference.javafx-web-17.0.14-ea2-linux.jar=release/modules/ext/javafx-web-17.0.14-ea2-linux.jar
+file.reference.javafx-web-17.0.14-ea2-mac.jar=release/modules/ext/javafx-web-17.0.14-ea2-mac.jar
+file.reference.javafx-web-17.0.14-ea2-win.jar=release/modules/ext/javafx-web-17.0.14-ea2-win.jar
+file.reference.javafx-web-17.0.14-ea2.jar=release/modules/ext/javafx-web-17.0.14-ea2.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
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 3aefaa6d83..962c45afab 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -914,116 +914,116 @@
                 <binary-origin>release/modules/ext/jackson-datatype-jsr310-2.18.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea+2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea+2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-17.0.14-ea2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea+2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea+2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea+2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea+2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea+2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea+2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea+2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea+2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-17.0.14-ea2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea+2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea+2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea2-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea2-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea2-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea+2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea+2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-web-17.0.14-ea2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 862a8772a3..1a8de9efe6 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,4 +1,3 @@
-#Wed Jan 08 19:35:29 UTC 2025
 file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.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
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index fa82da1fbc..7c62ef7bfb 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -1,4 +1,3 @@
-#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

From e35ab8acb580570e48be1aaa04ce7c24363040dc Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Sun, 12 Jan 2025 17:03:47 -0500
Subject: [PATCH 12/14] updates

---
 Core/ivy.xml                                  |  4 ++--
 Core/nbproject/project.properties             |  6 +-----
 Core/nbproject/project.xml                    | 20 ++-----------------
 .../sleuthkit/autopsy/coreutils/XMLUtil.java  |  9 +--------
 .../filetypeid/CustomFileTypesManager.java    |  2 +-
 KeywordSearch/solr/server/etc/security.policy |  2 +-
 6 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index 148351912a..1746c2f06d 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -43,8 +43,8 @@
         <dependency conf="core->default" org="io.github.java-diff-utils" name="java-diff-utils" rev="4.15"/>
         
         <!-- JAXB -->
-        <dependency conf="core->default" org="javax.xml.bind" name="jaxb-api" rev="2.3.1"/>
-        <dependency conf="core->default" org="org.glassfish.jaxb" name="jaxb-runtime" rev="4.0.5"/>
+        <dependency conf="core->default" org="jakarta.xml.bind" name="jakarta.xml.bind-api" rev="4.0.2"/>
+        <dependency conf="core->default" org="com.sun.xml.bind" name="jaxb-impl" rev="4.0.5"/>
 
         <dependency conf="core->default" org="org.icepdf.os" name="icepdf-viewer" rev="6.2.2">
             <!-- get the new latest batik items below, override bouncy castle -->
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index e3328807ef..78007a1805 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -42,7 +42,6 @@ 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.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-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
@@ -55,11 +54,9 @@ file.reference.jakarta.jms-api-3.1.0.jar=release/modules/ext/jakarta.jms-api-3.1
 file.reference.jakarta.transaction-api-1.3.3.jar=release/modules/ext/jakarta.transaction-api-1.3.3.jar
 file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar
 file.reference.java-diff-utils-4.15.jar=release/modules/ext/java-diff-utils-4.15.jar
-file.reference.javax.activation-api-1.2.0.jar=release/modules/ext/javax.activation-api-1.2.0.jar
 file.reference.javax.ws.rs-api-2.1.1.jar=release/modules/ext/javax.ws.rs-api-2.1.1.jar
-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.jaxb-impl-4.0.5.jar=release/modules/ext/jaxb-impl-4.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
@@ -102,7 +99,6 @@ 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.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
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 8d8e59e94e..5f67399107 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -533,10 +533,6 @@
                 <runtime-relative-path>ext/icepdf-viewer-6.2.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/icepdf-viewer-6.2.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/istack-commons-runtime-4.1.2.jar</runtime-relative-path>
-                <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-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/j2objc-annotations-3.0.0.jar</binary-origin>
@@ -585,25 +581,17 @@
                 <runtime-relative-path>ext/java-diff-utils-4.15.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/java-diff-utils-4.15.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/javax.activation-api-1.2.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javax.activation-api-1.2.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.ws.rs-api-2.1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/javax.ws.rs-api-2.1.1.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jaxb-api-2.3.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jaxb-api-2.3.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jaxb-core-4.0.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jaxb-core-4.0.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jaxb-runtime-4.0.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jaxb-runtime-4.0.5.jar</binary-origin>
+                <runtime-relative-path>ext/jaxb-impl-4.0.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jaxb-impl-4.0.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jaxen-1.2.0.jar</runtime-relative-path>
@@ -781,10 +769,6 @@
                 <runtime-relative-path>ext/sqlite-jdbc-3.47.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sqlite-jdbc-3.47.1.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <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>
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
index eb3c16e1c1..f4242f9aa1 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
@@ -73,14 +73,7 @@ public class XMLUtil {
     }
     
     private static SchemaFactory getSchemaFactory(String schemaLanguage) {
-        // See JIRA-6958 for details about class loading and jaxb.
-        ClassLoader original = Thread.currentThread().getContextClassLoader();
-        try {
-            Thread.currentThread().setContextClassLoader(XMLUtil.class.getClassLoader());
-            return SchemaFactory.newInstance(schemaLanguage);
-        } finally {
-            Thread.currentThread().setContextClassLoader(original);
-        }
+        return SchemaFactory.newInstance(schemaLanguage);
     }
     
     private static TransformerFactory getTransformerFactory() {
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java
index dda4416ee6..63d1df7c5e 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.modules.filetypeid;
 
+import jakarta.xml.bind.DatatypeConverter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -26,7 +27,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.parsers.ParserConfigurationException;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
diff --git a/KeywordSearch/solr/server/etc/security.policy b/KeywordSearch/solr/server/etc/security.policy
index 7716da090a..e10da56348 100755
--- a/KeywordSearch/solr/server/etc/security.policy
+++ b/KeywordSearch/solr/server/etc/security.policy
@@ -146,7 +146,7 @@ grant {
   permission java.security.SecurityPermission "putProviderProperty.SaslPlainServer";
   permission java.security.SecurityPermission "insertProvider";
 
-  permission javax.xml.bind.JAXBPermission "setDatatypeConverter";
+  permission jakarta.xml.bind.JAXBPermission "setDatatypeConverter";
 
   // SSL related properties for Solr tests
   permission javax.net.ssl.SSLPermission "setDefaultSSLContext";

From 97c4f97d215bf4d6674db083eda80e55769b9025 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 14 Jan 2025 21:21:48 -0500
Subject: [PATCH 13/14] updates

---
 CoreTestLibs/nbproject/project.properties     |   1 -
 Experimental/nbproject/project.properties     |   1 -
 KeywordSearch/ivy.xml                         |  11 +-
 KeywordSearch/ivysettings.xml                 |   8 +-
 KeywordSearch/nbproject/project.properties    |  56 ++++----
 KeywordSearch/nbproject/project.xml           | 136 +++++++++---------
 .../autopsy/keywordsearch/Server.java         |   8 +-
 .../nbproject/project.properties              |   1 -
 8 files changed, 103 insertions(+), 119 deletions(-)

diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties
index 82d59d6fa3..3cfbab46f8 100644
--- a/CoreTestLibs/nbproject/project.properties
+++ b/CoreTestLibs/nbproject/project.properties
@@ -1,4 +1,3 @@
-#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
diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties
index 52c13e3bf7..bbab824d65 100644
--- a/Experimental/nbproject/project.properties
+++ b/Experimental/nbproject/project.properties
@@ -1,4 +1,3 @@
-#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
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 0a1d040ce5..3a03cb9dd8 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -17,11 +17,11 @@
         <!-- Solr -->
 	    <dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.10.4" transitive="false" /> <!-- the war file for embedded Solr 4 -->
         
-        <dependency conf="solr-libs->default" name="solr-cell" rev="8.11.4" org="org.apache.solr"/>
+        <dependency conf="solr-libs->default" org="org.apache.solr" name="solr-cell" rev="${solr.version}"/>
         <!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
-        <dependency conf="autopsy->default" org="org.apache.lucene" name="lucene-core" rev="9.12.1"/>     
+        <dependency conf="autopsy->default" org="org.apache.lucene" name="lucene-core" rev="${solr.version}"/>     
         <!-- Autopsy -->
-        <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="9.7.0"/>
+        <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="${solr.version}"/>
         <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"/> -->
@@ -43,7 +43,6 @@
         <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="org.eclipse.jetty.http2" ext="*"/>
         <exclude org="" ext="*" type="javadoc"/>
         
         <override org="commons-io" module="commons-io" rev="2.18.0"/>
@@ -64,7 +63,7 @@
         <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"/>
+        <override org="org.apache.zookeeper" module="zookeeper" rev="${zookeeper.version}"/>
+        <override org="org.apache.zookeeper" module="zookeeper-jute" rev="${zookeeper.version}"/>
     </dependencies>
 </ivy-module>
diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml
index 8f76a6c352..b582aee40a 100644
--- a/KeywordSearch/ivysettings.xml
+++ b/KeywordSearch/ivysettings.xml
@@ -1,9 +1,11 @@
 <ivysettings>
-  <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="jetty.version" value="12.0.16"/>
+  <property name="log4j.version" value="2.24.3"/>
   <property name="netty.version" value="4.1.116.Final"/>
+  <property name="slf4j.version" value="2.0.16"/>
+  <property name="solr.version" value="8.11.4"/>
+  <property name="zookeeper.version" value="3.9.3"/>
 
   <settings defaultResolver="main"/>
   <resolvers>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 1a8de9efe6..93c35e470f 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,52 +1,50 @@
 file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.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-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar
+file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
 file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.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.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.http2-client-11.0.24.jar=release/modules/ext/http2-client-11.0.24.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.icu4j-76.1.jar=release/modules/ext/icu4j-76.1.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.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.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.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.lucene-core-8.11.4.jar=release/modules/ext/lucene-core-8.11.4.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.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-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-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.netty-transport-native-epoll-4.1.116.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.116.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.7.jar=release/modules/ext/snappy-java-1.1.10.7.jar
+file.reference.solr-solrj-8.11.4.jar=release/modules/ext/solr-solrj-8.11.4.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.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
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index c557bcd310..ca03edaf12 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -242,14 +242,14 @@
                 <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>
-                <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-lang-2.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang-2.6.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>
@@ -271,16 +271,32 @@
                 <binary-origin>release/modules/ext/hamcrest-core-1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/httpclient-4.5.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpclient-4.5.14.jar</binary-origin>
+                <runtime-relative-path>ext/http2-client-11.0.24.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/http2-client-11.0.24.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/httpcore-4.4.16.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpcore-4.4.16.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/httpmime-4.5.14.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpmime-4.5.14.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/icu4j-76.1.jar</runtime-relative-path>
@@ -291,48 +307,32 @@
                 <binary-origin>release/modules/ext/j2objc-annotations-3.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </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>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsonic-1.2.11.jar</runtime-relative-path>
@@ -355,28 +355,28 @@
                 <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>
+                <runtime-relative-path>ext/lucene-core-8.11.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/lucene-core-8.11.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <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>
-                <binary-origin>release/modules/ext/netty-handler-4.1.113.Final.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/netty-tcnative-boringssl-static-2.0.66.Final.jar</runtime-relative-path>
@@ -395,40 +395,32 @@
                 <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.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>
+                <runtime-relative-path>ext/netty-transport-native-epoll-4.1.116.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-native-epoll-4.1.116.Final.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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/semver4j-5.3.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/semver4j-5.3.0.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <runtime-relative-path>ext/snappy-java-1.1.10.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/snappy-java-1.1.10.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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>
+                <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>
             </class-path-extension>
             <class-path-extension>
-                <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/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>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/zookeeper-3.9.3.jar</runtime-relative-path>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index 9786bbd2c2..158dd48453 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -71,7 +71,6 @@ 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;
@@ -394,11 +393,8 @@ 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)
-                .withInternalClientBuilder(new Http2SolrClient.Builder()
-                    .withConnectionTimeout(connectionTimeoutMs, TimeUnit.MILLISECONDS)
-                    .withRequestTimeout(connectionTimeoutMs, TimeUnit.MILLISECONDS)
-                )
-                .withResponseParser(new XMLResponseParser())
+                .withConnectionTimeout(connectionTimeoutMs)
+                .withSocketTimeout(connectionTimeoutMs)
                 .build();
         if (!defaultCollectionName.isEmpty()) {
             client.setDefaultCollection(defaultCollectionName);
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index e162ffa946..66a9ccce1e 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -1,4 +1,3 @@
-#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

From 65a2814b404df622fee0560018f57e6ff4c3a1a1 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 17 Jan 2025 11:02:10 -0500
Subject: [PATCH 14/14] tika deps update

---
 Tika/ivy.xml                      |  11 ++-
 Tika/ivysettings.xml              |   1 +
 Tika/nbproject/project.properties |  29 ++++++++
 Tika/nbproject/project.xml        | 116 ++++++++++++++++++++++++++++++
 4 files changed, 154 insertions(+), 3 deletions(-)

diff --git a/Tika/ivy.xml b/Tika/ivy.xml
index 7119a8cf4c..e489429b6f 100755
--- a/Tika/ivy.xml
+++ b/Tika/ivy.xml
@@ -4,17 +4,22 @@
         <conf name="tika"/>
     </configurations>
     <dependencies >
-        <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers-standard-package" rev="3.0.0"/>
-        <dependency conf="tika->default" org="org.apache.tika" name="tika-core" rev="3.0.0"/>
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-parsers-standard-package" rev="${tika.version}"/>
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-parser-scientific-package" rev="${tika.version}"/>
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-parser-sqlite3-package" rev="${tika.version}"/>
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-parser-advancedmedia-package" rev="${tika.version}"/>
+
+        <dependency conf="tika->default" org="org.apache.tika" name="tika-core" rev="${tika.version}"/>
 
         <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="bcprov-jdk15on"/>
         <exclude org="org.bouncycastle" module="bcpkix-jdk15on"/>
         <exclude org="*" ext="*" type="javadoc"/>
+        <exclude org="*" ext="*" type="tests" />
 
         <override org="org.bouncycastle" module="bcprov-jdk18on" rev="${bouncycastle.version}"/>
         <override org="org.bouncycastle" module="bcpkix-jdk18on" rev="${bouncycastle.version}"/>
diff --git a/Tika/ivysettings.xml b/Tika/ivysettings.xml
index 1d48bc03b3..fc14bbafde 100755
--- a/Tika/ivysettings.xml
+++ b/Tika/ivysettings.xml
@@ -2,6 +2,7 @@
   <settings defaultResolver="main"/>
   <property name="log4j.version" value="2.24.3"/>
   <property name="bouncycastle.version" value="1.79"/>
+  <property name="tika.version" value="3.0.0"/>
   
   <resolvers>
     <chain name="main">
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index 7c62ef7bfb..48b03ab6a8 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -7,6 +7,7 @@ file.reference.bcjmail-jdk18on-1.78.1.jar=release/modules/ext/bcjmail-jdk18on-1.
 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.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.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
 file.reference.commons-compress-1.27.1.jar=release/modules/ext/commons-compress-1.27.1.jar
@@ -20,6 +21,11 @@ file.reference.curvesapi-1.08.jar=release/modules/ext/curvesapi-1.08.jar
 file.reference.dd-plist-1.28.jar=release/modules/ext/dd-plist-1.28.jar
 file.reference.dec-0.1.2.jar=release/modules/ext/dec-0.1.2.jar
 file.reference.fontbox-3.0.3.jar=release/modules/ext/fontbox-3.0.3.jar
+file.reference.geoapi-3.0.2.jar=release/modules/ext/geoapi-3.0.2.jar
+file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.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.istack-commons-runtime-4.1.2.jar=release/modules/ext/istack-commons-runtime-4.1.2.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
@@ -28,23 +34,30 @@ file.reference.jackson-core-2.18.0.jar=release/modules/ext/jackson-core-2.18.0.j
 file.reference.jackson-databind-2.18.0.jar=release/modules/ext/jackson-databind-2.18.0.jar
 file.reference.jai-imageio-core-1.4.0.jar=release/modules/ext/jai-imageio-core-1.4.0.jar
 file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar
+file.reference.jakarta.ws.rs-api-3.1.0.jar=release/modules/ext/jakarta.ws.rs-api-3.1.0.jar
 file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar
 file.reference.java-libpst-0.9.3.jar=release/modules/ext/java-libpst-0.9.3.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.jbig2-imageio-3.0.4.jar=release/modules/ext/jbig2-imageio-3.0.4.jar
+file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar
 file.reference.jcl-over-slf4j-2.0.16.jar=release/modules/ext/jcl-over-slf4j-2.0.16.jar
 file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar
 file.reference.jempbox-1.8.17.jar=release/modules/ext/jempbox-1.8.17.jar
 file.reference.jhighlight-1.1.0.jar=release/modules/ext/jhighlight-1.1.0.jar
+file.reference.jj2000-5.2.jar=release/modules/ext/jj2000-5.2.jar
 file.reference.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar
+file.reference.jna-5.15.0.jar=release/modules/ext/jna-5.15.0.jar
+file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
 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.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.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar
 file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar
+file.reference.openjson-1.0.13.jar=release/modules/ext/openjson-1.0.13.jar
 file.reference.parso-2.0.14.jar=release/modules/ext/parso-2.0.14.jar
 file.reference.pdfbox-3.0.3.jar=release/modules/ext/pdfbox-3.0.3.jar
 file.reference.pdfbox-io-3.0.3.jar=release/modules/ext/pdfbox-io-3.0.3.jar
@@ -54,11 +67,21 @@ file.reference.poi-5.3.0.jar=release/modules/ext/poi-5.3.0.jar
 file.reference.poi-ooxml-5.3.0.jar=release/modules/ext/poi-ooxml-5.3.0.jar
 file.reference.poi-ooxml-lite-5.3.0.jar=release/modules/ext/poi-ooxml-lite-5.3.0.jar
 file.reference.poi-scratchpad-5.3.0.jar=release/modules/ext/poi-scratchpad-5.3.0.jar
+file.reference.protobuf-java-3.25.5.jar=release/modules/ext/protobuf-java-3.25.5.jar
 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.sis-feature-1.4.jar=release/modules/ext/sis-feature-1.4.jar
+file.reference.sis-metadata-1.4.jar=release/modules/ext/sis-metadata-1.4.jar
+file.reference.sis-netcdf-1.4.jar=release/modules/ext/sis-netcdf-1.4.jar
+file.reference.sis-referencing-1.4.jar=release/modules/ext/sis-referencing-1.4.jar
+file.reference.sis-storage-1.4.jar=release/modules/ext/sis-storage-1.4.jar
+file.reference.sis-utility-1.4.jar=release/modules/ext/sis-utility-1.4.jar
 file.reference.slf4j-api-2.0.16.jar=release/modules/ext/slf4j-api-2.0.16.jar
+file.reference.sqlite-jdbc-3.46.1.3.jar=release/modules/ext/sqlite-jdbc-3.46.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-advancedmedia-module-3.0.0.jar=release/modules/ext/tika-parser-advancedmedia-module-3.0.0.jar
+file.reference.tika-parser-advancedmedia-package-3.0.0.jar=release/modules/ext/tika-parser-advancedmedia-package-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
 file.reference.tika-parser-audiovideo-module-3.0.0.jar=release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar
 file.reference.tika-parser-cad-module-3.0.0.jar=release/modules/ext/tika-parser-cad-module-3.0.0.jar
@@ -68,6 +91,7 @@ file.reference.tika-parser-digest-commons-3.0.0.jar=release/modules/ext/tika-par
 file.reference.tika-parser-font-module-3.0.0.jar=release/modules/ext/tika-parser-font-module-3.0.0.jar
 file.reference.tika-parser-html-module-3.0.0.jar=release/modules/ext/tika-parser-html-module-3.0.0.jar
 file.reference.tika-parser-image-module-3.0.0.jar=release/modules/ext/tika-parser-image-module-3.0.0.jar
+file.reference.tika-parser-jdbc-commons-3.0.0.jar=release/modules/ext/tika-parser-jdbc-commons-3.0.0.jar
 file.reference.tika-parser-mail-commons-3.0.0.jar=release/modules/ext/tika-parser-mail-commons-3.0.0.jar
 file.reference.tika-parser-mail-module-3.0.0.jar=release/modules/ext/tika-parser-mail-module-3.0.0.jar
 file.reference.tika-parser-microsoft-module-3.0.0.jar=release/modules/ext/tika-parser-microsoft-module-3.0.0.jar
@@ -76,6 +100,10 @@ file.reference.tika-parser-news-module-3.0.0.jar=release/modules/ext/tika-parser
 file.reference.tika-parser-ocr-module-3.0.0.jar=release/modules/ext/tika-parser-ocr-module-3.0.0.jar
 file.reference.tika-parser-pdf-module-3.0.0.jar=release/modules/ext/tika-parser-pdf-module-3.0.0.jar
 file.reference.tika-parser-pkg-module-3.0.0.jar=release/modules/ext/tika-parser-pkg-module-3.0.0.jar
+file.reference.tika-parser-scientific-module-3.0.0.jar=release/modules/ext/tika-parser-scientific-module-3.0.0.jar
+file.reference.tika-parser-scientific-package-3.0.0.jar=release/modules/ext/tika-parser-scientific-package-3.0.0.jar
+file.reference.tika-parser-sqlite3-module-3.0.0.jar=release/modules/ext/tika-parser-sqlite3-module-3.0.0.jar
+file.reference.tika-parser-sqlite3-package-3.0.0.jar=release/modules/ext/tika-parser-sqlite3-package-3.0.0.jar
 file.reference.tika-parser-text-module-3.0.0.jar=release/modules/ext/tika-parser-text-module-3.0.0.jar
 file.reference.tika-parser-webarchive-module-3.0.0.jar=release/modules/ext/tika-parser-webarchive-module-3.0.0.jar
 file.reference.tika-parser-xml-module-3.0.0.jar=release/modules/ext/tika-parser-xml-module-3.0.0.jar
@@ -83,6 +111,7 @@ file.reference.tika-parser-xmp-commons-3.0.0.jar=release/modules/ext/tika-parser
 file.reference.tika-parser-zip-commons-3.0.0.jar=release/modules/ext/tika-parser-zip-commons-3.0.0.jar
 file.reference.tika-parsers-standard-package-3.0.0.jar=release/modules/ext/tika-parsers-standard-package-3.0.0.jar
 file.reference.txw2-4.0.5.jar=release/modules/ext/txw2-4.0.5.jar
+file.reference.unit-api-2.2.jar=release/modules/ext/unit-api-2.2.jar
 file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar
 file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar
 file.reference.xmlbeans-5.2.1.jar=release/modules/ext/xmlbeans-5.2.1.jar
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index d1a22b74a8..2403fa7ea0 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -387,6 +387,10 @@
                 <runtime-relative-path>ext/bcutil-jdk18on-1.78.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/bcutil-jdk18on-1.78.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/bzip2-0.9.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bzip2-0.9.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-codec-1.17.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-codec-1.17.1.jar</binary-origin>
@@ -439,6 +443,26 @@
                 <runtime-relative-path>ext/fontbox-3.0.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/fontbox-3.0.3.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/geoapi-3.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/geoapi-3.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/grib-4.5.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grib-4.5.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <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/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/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/istack-commons-runtime-4.1.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/istack-commons-runtime-4.1.2.jar</binary-origin>
@@ -471,6 +495,10 @@
                 <runtime-relative-path>ext/jakarta.activation-api-2.1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jakarta.activation-api-2.1.3.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <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/jakarta.xml.bind-api-4.0.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jakarta.xml.bind-api-4.0.2.jar</binary-origin>
@@ -491,6 +519,10 @@
                 <runtime-relative-path>ext/jbig2-imageio-3.0.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jbig2-imageio-3.0.4.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jcip-annotations-1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcip-annotations-1.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jcl-over-slf4j-2.0.16.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jcl-over-slf4j-2.0.16.jar</binary-origin>
@@ -507,10 +539,22 @@
                 <runtime-relative-path>ext/jhighlight-1.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jhighlight-1.1.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jj2000-5.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jj2000-5.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jmatio-1.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jmatio-1.5.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jna-5.15.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jna-5.15.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/json-simple-1.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/json-simple-1.1.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jsoup-1.18.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jsoup-1.18.1.jar</binary-origin>
@@ -535,10 +579,18 @@
                 <runtime-relative-path>ext/metadata-extractor-2.19.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/metadata-extractor-2.19.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netcdf4-4.5.5.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/ooxml-schemas-1.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/ooxml-schemas-1.4.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/openjson-1.0.13.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/openjson-1.0.13.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/parso-2.0.14.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/parso-2.0.14.jar</binary-origin>
@@ -575,6 +627,10 @@
                 <runtime-relative-path>ext/poi-scratchpad-5.3.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-scratchpad-5.3.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/protobuf-java-3.25.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/protobuf-java-3.25.5.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/rome-2.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/rome-2.1.0.jar</binary-origin>
@@ -583,6 +639,30 @@
                 <runtime-relative-path>ext/rome-utils-2.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/rome-utils-2.1.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-feature-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sis-feature-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-metadata-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sis-metadata-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-netcdf-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sis-netcdf-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-referencing-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sis-referencing-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-storage-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sis-storage-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sis-utility-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sis-utility-1.4.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/slf4j-api-2.0.16.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/slf4j-api-2.0.16.jar</binary-origin>
@@ -591,6 +671,10 @@
                 <runtime-relative-path>ext/SparseBitSet-1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/SparseBitSet-1.3.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sqlite-jdbc-3.46.1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sqlite-jdbc-3.46.1.3.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tagsoup-1.2.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tagsoup-1.2.1.jar</binary-origin>
@@ -599,6 +683,14 @@
                 <runtime-relative-path>ext/tika-core-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-core-3.0.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-advancedmedia-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-advancedmedia-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-advancedmedia-package-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-advancedmedia-package-3.0.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-parser-apple-module-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parser-apple-module-3.0.0.jar</binary-origin>
@@ -635,6 +727,10 @@
                 <runtime-relative-path>ext/tika-parser-image-module-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parser-image-module-3.0.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-jdbc-commons-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-jdbc-commons-3.0.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-parser-mail-commons-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parser-mail-commons-3.0.0.jar</binary-origin>
@@ -667,6 +763,22 @@
                 <runtime-relative-path>ext/tika-parser-pkg-module-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parser-pkg-module-3.0.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-scientific-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-scientific-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-scientific-package-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-scientific-package-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-sqlite3-module-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-sqlite3-module-3.0.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-parser-sqlite3-package-3.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-parser-sqlite3-package-3.0.0.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-parser-text-module-3.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parser-text-module-3.0.0.jar</binary-origin>
@@ -695,6 +807,10 @@
                 <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/unit-api-2.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/unit-api-2.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/vorbis-java-core-0.8.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/vorbis-java-core-0.8.jar</binary-origin>