diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 6063cbdcdf..6645013975 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,24 +1,34 @@
 file.reference.activemq-all-5.16.4.jar=release/modules/ext/activemq-all-5.16.4.jar
+file.reference.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar
 file.reference.batik-awt-util-1.6.jar=release/modules/ext/batik-awt-util-1.6.jar
 file.reference.batik-dom-1.6.jar=release/modules/ext/batik-dom-1.6.jar
 file.reference.batik-svg-dom-1.6.jar=release/modules/ext/batik-svg-dom-1.6.jar
 file.reference.batik-svggen-1.6.jar=release/modules/ext/batik-svggen-1.6.jar
 file.reference.batik-util-1.6.jar=release/modules/ext/batik-util-1.6.jar
 file.reference.batik-xml-1.6.jar=release/modules/ext/batik-xml-1.6.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.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar
+file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.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-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.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.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.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.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.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.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.13.2.jar=release/modules/ext/jackson-annotations-2.13.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.java-diff-utils-4.11.jar=release/modules/ext/java-diff-utils-4.11.jar
@@ -27,13 +37,27 @@ 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.jgraphx-4.2.2.jar=release/modules/ext/jgraphx-4.2.2.jar
 file.reference.jsoup-1.14.3.jar=release/modules/ext/jsoup-1.14.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.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.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.2.20.jar=release/modules/ext/mchange-commons-java-0.2.20.jar
 file.reference.metadata-extractor-2.17.0.jar=release/modules/ext/metadata-extractor-2.17.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.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.2.18.jar=release/modules/ext/postgresql-42.2.18.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 8a8c910e08..05ac769955 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -350,6 +350,10 @@
                 <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>
             </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.6.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/batik-awt-util-1.6.jar</binary-origin>
@@ -374,18 +378,42 @@
                 <runtime-relative-path>ext/batik-xml-1.6.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/batik-xml-1.6.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>
+            </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>
+            </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>
+            </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.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/checker-qual-3.12.0.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>
             </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>
+            </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>
+            </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>
@@ -410,6 +438,18 @@
                 <runtime-relative-path>ext/decodetect-core-0.3.jar</runtime-relative-path>
                 <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.11.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/error_prone_annotations-2.11.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-31.1-jre.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/icepdf-core-6.2.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/icepdf-core-6.2.2.jar</binary-origin>
@@ -418,6 +458,10 @@
                 <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/j2objc-annotations-1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/j2objc-annotations-1.3.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>
@@ -426,10 +470,6 @@
                 <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.13.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jackson-annotations-2.13.2.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jai_core-1.1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jai_core-1.1.3.jar</binary-origin>
@@ -462,6 +502,10 @@
                 <runtime-relative-path>ext/jsoup-1.14.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jsoup-1.14.3.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/jutf7-1.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jutf7-1.0.0.jar</binary-origin>
@@ -479,8 +523,16 @@
                 <binary-origin>release/modules/ext/libphonenumber-8.12.45.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
+                <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.2.20.jar</runtime-relative-path>
@@ -490,6 +542,50 @@
                 <runtime-relative-path>ext/metadata-extractor-2.17.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/metadata-extractor-2.17.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>
+            </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>
+            </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>
+            </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>
+            </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>
+            </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>
+            </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.73.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-transport-4.1.73.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>
+            </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>
+            </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>
+            </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>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 5056926698..b4afd88b51 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -1,11 +1,14 @@
 file.reference.animal-sniffer-annotations-1.21.jar=release/modules/ext/animal-sniffer-annotations-1.21.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.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-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.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
@@ -13,7 +16,6 @@ file.reference.commons-beanutils-1.9.4.jar=release/modules/ext/commons-beanutils
 file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.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-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-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
@@ -22,6 +24,7 @@ file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0
 file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.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-8.40.18.jar=release/modules/ext/controlsfx-8.40.18.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
@@ -37,10 +40,13 @@ file.reference.google-cloud-core-2.5.6.jar=release/modules/ext/google-cloud-core
 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
@@ -48,7 +54,9 @@ 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.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar
 file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar
@@ -70,6 +78,7 @@ file.reference.imageio-thumbsdb-3.8.2.jar=release/modules/ext/imageio-thumbsdb-3
 file.reference.imageio-tiff-3.8.2.jar=release/modules/ext/imageio-tiff-3.8.2.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.13.2.jar=release/modules/ext/jackson-annotations-2.13.2.jar
 file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar
 file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar
 file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar
