diff --git a/Core/ivy.xml b/Core/ivy.xml
index bce73a903dbeb893a0f967cf4bf32b1c65737e69..a4e10cc605abcc80ac5d1f8f0ac84a75c7348777 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -49,6 +49,10 @@
<!-- For Discovery testing -->
<dependency conf="core->default" org="org.mockito" name="mockito-core" rev="3.5.7"/>
+ <!-- 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"/>
+
<!-- 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.0"/>
<override org="jakarta.ws.rs" module="jakarta.ws.rs-api" rev="2.1.5"/>
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 8e0aabafafecc4c33986eb9b6d8debf175122a6c..5646508ec548f7bafd5a6a01804f120e37abff21 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -62,6 +62,7 @@ file.reference.httpclient-4.5.5.jar=release\\modules\\ext\\httpclient-4.5.5.jar
file.reference.httpcore-4.4.9.jar=release\\modules\\ext\\httpcore-4.4.9.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.j2objc-annotations-1.1.jar=release\\modules\\ext\\j2objc-annotations-1.1.jar
file.reference.jackcess-2.2.0.jar=release\\modules\\ext\\jackcess-2.2.0.jar
file.reference.jackcess-encrypt-2.1.4.jar=release\\modules\\ext\\jackcess-encrypt-2.1.4.jar
@@ -72,6 +73,8 @@ 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.javax.annotation-api-1.3.2.jar=release\\modules\\ext\\javax.annotation-api-1.3.2.jar
file.reference.javax.ws.rs-api-2.0.jar=release\\modules\\ext\\javax.ws.rs-api-2.0.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.jcommon-1.0.23.jar=release/modules/ext/jcommon-1.0.23.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
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 23ee7c9ec78aa25d37fcabc2bea5f6c48373adef..c021ff6f0482417982fb1e0d408aaedd0ee4b487 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -464,6 +464,10 @@
<runtime-relative-path>ext/jgraphx-4.1.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\jgraphx-4.1.0.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>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jline-0.9.94.jar</runtime-relative-path>
<binary-origin>release\modules\ext\jline-0.9.94.jar</binary-origin>
@@ -548,18 +552,10 @@
<runtime-relative-path>ext/checker-compat-qual-2.5.3.jar</runtime-relative-path>
<binary-origin>release\modules\ext\checker-compat-qual-2.5.3.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/sleuthkit-4.10.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/sleuthkit-4.10.1.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/animal-sniffer-annotations-1.17.jar</runtime-relative-path>
<binary-origin>release\modules\ext\animal-sniffer-annotations-1.17.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/sleuthkit-caseuco-4.10.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/sleuthkit-caseuco-4.10.1.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/gax-1.44.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\gax-1.44.0.jar</binary-origin>
@@ -644,6 +640,10 @@
<runtime-relative-path>ext/protobuf-java-util-3.7.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\protobuf-java-util-3.7.0.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/commons-collections-3.2.2.jar</runtime-relative-path>
<binary-origin>release\modules\ext\commons-collections-3.2.2.jar</binary-origin>
@@ -672,6 +672,10 @@
<runtime-relative-path>ext/grpc-alts-1.19.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\grpc-alts-1.19.0.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/sleuthkit-caseuco-4.10.1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/sleuthkit-caseuco-4.10.1.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>
@@ -684,6 +688,10 @@
<runtime-relative-path>ext/google-api-client-1.27.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\google-api-client-1.27.0.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>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/opencensus-contrib-http-util-0.19.2.jar</runtime-relative-path>
<binary-origin>release\modules\ext\opencensus-contrib-http-util-0.19.2.jar</binary-origin>
@@ -692,10 +700,6 @@
<runtime-relative-path>ext/google-auth-library-oauth2-http-0.15.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\google-auth-library-oauth2-http-0.15.0.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>
- </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>
@@ -720,6 +724,10 @@
<runtime-relative-path>ext/opencensus-contrib-grpc-metrics-0.19.2.jar</runtime-relative-path>
<binary-origin>release\modules\ext\opencensus-contrib-grpc-metrics-0.19.2.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/activemq-all-5.16.0.jar</runtime-relative-path>
+ <binary-origin>release\modules\ext\activemq-all-5.16.0.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jai_imageio-1.1.jar</runtime-relative-path>
<binary-origin>release\modules\ext\jai_imageio-1.1.jar</binary-origin>
@@ -732,6 +740,10 @@
<runtime-relative-path>ext/junit-3.8.1.jar</runtime-relative-path>
<binary-origin>release\modules\ext\junit-3.8.1.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>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/curator-client-2.8.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\curator-client-2.8.0.jar</binary-origin>
@@ -752,10 +764,6 @@
<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>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/activemq-all-5.16.0.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\activemq-all-5.16.0.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/google-cloud-core-http-1.70.0.jar</runtime-relative-path>
<binary-origin>release\modules\ext\google-cloud-core-http-1.70.0.jar</binary-origin>
@@ -796,6 +804,10 @@
<runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
<binary-origin>release\modules\ext\sevenzipjbinding-AllPlatforms.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/sleuthkit-4.10.1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/sleuthkit-4.10.1.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>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index c4ecac47a9716a1426ee3d59fbb96b51c507d696..0c3276a032e9e6cda969dabecdd055270c2c5075 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -17,6 +17,7 @@ file.reference.commons-lang3-3.4.jar=release\\modules\\ext\\commons-lang3-3.4.ja
file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar
file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar
file.reference.controlsfx-11.0.2.jar=release\\modules\\ext\\controlsfx-11.0.2.jar
+file.reference.controlsfx-9.0.0.jar=release\\modules\\ext\\controlsfx-9.0.0.jar
file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
file.reference.gson-2.8.5.jar=release/modules/ext/gson-2.8.5.jar
@@ -37,10 +38,12 @@ file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar
file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar
file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar
file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar
-file.reference.javaee-api-5.0-2.jar=release/modules/ext/javaee-api-5.0-2.jar
file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar
+file.reference.jfxtras-common-10.0-r1.jar=release/modules/ext/jfxtras-common-10.0-r1.jar
file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-10.0-r1.jar
+file.reference.jfxtras-controls-10.0-r1.jar=release/modules/ext/jfxtras-controls-10.0-r1.jar
file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-10.0-r1.jar
+file.reference.jfxtras-fxml-10.0-r1.jar=release/modules/ext/jfxtras-fxml-10.0-r1.jar
file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-10.0-r1.jar
file.reference.jna-5.6.0.jar=release\\modules\\ext\\jna-5.6.0.jar
file.reference.jna-platform-5.6.0.jar=release\\modules\\ext\\jna-platform-5.6.0.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 4f41ef8868e71aff183c3c9ab97c09b1b34f6c2a..a5d3df19cc450b48b0f58179e0eac502200ca221 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -164,73 +164,19 @@
<package>javax.annotation</package>
<package>javax.annotation.concurrent</package>
<package>javax.annotation.meta</package>
- <package>javax.annotation.security</package>
- <package>javax.ejb</package>
- <package>javax.ejb.spi</package>
- <package>javax.enterprise.deploy.model</package>
- <package>javax.enterprise.deploy.model.exceptions</package>
- <package>javax.enterprise.deploy.shared</package>
- <package>javax.enterprise.deploy.shared.factories</package>
- <package>javax.enterprise.deploy.spi</package>
- <package>javax.enterprise.deploy.spi.exceptions</package>
- <package>javax.enterprise.deploy.spi.factories</package>
- <package>javax.enterprise.deploy.spi.status</package>
- <package>javax.interceptor</package>
<package>javax.jms</package>
- <package>javax.jws</package>
- <package>javax.jws.soap</package>
<package>javax.mail</package>
<package>javax.mail.event</package>
<package>javax.mail.internet</package>
<package>javax.mail.search</package>
<package>javax.mail.util</package>
- <package>javax.management.j2ee</package>
- <package>javax.management.j2ee.statistics</package>
- <package>javax.persistence</package>
- <package>javax.persistence.spi</package>
- <package>javax.resource</package>
- <package>javax.resource.cci</package>
- <package>javax.resource.spi</package>
- <package>javax.resource.spi.endpoint</package>
- <package>javax.resource.spi.security</package>
- <package>javax.resource.spi.work</package>
- <package>javax.security.jacc</package>
<package>javax.servlet</package>
<package>javax.servlet.http</package>
- <package>javax.transaction</package>
- <package>javax.transaction.xa</package>
- <package>javax.xml</package>
- <package>javax.xml.bind</package>
- <package>javax.xml.bind.annotation</package>
- <package>javax.xml.bind.annotation.adapters</package>
- <package>javax.xml.bind.attachment</package>
- <package>javax.xml.bind.helpers</package>
- <package>javax.xml.bind.util</package>
- <package>javax.xml.namespace</package>
<package>javax.xml.parsers</package>
- <package>javax.xml.registry</package>
- <package>javax.xml.registry.infomodel</package>
- <package>javax.xml.rpc</package>
- <package>javax.xml.rpc.encoding</package>
- <package>javax.xml.rpc.handler</package>
- <package>javax.xml.rpc.handler.soap</package>
- <package>javax.xml.rpc.holders</package>
- <package>javax.xml.rpc.server</package>
- <package>javax.xml.rpc.soap</package>
- <package>javax.xml.soap</package>
- <package>javax.xml.stream</package>
- <package>javax.xml.stream.events</package>
- <package>javax.xml.stream.util</package>
<package>javax.xml.transform</package>
<package>javax.xml.transform.dom</package>
<package>javax.xml.transform.sax</package>
<package>javax.xml.transform.stream</package>
- <package>javax.xml.ws</package>
- <package>javax.xml.ws.handler</package>
- <package>javax.xml.ws.handler.soap</package>
- <package>javax.xml.ws.http</package>
- <package>javax.xml.ws.soap</package>
- <package>javax.xml.ws.spi</package>
<package>jfxtras.animation</package>
<package>jfxtras.css</package>
<package>jfxtras.css.converters</package>
@@ -334,8 +280,6 @@
<package>org.apache.commons.lang3.tuple</package>
<package>org.apache.commons.logging</package>
<package>org.apache.commons.logging.impl</package>
- <package>org.apache.geronimo.mail.handlers</package>
- <package>org.apache.geronimo.mail.util</package>
<package>org.apache.log</package>
<package>org.apache.log.filter</package>
<package>org.apache.log.format</package>
@@ -809,10 +753,6 @@
<runtime-relative-path>ext/gson-2.8.5.jar</runtime-relative-path>
<binary-origin>release/modules/ext/gson-2.8.5.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/jfxtras-common-10.0-r1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/jfxtras-common-10.0-r1.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
@@ -825,6 +765,10 @@
<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/jfxtras-fxml-10.0-r1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/jfxtras-fxml-10.0-r1.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-lang3-3.4.jar</runtime-relative-path>
<binary-origin>release\modules\ext\commons-lang3-3.4.jar</binary-origin>
@@ -837,10 +781,6 @@
<runtime-relative-path>ext/xmlbeans-3.0.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/xmlbeans-3.0.2.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/controlsfx-9.0.0.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\controlsfx-9.0.0.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/mail-1.4.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/mail-1.4.3.jar</binary-origin>
@@ -897,14 +837,14 @@
<runtime-relative-path>ext/imageio-tiff-3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imageio-tiff-3.2.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/jfxtras-controls-10.0-r1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/jfxtras-controls-10.0-r1.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-csv-1.4.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-csv-1.4.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/controlsfx-9.0.0.jar</runtime-relative-path>
+ <binary-origin>release\modules\ext\controlsfx-9.0.0.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/imageio-sgi-3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/imageio-sgi-3.2.jar</binary-origin>
@@ -913,10 +853,6 @@
<runtime-relative-path>ext/geronimo-jms_1.1_spec-1.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/geronimo-jms_1.1_spec-1.0.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/jfxtras-fxml-10.0-r1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/jfxtras-fxml-10.0-r1.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/joda-time-2.4.jar</runtime-relative-path>
<binary-origin>release/modules/ext/joda-time-2.4.jar</binary-origin>
@@ -937,6 +873,10 @@
<runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/jfxtras-common-10.0-r1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/jfxtras-common-10.0-r1.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/guava-19.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/guava-19.0.jar</binary-origin>
@@ -990,8 +930,8 @@
<binary-origin>release/modules/ext/commons-logging-1.1.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/javaee-api-5.0-2.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/javaee-api-5.0-2.jar</binary-origin>
+ <runtime-relative-path>ext/jfxtras-controls-10.0-r1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/jfxtras-controls-10.0-r1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/common-image-3.2.jar</runtime-relative-path>