@@ -85,19 +94,23 @@ 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-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
-file.reference.mchange-commons-java-0.2.20.jar=release/modules/ext/mchange-commons-java-0.2.20.jar
 file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.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.opencv-248.jar=release/modules/ext/opencv-248.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.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar
 file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar
 file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar
+file.reference.xmlbeans-3.0.1.jar=release/modules/ext/xmlbeans-3.0.1.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 nbm.needs.restart=true
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 0faa3c9087..febd3c9416 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -38,6 +38,7 @@
                 <package>com.apple.eawt.event</package>
                 <package>com.apple.eio</package>
                 <package>com.dd.plist</package>
+                <package>com.fasterxml.jackson.annotation</package>
                 <package>com.fasterxml.jackson.core</package>
                 <package>com.fasterxml.jackson.core.base</package>
                 <package>com.fasterxml.jackson.core.exc</package>
@@ -264,7 +265,6 @@
                 <package>jfxtras.util</package>
                 <package>net.htmlparser.jericho</package>
                 <package>net.htmlparser.jericho.nodoc</package>
-                <package>org.apache.tools.ant.types</package>
                 <package>org.apache.commons.codec</package>
                 <package>org.apache.commons.codec.binary</package>
                 <package>org.apache.commons.codec.cli</package>
@@ -292,35 +292,6 @@
                 <package>org.apache.commons.collections4.splitmap</package>
                 <package>org.apache.commons.collections4.trie</package>
                 <package>org.apache.commons.collections4.trie.analyzer</package>
-                <package>org.apache.commons.compress</package>
-                <package>org.apache.commons.compress.archivers</package>
-                <package>org.apache.commons.compress.archivers.ar</package>
-                <package>org.apache.commons.compress.archivers.arj</package>
-                <package>org.apache.commons.compress.archivers.cpio</package>
-                <package>org.apache.commons.compress.archivers.dump</package>
-                <package>org.apache.commons.compress.archivers.examples</package>
-                <package>org.apache.commons.compress.archivers.jar</package>
-                <package>org.apache.commons.compress.archivers.sevenz</package>
-                <package>org.apache.commons.compress.archivers.tar</package>
-                <package>org.apache.commons.compress.archivers.zip</package>
-                <package>org.apache.commons.compress.changes</package>
-                <package>org.apache.commons.compress.compressors</package>
-                <package>org.apache.commons.compress.compressors.brotli</package>
-                <package>org.apache.commons.compress.compressors.bzip2</package>
-                <package>org.apache.commons.compress.compressors.deflate</package>
-                <package>org.apache.commons.compress.compressors.deflate64</package>
-                <package>org.apache.commons.compress.compressors.gzip</package>
-                <package>org.apache.commons.compress.compressors.lz4</package>
-                <package>org.apache.commons.compress.compressors.lz77support</package>
-                <package>org.apache.commons.compress.compressors.lzma</package>
-                <package>org.apache.commons.compress.compressors.lzw</package>
-                <package>org.apache.commons.compress.compressors.pack200</package>
-                <package>org.apache.commons.compress.compressors.snappy</package>
-                <package>org.apache.commons.compress.compressors.xz</package>
-                <package>org.apache.commons.compress.compressors.z</package>
-                <package>org.apache.commons.compress.compressors.zstandard</package>
-                <package>org.apache.commons.compress.parallel</package>
-                <package>org.apache.commons.compress.utils</package>
                 <package>org.apache.commons.csv</package>
                 <package>org.apache.commons.io</package>
                 <package>org.apache.commons.io.comparator</package>
@@ -523,6 +494,10 @@
                 <runtime-relative-path>ext/animal-sniffer-annotations-1.21.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/animal-sniffer-annotations-1.21.jar</binary-origin>
             </class-path-extension>
+            <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>
@@ -539,18 +514,26 @@
                 <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>
+            </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>
             </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>
-            </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>
             </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>
+            </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>
@@ -579,10 +562,6 @@
                 <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>
-            </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>
@@ -615,6 +594,10 @@
                 <runtime-relative-path>ext/compiler-0.9.10.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/compiler-0.9.10.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>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/controlsfx-8.40.18.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/controlsfx-8.40.18.jar</binary-origin>
@@ -675,10 +658,18 @@
                 <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>
             </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>
+            </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>
             </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>
+            </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>
@@ -691,6 +682,10 @@
                 <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>
             </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>
+            </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>
@@ -719,10 +714,18 @@
                 <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>
             </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>
+            </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>
             </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>
+            </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>
@@ -807,6 +810,10 @@
                 <runtime-relative-path>ext/j2objc-annotations-1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-annotations-2.13.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-annotations-2.13.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jackson-core-2.13.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jackson-core-2.13.2.jar</binary-origin>
@@ -867,10 +874,6 @@
                 <runtime-relative-path>ext/log4j-1.2.17.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/mchange-commons-java-0.2.20.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/mchange-commons-java-0.2.20.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>
@@ -883,10 +886,22 @@
                 <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>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opencv-248.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>
+            </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>
+            </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>
@@ -907,6 +922,10 @@
                 <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>
             </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>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sigar-1.6.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sigar-1.6.4.jar</binary-origin>
@@ -919,6 +938,10 @@
                 <runtime-relative-path>ext/webp-imageio-sejda-0.1.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/webp-imageio-sejda-0.1.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xmlbeans-3.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlbeans-3.0.1.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 6608c1ccc1..0a37b804b6 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -1,38 +1,51 @@
 file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.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.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar
-file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar
+file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar
 file.reference.commons-io-2.8.0.jar=release/modules/ext/commons-io-2.8.0.jar
-file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
-file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.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.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.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.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.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.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.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.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar
-file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar
-file.reference.jcommander-1.82.jar=release/modules/ext/jcommander-1.82.jar
-file.reference.joda-time-2.10.4.jar=release/modules/ext/joda-time-2.10.4.jar
-file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
+file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.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.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar
-file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
+file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
 file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.jar
-file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
-file.reference.mchange-commons-java-0.2.20.jar=release/modules/ext/mchange-commons-java-0.2.20.jar
-file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.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.slf4j-api-1.7.24.jar=release/modules/ext/slf4j-api-1.7.24.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.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.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.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.1.jar=release/modules/ext/solr-solrj-8.11.1.jar
 file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar
-file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
-file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar
-file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar
-file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar
-file.reference.zookeeper-3.6.2.jar=release/modules/ext/zookeeper-3.6.2.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
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 95ea662d40..817080efe4 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -221,40 +221,48 @@
                 <binary-origin>release/modules/ext/annotations-12.0.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>
-            </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/cleartk-util-2.0.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/cleartk-util-2.0.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/checker-qual-3.12.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/checker-qual-3.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>
             </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/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/grib-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/grib-4.5.5.jar</binary-origin>
+                <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/error_prone_annotations-2.11.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/error_prone_annotations-2.11.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-31.1-jre.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-31.1-jre.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>
+            </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>
+            </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>
+            </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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
@@ -265,68 +273,120 @@
                 <binary-origin>release/modules/ext/httpcore-4.4.14.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>
+                <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-70.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/icu4j-70.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/java-libpst-0.9.5-SNAPSHOT.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar</binary-origin>
+                <runtime-relative-path>ext/j2objc-annotations-1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/j2objc-annotations-1.3.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/jcl-over-slf4j-1.7.24.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcl-over-slf4j-1.7.24.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/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>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/joda-time-2.10.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/joda-time-2.10.4.jar</binary-origin>
+                <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>
             </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/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>
+            </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>
+            </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>
+            </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>
             </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/juniversalchardet-1.0.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/juniversalchardet-1.0.3.jar</binary-origin>
+                <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/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/log4j-1.2.17.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/log4j-1.2.17.jar</binary-origin>
+                <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.20.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/mchange-commons-java-0.2.20.jar</binary-origin>
+                <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/netcdf4-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/netcdf4-4.5.5.jar</binary-origin>
+                <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/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/netty-buffer-4.1.68.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-buffer-4.1.68.Final.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/netty-codec-4.1.68.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-codec-4.1.68.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/slf4j-api-1.7.24.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-api-1.7.24.jar</binary-origin>
+                <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>
+            </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>
+            </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>
+            </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>
+            </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>
+            </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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/solr-solrj-8.11.1.jar</runtime-relative-path>
@@ -337,24 +397,16 @@
                 <binary-origin>release/modules/ext/stax2-api-4.2.1.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>
+                <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>
             </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/zookeeper-3.8.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/zookeeper-3.8.0.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>
-            </class-path-extension>
-            <class-path-extension>
-                <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/zookeeper-3.6.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/zookeeper-3.6.2.jar</binary-origin>
+                <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>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index d2276efd9d..74ce1385ec 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -1,21 +1,23 @@
-file.reference.HikariCP-java7-2.4.13.jar=release/modules/ext/HikariCP-java7-2.4.13.jar
-file.reference.animal-sniffer-annotations-1.21.jar=release/modules/ext/animal-sniffer-annotations-1.21.jar
 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.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar
+file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.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-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
@@ -23,14 +25,17 @@ file.reference.cxf-rt-frontend-jaxrs-3.5.0.jar=release/modules/ext/cxf-rt-fronte
 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.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.7.1.jar=release/modules/ext/error_prone_annotations-2.7.1.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.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.8.9.jar=release/modules/ext/gson-2.8.9.jar
+file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar
+file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.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
@@ -40,12 +45,16 @@ file.reference.istack-commons-runtime-3.0.12.jar=release/modules/ext/istack-comm
 file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.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.13.2.jar=release/modules/ext/jackson-annotations-2.13.2.jar
+file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar
+file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar
 file.reference.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.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar
-file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.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
@@ -56,14 +65,14 @@ 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.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar
 file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar
-file.reference.joda-time-2.10.4.jar=release/modules/ext/joda-time-2.10.4.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.jsoup-1.14.3.jar=release/modules/ext/jsoup-1.14.3.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.mchange-commons-java-0.2.20.jar=release/modules/ext/mchange-commons-java-0.2.20.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.openjson-1.0.12.jar=release/modules/ext/openjson-1.0.12.jar
@@ -75,6 +84,7 @@ 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
@@ -87,7 +97,7 @@ file.reference.sis-referencing-1.1.jar=release/modules/ext/sis-referencing-1.1.j
 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.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.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.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
@@ -102,7 +112,8 @@ 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.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.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
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index af1016a3ac..0f4f2024e4 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -298,14 +298,6 @@
                 <package>org.apache.xmlbeans.xml.stream</package>
                 <package>org.apache.xmlbeans.xml.stream.events</package>
             </public-packages>
-            <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/animal-sniffer-annotations-1.21.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/animal-sniffer-annotations-1.21.jar</binary-origin>
-            </class-path-extension>
             <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>
@@ -330,6 +322,10 @@
                 <runtime-relative-path>ext/bcprov-jdk15on-1.70.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/bcprov-jdk15on-1.70.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>
+            </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>
@@ -350,6 +346,14 @@
                 <runtime-relative-path>ext/checker-qual-3.12.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/checker-qual-3.12.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>
+            </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>
@@ -370,6 +374,10 @@
                 <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>
             </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>
+            </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>
@@ -398,6 +406,10 @@
                 <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>
+            </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>
@@ -407,8 +419,8 @@
                 <binary-origin>release/modules/ext/ehcache-core-2.6.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/error_prone_annotations-2.7.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/error_prone_annotations-2.7.1.jar</binary-origin>
+                <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>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/failureaccess-1.0.1.jar</runtime-relative-path>
@@ -427,8 +439,16 @@
                 <binary-origin>release/modules/ext/grib-4.5.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gson-2.8.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gson-2.8.9.jar</binary-origin>
+                <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-31.1-jre.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-31.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>
@@ -466,6 +486,18 @@
                 <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.13.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-annotations-2.13.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-core-2.13.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-core-2.13.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jackson-databind-2.13.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-databind-2.13.2.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>
@@ -474,6 +506,14 @@
                 <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>
             </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>
@@ -483,12 +523,8 @@
                 <binary-origin>release/modules/ext/jakarta.xml.bind-api-2.3.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/java-libpst-0.9.5-SNAPSHOT.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javax.annotation-api-1.3.2.jar</binary-origin>
+                <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>
@@ -531,17 +567,13 @@
                 <binary-origin>release/modules/ext/jna-5.10.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/joda-time-2.10.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/joda-time-2.10.4.jar</binary-origin>
+                <runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/joda-time-2.2.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.14.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jsoup-1.14.3.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>
@@ -559,8 +591,12 @@
                 <binary-origin>release/modules/ext/junrar-7.4.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/mchange-commons-java-0.2.20.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/mchange-commons-java-0.2.20.jar</binary-origin>
+                <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>
@@ -606,6 +642,10 @@
                 <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>
             </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>
+            </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>
@@ -655,8 +695,8 @@
                 <binary-origin>release/modules/ext/slf4j-api-1.7.36.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sqlite-jdbc-3.25.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sqlite-jdbc-3.25.2.jar</binary-origin>
+                <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>
@@ -715,8 +755,12 @@
                 <binary-origin>release/modules/ext/xmlschema-core-2.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmpcore-6.1.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmpcore-6.1.11.jar</binary-origin>
+                <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>