diff --git a/Core/build.xml b/Core/build.xml index a18745b086..1834bb976d 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -108,8 +108,6 @@ - - diff --git a/Core/ivy.xml b/Core/ivy.xml index 3d2352648d..1746c2f06d 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -1,6 +1,3 @@ - -]> @@ -10,43 +7,44 @@ - - - - + + + + + - + - + - - + + - + - + - + - + - - + + - + - + - + - - + + @@ -62,40 +60,52 @@ - - - - - - + + + + + + + + - + - + - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml index 06c2d9308f..d1102eaa63 100644 --- a/Core/ivysettings.xml +++ b/Core/ivysettings.xml @@ -1,4 +1,10 @@ + + + + + + diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 927bf11766..78007a1805 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,110 +1,116 @@ -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.14.jar=release/modules/ext/batik-awt-util-1.14.jar -file.reference.batik-constants-1.14.jar=release/modules/ext/batik-constants-1.14.jar -file.reference.batik-css-1.14.jar=release/modules/ext/batik-css-1.14.jar -file.reference.batik-dom-1.14.jar=release/modules/ext/batik-dom-1.14.jar -file.reference.batik-ext-1.14.jar=release/modules/ext/batik-ext-1.14.jar -file.reference.batik-i18n-1.14.jar=release/modules/ext/batik-i18n-1.14.jar -file.reference.batik-parser-1.14.jar=release/modules/ext/batik-parser-1.14.jar -file.reference.batik-shared-resources-1.14.jar=release/modules/ext/batik-shared-resources-1.14.jar -file.reference.batik-svg-dom-1.14.jar=release/modules/ext/batik-svg-dom-1.14.jar -file.reference.batik-svggen-1.14.jar=release/modules/ext/batik-svggen-1.14.jar -file.reference.batik-util-1.14.jar=release/modules/ext/batik-util-1.14.jar -file.reference.batik-xml-1.14.jar=release/modules/ext/batik-xml-1.14.jar -file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar -file.reference.bcprov-ext-jdk15on-1.70.jar=release/modules/ext/bcprov-ext-jdk15on-1.70.jar -file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar -file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.jar -file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar -file.reference.checker-qual-3.33.0.jar=release/modules/ext/checker-qual-3.33.0.jar -file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar -file.reference.commons-dbcp2-2.9.0.jar=release/modules/ext/commons-dbcp2-2.9.0.jar -file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar -file.reference.commons-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.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar +file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar +file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar +file.reference.activemq-all-6.1.4.jar=release/modules/ext/activemq-all-6.1.4.jar +file.reference.angus-activation-2.0.2.jar=release/modules/ext/angus-activation-2.0.2.jar +file.reference.annotations-13.0.jar=release/modules/ext/annotations-13.0.jar +file.reference.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar +file.reference.batik-awt-util-1.18.jar=release/modules/ext/batik-awt-util-1.18.jar +file.reference.batik-constants-1.18.jar=release/modules/ext/batik-constants-1.18.jar +file.reference.batik-css-1.18.jar=release/modules/ext/batik-css-1.18.jar +file.reference.batik-dom-1.18.jar=release/modules/ext/batik-dom-1.18.jar +file.reference.batik-ext-1.18.jar=release/modules/ext/batik-ext-1.18.jar +file.reference.batik-i18n-1.18.jar=release/modules/ext/batik-i18n-1.18.jar +file.reference.batik-parser-1.18.jar=release/modules/ext/batik-parser-1.18.jar +file.reference.batik-shared-resources-1.18.jar=release/modules/ext/batik-shared-resources-1.18.jar +file.reference.batik-svg-dom-1.18.jar=release/modules/ext/batik-svg-dom-1.18.jar +file.reference.batik-svggen-1.18.jar=release/modules/ext/batik-svggen-1.18.jar +file.reference.batik-util-1.18.jar=release/modules/ext/batik-util-1.18.jar +file.reference.batik-xml-1.18.jar=release/modules/ext/batik-xml-1.18.jar +file.reference.bcpkix-jdk18on-1.79.jar=release/modules/ext/bcpkix-jdk18on-1.79.jar +file.reference.bcprov-jdk18on-1.79.jar=release/modules/ext/bcprov-jdk18on-1.79.jar +file.reference.bcutil-jdk18on-1.79.jar=release/modules/ext/bcutil-jdk18on-1.79.jar +file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar +file.reference.checker-qual-3.43.0.jar=release/modules/ext/checker-qual-3.43.0.jar +file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar +file.reference.commons-dbcp2-2.13.0.jar=release/modules/ext/commons-dbcp2-2.13.0.jar +file.reference.commons-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar +file.reference.commons-lang3-3.10.jar=release/modules/ext/commons-lang3-3.10.jar +file.reference.commons-logging-1.3.4.jar=release/modules/ext/commons-logging-1.3.4.jar +file.reference.commons-pool2-2.12.0.jar=release/modules/ext/commons-pool2-2.12.0.jar +file.reference.curator-client-5.7.1.jar=release/modules/ext/curator-client-5.7.1.jar +file.reference.curator-framework-5.7.1.jar=release/modules/ext/curator-framework-5.7.1.jar +file.reference.curator-recipes-5.7.1.jar=release/modules/ext/curator-recipes-5.7.1.jar file.reference.decodetect-core-0.3.jar=release/modules/ext/decodetect-core-0.3.jar -file.reference.error_prone_annotations-2.18.0.jar=release/modules/ext/error_prone_annotations-2.18.0.jar +file.reference.error_prone_annotations-2.36.0.jar=release/modules/ext/error_prone_annotations-2.36.0.jar file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar -file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.jar +file.reference.guava-33.4.0-jre.jar=release/modules/ext/guava-33.4.0-jre.jar file.reference.httpclient-4.5.14.jar=release/modules/ext/httpclient-4.5.14.jar file.reference.httpclient-win-4.5.14.jar=release/modules/ext/httpclient-win-4.5.14.jar file.reference.httpcore-4.4.16.jar=release/modules/ext/httpcore-4.4.16.jar file.reference.httpmime-4.5.14.jar=release/modules/ext/httpmime-4.5.14.jar file.reference.icepdf-core-6.2.2.jar=release/modules/ext/icepdf-core-6.2.2.jar file.reference.icepdf-viewer-6.2.2.jar=release/modules/ext/icepdf-viewer-6.2.2.jar -file.reference.istack-commons-runtime-3.0.11.jar=release/modules/ext/istack-commons-runtime-3.0.11.jar -file.reference.j2objc-annotations-2.8.jar=release/modules/ext/j2objc-annotations-2.8.jar -file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar -file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar +file.reference.j2objc-annotations-3.0.0.jar=release/modules/ext/j2objc-annotations-3.0.0.jar +file.reference.jackcess-4.0.7.jar=release/modules/ext/jackcess-4.0.7.jar +file.reference.jackcess-encrypt-4.0.2.jar=release/modules/ext/jackcess-encrypt-4.0.2.jar file.reference.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar file.reference.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar -file.reference.jakarta.activation-1.2.2.jar=release/modules/ext/jakarta.activation-1.2.2.jar -file.reference.jakarta.xml.bind-api-2.3.3.jar=release/modules/ext/jakarta.xml.bind-api-2.3.3.jar -file.reference.java-diff-utils-4.11.jar=release/modules/ext/java-diff-utils-4.11.jar -file.reference.javax.activation-api-1.2.0.jar=release/modules/ext/javax.activation-api-1.2.0.jar +file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar +file.reference.jakarta.annotation-api-2.1.1.jar=release/modules/ext/jakarta.annotation-api-2.1.1.jar +file.reference.jakarta.jms-api-3.1.0-sources.jar=release/modules/ext/jakarta.jms-api-3.1.0-sources.jar +file.reference.jakarta.jms-api-3.1.0.jar=release/modules/ext/jakarta.jms-api-3.1.0.jar +file.reference.jakarta.transaction-api-1.3.3.jar=release/modules/ext/jakarta.transaction-api-1.3.3.jar +file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar +file.reference.java-diff-utils-4.15.jar=release/modules/ext/java-diff-utils-4.15.jar file.reference.javax.ws.rs-api-2.1.1.jar=release/modules/ext/javax.ws.rs-api-2.1.1.jar -file.reference.jaxb-api-2.3.1.jar=release/modules/ext/jaxb-api-2.3.1.jar -file.reference.jaxb-runtime-2.3.3.jar=release/modules/ext/jaxb-runtime-2.3.3.jar -file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar -file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar -file.reference.jfreechart-1.5.3.jar=release/modules/ext/jfreechart-1.5.3.jar +file.reference.jaxb-core-4.0.5.jar=release/modules/ext/jaxb-core-4.0.5.jar +file.reference.jaxb-impl-4.0.5.jar=release/modules/ext/jaxb-impl-4.0.5.jar +file.reference.jaxen-1.2.0.jar=release/modules/ext/jaxen-1.2.0.jar +file.reference.jdom2-2.0.6.1-sources.jar=release/modules/ext/jdom2-2.0.6.1-sources.jar +file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar +file.reference.jfreechart-1.5.5.jar=release/modules/ext/jfreechart-1.5.5.jar file.reference.jgraphx-4.2.2.jar=release/modules/ext/jgraphx-4.2.2.jar -file.reference.jsoup-1.16.1.jar=release/modules/ext/jsoup-1.16.1.jar +file.reference.jsoup-1.18.3.jar=release/modules/ext/jsoup-1.18.3.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar file.reference.jutf7-1.0.0.jar=release/modules/ext/jutf7-1.0.0.jar -file.reference.jxmapviewer2-2.6.jar=release/modules/ext/jxmapviewer2-2.6.jar -file.reference.jython-standalone-2.7.2.jar=release/modules/ext/jython-standalone-2.7.2.jar -file.reference.libphonenumber-8.12.45.jar=release/modules/ext/libphonenumber-8.12.45.jar -file.reference.license4j-runtime-library-4.7.1.jar=release/modules/ext/license4j-runtime-library-4.7.1.jar +file.reference.jxmapviewer2-2.8.jar=release/modules/ext/jxmapviewer2-2.8.jar +file.reference.jython-standalone-2.7.4.jar=release/modules/ext/jython-standalone-2.7.4.jar +file.reference.kotlin-stdlib-1.8.21.jar=release/modules/ext/kotlin-stdlib-1.8.21.jar +file.reference.kotlin-stdlib-common-1.9.10.jar=release/modules/ext/kotlin-stdlib-common-1.9.10.jar +file.reference.kotlin-stdlib-jdk7-1.8.21.jar=release/modules/ext/kotlin-stdlib-jdk7-1.8.21.jar +file.reference.kotlin-stdlib-jdk8-1.8.21.jar=release/modules/ext/kotlin-stdlib-jdk8-1.8.21.jar +file.reference.libphonenumber-8.13.52.jar=release/modules/ext/libphonenumber-8.13.52.jar +file.reference.license4j-runtime-library-4.7.3.jar=release/modules/ext/license4j-runtime-library-4.7.3.jar file.reference.listenablefuture-1.0.jar=release/modules/ext/listenablefuture-1.0.jar -file.reference.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar -file.reference.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar file.reference.mchange-commons-java-0.3.0.jar=release/modules/ext/mchange-commons-java-0.3.0.jar -file.reference.metadata-extractor-2.18.0.jar=release/modules/ext/metadata-extractor-2.18.0.jar -file.reference.netty-buffer-4.1.73.Final.jar=release/modules/ext/netty-buffer-4.1.73.Final.jar -file.reference.netty-codec-4.1.73.Final.jar=release/modules/ext/netty-codec-4.1.73.Final.jar -file.reference.netty-common-4.1.73.Final.jar=release/modules/ext/netty-common-4.1.73.Final.jar -file.reference.netty-handler-4.1.73.Final.jar=release/modules/ext/netty-handler-4.1.73.Final.jar -file.reference.netty-resolver-4.1.73.Final.jar=release/modules/ext/netty-resolver-4.1.73.Final.jar -file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.Final.jar -file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar -file.reference.netty-transport-4.1.73.Final.jar=release/modules/ext/netty-transport-4.1.73.Final.jar -file.reference.netty-transport-classes-epoll-4.1.73.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.73.Final.jar -file.reference.netty-transport-native-epoll-4.1.73.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.73.Final.jar -file.reference.netty-transport-native-unix-common-4.1.73.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.73.Final.jar -file.reference.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.metadata-extractor-2.19.0.jar=release/modules/ext/metadata-extractor-2.19.0.jar +file.reference.netty-buffer-4.1.113.Final.jar=release/modules/ext/netty-buffer-4.1.113.Final.jar +file.reference.netty-codec-4.1.113.Final.jar=release/modules/ext/netty-codec-4.1.113.Final.jar +file.reference.netty-common-4.1.116.Final.jar=release/modules/ext/netty-common-4.1.116.Final.jar +file.reference.netty-handler-4.1.113.Final.jar=release/modules/ext/netty-handler-4.1.113.Final.jar +file.reference.netty-resolver-4.1.113.Final.jar=release/modules/ext/netty-resolver-4.1.113.Final.jar +file.reference.netty-tcnative-boringssl-static-2.0.69.Final.jar=release/modules/ext/netty-tcnative-boringssl-static-2.0.69.Final.jar +file.reference.netty-tcnative-classes-2.0.66.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar +file.reference.netty-transport-4.1.116.Final.jar=release/modules/ext/netty-transport-4.1.116.Final.jar +file.reference.netty-transport-classes-epoll-4.1.116.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar +file.reference.netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar=release/modules/ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar +file.reference.netty-transport-native-unix-common-4.1.113.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.113.Final.jar +file.reference.okhttp-4.12.0.jar=release/modules/ext/okhttp-4.12.0.jar +file.reference.okio-3.6.0.jar=release/modules/ext/okio-3.6.0.jar +file.reference.okio-jvm-3.6.0.jar=release/modules/ext/okio-jvm-3.6.0.jar file.reference.postgresql-42.7.3.jar=release/modules/ext/postgresql-42.7.3.jar -file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar -file.reference.serializer-2.7.2.jar=release/modules/ext/serializer-2.7.2.jar file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sleuthkit-4.12.1.jar=release/modules/ext/sleuthkit-4.12.1.jar file.reference.sleuthkit-caseuco-4.12.1.jar=release/modules/ext/sleuthkit-caseuco-4.12.1.jar -file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar -file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.jar -file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar -file.reference.spotbugs-annotations-4.6.0.jar=release/modules/ext/spotbugs-annotations-4.6.0.jar +file.reference.slf4j-api-1.7.30.jar=release/modules/ext/slf4j-api-1.7.30.jar +file.reference.snakeyaml-2.3.jar=release/modules/ext/snakeyaml-2.3.jar +file.reference.spotbugs-annotations-4.8.6.jar=release/modules/ext/spotbugs-annotations-4.8.6.jar file.reference.sqlite-jdbc-3.47.1.0.jar=release/modules/ext/sqlite-jdbc-3.47.1.0.jar -file.reference.txw2-2.3.3.jar=release/modules/ext/txw2-2.3.3.jar -file.reference.xalan-2.7.2.jar=release/modules/ext/xalan-2.7.2.jar +file.reference.xalan-2.7.3.jar=release/modules/ext/xalan-2.7.3.jar +file.reference.xercesImpl-2.12.2.jar=release/modules/ext/xercesImpl-2.12.2.jar file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar file.reference.xml-apis-ext-1.3.04.jar=release/modules/ext/xml-apis-ext-1.3.04.jar -file.reference.xmlgraphics-commons-2.6.jar=release/modules/ext/xmlgraphics-commons-2.6.jar +file.reference.xmlgraphics-commons-2.10.jar=release/modules/ext/xmlgraphics-commons-2.10.jar file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar -file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar -file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar -file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.jar +file.reference.zookeeper-3.9.3.jar=release/modules/ext/zookeeper-3.9.3.jar +file.reference.zookeeper-jute-3.9.3.jar=release/modules/ext/zookeeper-jute-3.9.3.jar +javac.compilerargs=-Xlint -Xlint\:-serial javac.source=17 -javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt -nbm.homepage=http://www.sleuthkit.org/ +nbm.homepage=http\://www.sleuthkit.org/ nbm.module.author=Brian Carrier nbm.needs.restart=true spec.version.base=10.25 diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 7db7273bc1..5f67399107 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -370,120 +370,124 @@ org.sleuthkit.datamodel.blackboardutils.attributes - ext/activemq-all-5.16.4.jar - release/modules/ext/activemq-all-5.16.4.jar + ext/activemq-all-6.1.4.jar + release/modules/ext/activemq-all-6.1.4.jar + + + ext/angus-activation-2.0.2.jar + release/modules/ext/angus-activation-2.0.2.jar + + + ext/annotations-13.0.jar + release/modules/ext/annotations-13.0.jar ext/audience-annotations-0.12.0.jar release/modules/ext/audience-annotations-0.12.0.jar - ext/batik-awt-util-1.14.jar - release/modules/ext/batik-awt-util-1.14.jar + ext/batik-awt-util-1.18.jar + release/modules/ext/batik-awt-util-1.18.jar - ext/batik-constants-1.14.jar - release/modules/ext/batik-constants-1.14.jar + ext/batik-constants-1.18.jar + release/modules/ext/batik-constants-1.18.jar - ext/batik-css-1.14.jar - release/modules/ext/batik-css-1.14.jar + ext/batik-css-1.18.jar + release/modules/ext/batik-css-1.18.jar - ext/batik-dom-1.14.jar - release/modules/ext/batik-dom-1.14.jar + ext/batik-dom-1.18.jar + release/modules/ext/batik-dom-1.18.jar - ext/batik-ext-1.14.jar - release/modules/ext/batik-ext-1.14.jar + ext/batik-ext-1.18.jar + release/modules/ext/batik-ext-1.18.jar - ext/batik-i18n-1.14.jar - release/modules/ext/batik-i18n-1.14.jar + ext/batik-i18n-1.18.jar + release/modules/ext/batik-i18n-1.18.jar - ext/batik-parser-1.14.jar - release/modules/ext/batik-parser-1.14.jar + ext/batik-parser-1.18.jar + release/modules/ext/batik-parser-1.18.jar - ext/batik-shared-resources-1.14.jar - release/modules/ext/batik-shared-resources-1.14.jar + ext/batik-shared-resources-1.18.jar + release/modules/ext/batik-shared-resources-1.18.jar - ext/batik-svg-dom-1.14.jar - release/modules/ext/batik-svg-dom-1.14.jar + ext/batik-svg-dom-1.18.jar + release/modules/ext/batik-svg-dom-1.18.jar - ext/batik-svggen-1.14.jar - release/modules/ext/batik-svggen-1.14.jar + ext/batik-svggen-1.18.jar + release/modules/ext/batik-svggen-1.18.jar - ext/batik-util-1.14.jar - release/modules/ext/batik-util-1.14.jar + ext/batik-util-1.18.jar + release/modules/ext/batik-util-1.18.jar - ext/batik-xml-1.14.jar - release/modules/ext/batik-xml-1.14.jar + ext/batik-xml-1.18.jar + release/modules/ext/batik-xml-1.18.jar - ext/bcpkix-jdk15on-1.70.jar - release/modules/ext/bcpkix-jdk15on-1.70.jar + ext/bcpkix-jdk18on-1.79.jar + release/modules/ext/bcpkix-jdk18on-1.79.jar - ext/bcprov-ext-jdk15on-1.70.jar - release/modules/ext/bcprov-ext-jdk15on-1.70.jar + ext/bcprov-jdk18on-1.79.jar + release/modules/ext/bcprov-jdk18on-1.79.jar - ext/bcprov-jdk15on-1.70.jar - release/modules/ext/bcprov-jdk15on-1.70.jar - - - ext/bcutil-jdk15on-1.70.jar - release/modules/ext/bcutil-jdk15on-1.70.jar + ext/bcutil-jdk18on-1.79.jar + release/modules/ext/bcutil-jdk18on-1.79.jar ext/c3p0-0.9.5.5.jar release/modules/ext/c3p0-0.9.5.5.jar - ext/checker-qual-3.33.0.jar - release/modules/ext/checker-qual-3.33.0.jar + ext/checker-qual-3.43.0.jar + release/modules/ext/checker-qual-3.43.0.jar ext/commons-codec-1.11.jar release/modules/ext/commons-codec-1.11.jar - ext/commons-dbcp2-2.9.0.jar - release/modules/ext/commons-dbcp2-2.9.0.jar + ext/commons-dbcp2-2.13.0.jar + release/modules/ext/commons-dbcp2-2.13.0.jar - ext/commons-io-2.11.0.jar - release/modules/ext/commons-io-2.11.0.jar + ext/commons-io-2.18.0.jar + release/modules/ext/commons-io-2.18.0.jar ext/commons-lang3-3.10.jar release/modules/ext/commons-lang3-3.10.jar - ext/commons-logging-1.2.jar - release/modules/ext/commons-logging-1.2.jar + ext/commons-logging-1.3.4.jar + release/modules/ext/commons-logging-1.3.4.jar - ext/commons-pool2-2.10.0.jar - release/modules/ext/commons-pool2-2.10.0.jar + ext/commons-pool2-2.12.0.jar + release/modules/ext/commons-pool2-2.12.0.jar - ext/curator-client-5.2.1.jar - release/modules/ext/curator-client-5.2.1.jar + ext/curator-client-5.7.1.jar + release/modules/ext/curator-client-5.7.1.jar - ext/curator-framework-5.2.1.jar - release/modules/ext/curator-framework-5.2.1.jar + ext/curator-framework-5.7.1.jar + release/modules/ext/curator-framework-5.7.1.jar - ext/curator-recipes-5.2.1.jar - release/modules/ext/curator-recipes-5.2.1.jar + ext/curator-recipes-5.7.1.jar + release/modules/ext/curator-recipes-5.7.1.jar ext/DatCon.jar @@ -494,16 +498,16 @@ release/modules/ext/decodetect-core-0.3.jar - ext/error_prone_annotations-2.18.0.jar - release/modules/ext/error_prone_annotations-2.18.0.jar + ext/error_prone_annotations-2.36.0.jar + release/modules/ext/error_prone_annotations-2.36.0.jar ext/failureaccess-1.0.1.jar release/modules/ext/failureaccess-1.0.1.jar - ext/guava-32.0.1-jre.jar - release/modules/ext/guava-32.0.1-jre.jar + ext/guava-33.4.0-jre.jar + release/modules/ext/guava-33.4.0-jre.jar ext/httpclient-4.5.14.jar @@ -530,20 +534,16 @@ release/modules/ext/icepdf-viewer-6.2.2.jar - ext/istack-commons-runtime-3.0.11.jar - release/modules/ext/istack-commons-runtime-3.0.11.jar + ext/j2objc-annotations-3.0.0.jar + release/modules/ext/j2objc-annotations-3.0.0.jar - ext/j2objc-annotations-2.8.jar - release/modules/ext/j2objc-annotations-2.8.jar + ext/jackcess-4.0.7.jar + release/modules/ext/jackcess-4.0.7.jar - ext/jackcess-4.0.1.jar - release/modules/ext/jackcess-4.0.1.jar - - - ext/jackcess-encrypt-4.0.1.jar - release/modules/ext/jackcess-encrypt-4.0.1.jar + ext/jackcess-encrypt-4.0.2.jar + release/modules/ext/jackcess-encrypt-4.0.2.jar ext/jai_core-1.1.3.jar @@ -554,52 +554,68 @@ release/modules/ext/jai_imageio-1.1.jar - ext/jakarta.activation-1.2.2.jar - release/modules/ext/jakarta.activation-1.2.2.jar + ext/jakarta.activation-api-2.1.3.jar + release/modules/ext/jakarta.activation-api-2.1.3.jar - ext/jakarta.xml.bind-api-2.3.3.jar - release/modules/ext/jakarta.xml.bind-api-2.3.3.jar + ext/jakarta.annotation-api-2.1.1.jar + release/modules/ext/jakarta.annotation-api-2.1.1.jar - ext/java-diff-utils-4.11.jar - release/modules/ext/java-diff-utils-4.11.jar + ext/jakarta.jms-api-3.1.0-sources.jar + release/modules/ext/jakarta.jms-api-3.1.0-sources.jar - ext/javax.activation-api-1.2.0.jar - release/modules/ext/javax.activation-api-1.2.0.jar + ext/jakarta.jms-api-3.1.0.jar + release/modules/ext/jakarta.jms-api-3.1.0.jar + + + ext/jakarta.transaction-api-1.3.3.jar + release/modules/ext/jakarta.transaction-api-1.3.3.jar + + + ext/jakarta.xml.bind-api-4.0.2.jar + release/modules/ext/jakarta.xml.bind-api-4.0.2.jar + + + ext/java-diff-utils-4.15.jar + release/modules/ext/java-diff-utils-4.15.jar ext/javax.ws.rs-api-2.1.1.jar release/modules/ext/javax.ws.rs-api-2.1.1.jar - ext/jaxb-api-2.3.1.jar - release/modules/ext/jaxb-api-2.3.1.jar + ext/jaxb-core-4.0.5.jar + release/modules/ext/jaxb-core-4.0.5.jar - ext/jaxb-runtime-2.3.3.jar - release/modules/ext/jaxb-runtime-2.3.3.jar + ext/jaxb-impl-4.0.5.jar + release/modules/ext/jaxb-impl-4.0.5.jar - ext/jdom-2.0.5-contrib.jar - release/modules/ext/jdom-2.0.5-contrib.jar + ext/jaxen-1.2.0.jar + release/modules/ext/jaxen-1.2.0.jar - ext/jdom-2.0.5.jar - release/modules/ext/jdom-2.0.5.jar + ext/jdom2-2.0.6.1-sources.jar + release/modules/ext/jdom2-2.0.6.1-sources.jar - ext/jfreechart-1.5.3.jar - release/modules/ext/jfreechart-1.5.3.jar + ext/jdom2-2.0.6.1.jar + release/modules/ext/jdom2-2.0.6.1.jar + + + ext/jfreechart-1.5.5.jar + release/modules/ext/jfreechart-1.5.5.jar ext/jgraphx-4.2.2.jar release/modules/ext/jgraphx-4.2.2.jar - ext/jsoup-1.16.1.jar - release/modules/ext/jsoup-1.16.1.jar + ext/jsoup-1.18.3.jar + release/modules/ext/jsoup-1.18.3.jar ext/jsr305-3.0.2.jar @@ -610,92 +626,104 @@ release/modules/ext/jutf7-1.0.0.jar - ext/jxmapviewer2-2.6.jar - release/modules/ext/jxmapviewer2-2.6.jar + ext/jxmapviewer2-2.8.jar + release/modules/ext/jxmapviewer2-2.8.jar - ext/jython-standalone-2.7.2.jar - release/modules/ext/jython-standalone-2.7.2.jar + ext/jython-standalone-2.7.4.jar + release/modules/ext/jython-standalone-2.7.4.jar - ext/libphonenumber-8.12.45.jar - release/modules/ext/libphonenumber-8.12.45.jar + ext/kotlin-stdlib-1.8.21.jar + release/modules/ext/kotlin-stdlib-1.8.21.jar - ext/license4j-runtime-library-4.7.1.jar - release/modules/ext/license4j-runtime-library-4.7.1.jar + ext/kotlin-stdlib-common-1.9.10.jar + release/modules/ext/kotlin-stdlib-common-1.9.10.jar + + + ext/kotlin-stdlib-jdk7-1.8.21.jar + release/modules/ext/kotlin-stdlib-jdk7-1.8.21.jar + + + ext/kotlin-stdlib-jdk8-1.8.21.jar + release/modules/ext/kotlin-stdlib-jdk8-1.8.21.jar + + + ext/libphonenumber-8.13.52.jar + release/modules/ext/libphonenumber-8.13.52.jar + + + ext/license4j-runtime-library-4.7.3.jar + release/modules/ext/license4j-runtime-library-4.7.3.jar ext/listenablefuture-1.0.jar release/modules/ext/listenablefuture-1.0.jar - - ext/logback-classic-1.2.10.jar - release/modules/ext/logback-classic-1.2.10.jar - - - ext/logback-core-1.2.10.jar - release/modules/ext/logback-core-1.2.10.jar - ext/mchange-commons-java-0.3.0.jar - release/modules/ext/mchange-commons-java-00.3.0.jar + release/modules/ext/mchange-commons-java-0.3.0.jar - ext/metadata-extractor-2.18.0.jar - release/modules/ext/metadata-extractor-2.18.0.jar + ext/metadata-extractor-2.19.0.jar + release/modules/ext/metadata-extractor-2.19.0.jar - ext/netty-buffer-4.1.73.Final.jar - release/modules/ext/netty-buffer-4.1.73.Final.jar + ext/netty-buffer-4.1.113.Final.jar + release/modules/ext/netty-buffer-4.1.113.Final.jar - ext/netty-codec-4.1.73.Final.jar - release/modules/ext/netty-codec-4.1.73.Final.jar + ext/netty-codec-4.1.113.Final.jar + release/modules/ext/netty-codec-4.1.113.Final.jar - ext/netty-common-4.1.73.Final.jar - release/modules/ext/netty-common-4.1.73.Final.jar + ext/netty-common-4.1.116.Final.jar + release/modules/ext/netty-common-4.1.116.Final.jar - ext/netty-handler-4.1.73.Final.jar - release/modules/ext/netty-handler-4.1.73.Final.jar + ext/netty-handler-4.1.113.Final.jar + release/modules/ext/netty-handler-4.1.113.Final.jar - ext/netty-resolver-4.1.73.Final.jar - release/modules/ext/netty-resolver-4.1.73.Final.jar + ext/netty-resolver-4.1.113.Final.jar + release/modules/ext/netty-resolver-4.1.113.Final.jar - ext/netty-tcnative-2.0.48.Final.jar - release/modules/ext/netty-tcnative-2.0.48.Final.jar + ext/netty-tcnative-boringssl-static-2.0.69.Final.jar + release/modules/ext/netty-tcnative-boringssl-static-2.0.69.Final.jar - ext/netty-tcnative-classes-2.0.48.Final.jar - release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar + ext/netty-tcnative-classes-2.0.66.Final.jar + release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar - ext/netty-transport-4.1.73.Final.jar - release/modules/ext/netty-transport-4.1.73.Final.jar + ext/netty-transport-4.1.116.Final.jar + release/modules/ext/netty-transport-4.1.116.Final.jar - ext/netty-transport-classes-epoll-4.1.73.Final.jar - release/modules/ext/netty-transport-classes-epoll-4.1.73.Final.jar + ext/netty-transport-classes-epoll-4.1.116.Final.jar + release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar - ext/netty-transport-native-epoll-4.1.73.Final.jar - release/modules/ext/netty-transport-native-epoll-4.1.73.Final.jar + ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar + release/modules/ext/netty-transport-native-epoll-4.1.116.Final-linux-x86_64.jar - ext/netty-transport-native-unix-common-4.1.73.Final.jar - release/modules/ext/netty-transport-native-unix-common-4.1.73.Final.jar + ext/netty-transport-native-unix-common-4.1.113.Final.jar + release/modules/ext/netty-transport-native-unix-common-4.1.113.Final.jar - ext/okhttp-2.7.5.jar - release/modules/ext/okhttp-2.7.5.jar + ext/okhttp-4.12.0.jar + release/modules/ext/okhttp-4.12.0.jar - ext/okio-1.6.0.jar - release/modules/ext/okio-1.6.0.jar + ext/okio-3.6.0.jar + release/modules/ext/okio-3.6.0.jar + + + ext/okio-jvm-3.6.0.jar + release/modules/ext/okio-jvm-3.6.0.jar ext/postgresql-42.7.3.jar @@ -705,10 +733,6 @@ ext/Rejistry-1.1-SNAPSHOT.jar release/modules/ext/Rejistry-1.1-SNAPSHOT.jar - - ext/serializer-2.7.2.jar - release/modules/ext/serializer-2.7.2.jar - ext/sevenzipjbinding-AllPlatforms.jar release/modules/ext/sevenzipjbinding-AllPlatforms.jar @@ -726,32 +750,32 @@ release/modules/ext/sleuthkit-caseuco-4.12.1.jar - ext/slf4j-api-1.7.36.jar - release/modules/ext/slf4j-api-1.7.36.jar + ext/slf4j-api-1.7.30.jar + release/modules/ext/slf4j-api-1.7.30.jar - ext/snakeyaml-2.0.jar - release/modules/ext/snakeyaml-2.0.jar + ext/snakeyaml-2.3.jar + release/modules/ext/snakeyaml-2.3.jar ext/SparseBitSet-1.1.jar release/modules/ext/SparseBitSet-1.1.jar - ext/spotbugs-annotations-4.6.0.jar - release/modules/ext/spotbugs-annotations-4.6.0.jar + ext/spotbugs-annotations-4.8.6.jar + release/modules/ext/spotbugs-annotations-4.8.6.jar ext/sqlite-jdbc-3.47.1.0.jar release/modules/ext/sqlite-jdbc-3.47.1.0.jar - ext/txw2-2.3.3.jar - release/modules/ext/txw2-2.3.3.jar + ext/xalan-2.7.3.jar + release/modules/ext/xalan-2.7.3.jar - ext/xalan-2.7.2.jar - release/modules/ext/xalan-2.7.2.jar + ext/xercesImpl-2.12.2.jar + release/modules/ext/xercesImpl-2.12.2.jar ext/xml-apis-1.4.01.jar @@ -762,8 +786,8 @@ release/modules/ext/xml-apis-ext-1.3.04.jar - ext/xmlgraphics-commons-2.6.jar - release/modules/ext/xmlgraphics-commons-2.6.jar + ext/xmlgraphics-commons-2.10.jar + release/modules/ext/xmlgraphics-commons-2.10.jar ext/xmpcore-6.1.11.jar @@ -774,12 +798,12 @@ release/modules/ext/YaraJNIWrapper.jar - ext/zookeeper-3.8.0.jar - release/modules/ext/zookeeper-3.8.0.jar + ext/zookeeper-3.9.3.jar + release/modules/ext/zookeeper-3.9.3.jar - ext/zookeeper-jute-3.8.0.jar - release/modules/ext/zookeeper-jute-3.8.0.jar + ext/zookeeper-jute-3.9.3.jar + release/modules/ext/zookeeper-jute-3.9.3.jar diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java index eb3c16e1c1..f4242f9aa1 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java @@ -73,14 +73,7 @@ public class XMLUtil { } private static SchemaFactory getSchemaFactory(String schemaLanguage) { - // See JIRA-6958 for details about class loading and jaxb. - ClassLoader original = Thread.currentThread().getContextClassLoader(); - try { - Thread.currentThread().setContextClassLoader(XMLUtil.class.getClassLoader()); - return SchemaFactory.newInstance(schemaLanguage); - } finally { - Thread.currentThread().setContextClassLoader(original); - } + return SchemaFactory.newInstance(schemaLanguage); } private static TransformerFactory getTransformerFactory() { diff --git a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java index f3fb273bcf..1beac1f4a0 100644 --- a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java +++ b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.logging.Level; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.sleuthkit.autopsy.core.UserPreferencesException; import org.sleuthkit.autopsy.core.UserPreferences; import org.sleuthkit.autopsy.coreutils.Logger; diff --git a/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java index f7cf28096d..c2610eb3f7 100644 --- a/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java +++ b/Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java @@ -21,8 +21,8 @@ package org.sleuthkit.autopsy.events; import java.net.URI; import java.net.URISyntaxException; import javax.annotation.concurrent.Immutable; -import javax.jms.Connection; -import javax.jms.JMSException; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnectionFactory; import java.io.IOException; import java.net.InetAddress; diff --git a/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java index a301e86010..69948ddbe1 100644 --- a/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java +++ b/Core/src/org/sleuthkit/autopsy/events/RemoteEventPublisher.java @@ -22,16 +22,16 @@ import java.net.URISyntaxException; import java.util.logging.Level; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.ThreadSafe; -import javax.jms.Connection; -import javax.jms.DeliveryMode; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.jms.Topic; +import jakarta.jms.Connection; +import jakarta.jms.DeliveryMode; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Session; +import jakarta.jms.Topic; import org.apache.activemq.ActiveMQConnectionFactory; import org.sleuthkit.autopsy.coreutils.Logger; diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java index e9276a81b7..82e58d381d 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/DocumentEmbeddedContentExtractor.java @@ -50,6 +50,7 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; import org.apache.tika.extractor.ParsingEmbeddedDocumentExtractor; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MimeTypeException; import org.apache.tika.parser.AutoDetectParser; @@ -728,7 +729,7 @@ class DocumentEmbeddedContentExtractor { } // try to get the name of the embedded file from the metadata - String name = metadata.get(Metadata.RESOURCE_NAME_KEY); + String name = metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY); // TODO: This can be removed after we upgrade to Tika 1.16 or // above. The 1.16 version of Tika keeps track of files that diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java index d898aaa1ca..78ba3a4fbd 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/PDFAttachmentExtractor.java @@ -30,6 +30,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.extractor.EmbeddedDocumentExtractor; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.ParseContext; @@ -125,7 +126,7 @@ final class PDFAttachmentExtractor { //Resource naming scheme is used internally in autopsy, therefore we can guarentee uniqueness. String uniqueExtractedName = "extract_" + attachmentCount++; //NON-NLS - String name = mtdt.get(Metadata.RESOURCE_NAME_KEY); + String name = mtdt.get(TikaCoreProperties.RESOURCE_NAME_KEY); String ext = FilenameUtils.getExtension(name); //Append the extension if we can. diff --git a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java index 8a40bf339d..e81f069f62 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.logging.Level; import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.ParseContext; @@ -287,7 +288,7 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter bin = new BufferedInputStream(in); ContentHandler handler = new BodyContentHandler(-1); Metadata metadata = new Metadata(); - metadata.add(Metadata.RESOURCE_NAME_KEY, file.getName()); + metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, file.getName()); AutoDetectParser parser = new AutoDetectParser(); parser.parse(bin, handler, metadata, new ParseContext()); } catch (EncryptedDocumentException ex) { diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java index dda4416ee6..63d1df7c5e 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java +++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java @@ -18,6 +18,7 @@ */ package org.sleuthkit.autopsy.modules.filetypeid; +import jakarta.xml.bind.DatatypeConverter; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -26,7 +27,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.DatatypeConverter; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java index 788ca39575..74080e2fc4 100644 --- a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java @@ -49,7 +49,6 @@ import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; import org.apache.tika.parser.ParsingReader; import org.apache.tika.parser.microsoft.OfficeParserConfig; -import org.apache.tika.parser.ocr.TesseractOCRConfig; import org.apache.tika.parser.pdf.PDFParserConfig; import org.openide.util.NbBundle; import org.openide.modules.InstalledFileLocator; @@ -75,7 +74,9 @@ import java.io.InputStreamReader; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Set; +import org.apache.tika.config.TikaConfig; import org.apache.tika.mime.MimeTypes; +import org.apache.tika.parser.ocr.TesseractOCRConfig; import org.apache.tika.parser.pdf.PDFParserConfig.OCR_STRATEGY; import org.sleuthkit.autopsy.coreutils.ExecUtil.HybridTerminator; import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector; @@ -284,9 +285,10 @@ final class TikaTextExtractor implements TextExtractor { // during extraction TesseractOCRConfig ocrConfig = new TesseractOCRConfig(); String tesseractFolder = TESSERACT_PATH.getParent(); - ocrConfig.setTesseractPath(tesseractFolder); + // coming from https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=109454096#TikaOCR-OverridingDefaultConfiguration + ocrConfig.getOtherTesseractConfig().put("tessdataPath", PlatformUtil.getOcrLanguagePacksPath()); + ocrConfig.getOtherTesseractConfig().put("tesseractPath", tesseractFolder); ocrConfig.setLanguage(languagePacks); - ocrConfig.setTessdataPath(PlatformUtil.getOcrLanguagePacksPath()); parseContext.set(TesseractOCRConfig.class, ocrConfig); // Configure how Tika handles OCRing PDFs diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java index 574cc44313..c9ecf11a9d 100644 --- a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java +++ b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java @@ -21,13 +21,14 @@ package org.sleuthkit.autopsy.texttranslation.translators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.squareup.okhttp.MediaType; -import com.squareup.okhttp.OkHttpClient; -import com.squareup.okhttp.Request; -import com.squareup.okhttp.RequestBody; -import com.squareup.okhttp.Response; + import java.io.IOException; import javax.swing.JPanel; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; import org.openide.util.NbBundle.Messages; import org.openide.util.lookup.ServiceProvider; import org.sleuthkit.autopsy.coreutils.ThreadConfined; diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java index a679dccd13..1f0cf2c9df 100644 --- a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java @@ -22,11 +22,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import com.google.gson.JsonObject; -import com.squareup.okhttp.MediaType; -import com.squareup.okhttp.OkHttpClient; -import com.squareup.okhttp.Request; -import com.squareup.okhttp.RequestBody; -import com.squareup.okhttp.Response; import java.io.IOException; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; @@ -36,6 +31,11 @@ import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import java.awt.Desktop; import java.net.URISyntaxException; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; import org.apache.commons.lang3.StringUtils; import org.openide.util.NbBundle.Messages; diff --git a/CoreLibs/build.xml b/CoreLibs/build.xml index 57ab10853e..fa12044bd3 100644 --- a/CoreLibs/build.xml +++ b/CoreLibs/build.xml @@ -40,7 +40,13 @@ - + + + + + + + diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 26973e5cfe..ca1a14089c 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -1,7 +1,3 @@ - - -]> @@ -10,43 +6,43 @@ - + - + - + - + - + - + - + @@ -54,8 +50,8 @@ - - + + @@ -67,29 +63,29 @@ - + - + - - - + + + - - - - + + + + - - + + @@ -101,54 +97,47 @@ https://github.com/controlsfx/controlsfx/issues/1241 --> - + - + - - - + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - + + - + + - - - - - - - - diff --git a/CoreLibs/ivysettings.xml b/CoreLibs/ivysettings.xml index da1e8e957b..d535512c6e 100644 --- a/CoreLibs/ivysettings.xml +++ b/CoreLibs/ivysettings.xml @@ -1,4 +1,10 @@ + + + + + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 75b27a6162..8eca83e503 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -1,118 +1,120 @@ -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-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar -file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.jar -file.reference.checker-qual-3.21.3.jar=release/modules/ext/checker-qual-3.21.3.jar -file.reference.common-image-3.8.2.jar=release/modules/ext/common-image-3.8.2.jar -file.reference.common-io-3.8.2.jar=release/modules/ext/common-io-3.8.2.jar -file.reference.common-lang-3.8.2.jar=release/modules/ext/common-lang-3.8.2.jar +file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar +file.reference.animal-sniffer-annotations-1.24.jar=release/modules/ext/animal-sniffer-annotations-1.24.jar +file.reference.annotations-4.1.1.4.jar=release/modules/ext/annotations-4.1.1.4.jar +file.reference.ant-1.10.15.jar=release/modules/ext/ant-1.10.15.jar +file.reference.ant-launcher-1.10.15.jar=release/modules/ext/ant-launcher-1.10.15.jar +file.reference.api-common-2.41.0.jar=release/modules/ext/api-common-2.41.0.jar +file.reference.auto-value-annotations-1.11.0.jar=release/modules/ext/auto-value-annotations-1.11.0.jar +file.reference.checker-qual-3.47.0.jar=release/modules/ext/checker-qual-3.47.0.jar +file.reference.common-image-3.12.0.jar=release/modules/ext/common-image-3.12.0.jar +file.reference.common-io-3.12.0.jar=release/modules/ext/common-io-3.12.0.jar +file.reference.common-lang-3.12.0.jar=release/modules/ext/common-lang-3.12.0.jar file.reference.commons-beanutils-1.9.4.jar=release/modules/ext/commons-beanutils-1.9.4.jar -file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.jar +file.reference.commons-codec-1.17.1.jar=release/modules/ext/commons-codec-1.17.1.jar file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar -file.reference.commons-collections4-4.4.jar=release/modules/ext/commons-collections4-4.4.jar -file.reference.commons-csv-1.9.0.jar=release/modules/ext/commons-csv-1.9.0.jar +file.reference.commons-collections4-4.5.0-M2.jar=release/modules/ext/commons-collections4-4.5.0-M2.jar +file.reference.commons-csv-1.12.0.jar=release/modules/ext/commons-csv-1.12.0.jar file.reference.commons-digester-2.1.jar=release/modules/ext/commons-digester-2.1.jar -file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar +file.reference.commons-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar -file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar -file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar -file.reference.commons-text-1.10.0.jar=release/modules/ext/commons-text-1.10.0.jar -file.reference.commons-validator-1.7.jar=release/modules/ext/commons-validator-1.7.jar -file.reference.compiler-0.9.10.jar=release/modules/ext/compiler-0.9.10.jar -file.reference.conscrypt-openjdk-uber-2.5.1.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar -file.reference.controlsfx-11.1.2-sources.jar=release/modules/ext/controlsfx-11.1.2-sources.jar -file.reference.controlsfx-11.1.2.jar=release/modules/ext/controlsfx-11.1.2.jar -file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar -file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar -file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar -file.reference.gax-2.12.2.jar=release/modules/ext/gax-2.12.2.jar -file.reference.gax-grpc-2.12.2.jar=release/modules/ext/gax-grpc-2.12.2.jar -file.reference.gax-httpjson-0.97.2.jar=release/modules/ext/gax-httpjson-0.97.2.jar -file.reference.google-api-client-1.33.2.jar=release/modules/ext/google-api-client-1.33.2.jar -file.reference.google-api-services-translate-v2-rev20170525-1.32.1.jar=release/modules/ext/google-api-services-translate-v2-rev20170525-1.32.1.jar -file.reference.google-auth-library-credentials-1.5.3.jar=release/modules/ext/google-auth-library-credentials-1.5.3.jar -file.reference.google-auth-library-oauth2-http-1.5.3.jar=release/modules/ext/google-auth-library-oauth2-http-1.5.3.jar -file.reference.google-cloud-core-2.5.6.jar=release/modules/ext/google-cloud-core-2.5.6.jar -file.reference.google-cloud-core-http-2.5.6.jar=release/modules/ext/google-cloud-core-http-2.5.6.jar -file.reference.google-cloud-translate-2.1.11.jar=release/modules/ext/google-cloud-translate-2.1.11.jar -file.reference.google-http-client-1.41.4.jar=release/modules/ext/google-http-client-1.41.4.jar -file.reference.google-http-client-apache-v2-1.41.4.jar=release/modules/ext/google-http-client-apache-v2-1.41.4.jar -file.reference.google-http-client-appengine-1.41.4.jar=release/modules/ext/google-http-client-appengine-1.41.4.jar -file.reference.google-http-client-gson-1.41.4.jar=release/modules/ext/google-http-client-gson-1.41.4.jar -file.reference.google-http-client-jackson2-1.41.4.jar=release/modules/ext/google-http-client-jackson2-1.41.4.jar -file.reference.google-oauth-client-1.33.1.jar=release/modules/ext/google-oauth-client-1.33.1.jar -file.reference.grpc-alts-1.44.1.jar=release/modules/ext/grpc-alts-1.44.1.jar -file.reference.grpc-api-1.44.1.jar=release/modules/ext/grpc-api-1.44.1.jar -file.reference.grpc-auth-1.44.1.jar=release/modules/ext/grpc-auth-1.44.1.jar -file.reference.grpc-context-1.44.1.jar=release/modules/ext/grpc-context-1.44.1.jar -file.reference.grpc-core-1.44.1.jar=release/modules/ext/grpc-core-1.44.1.jar -file.reference.grpc-grpclb-1.44.1.jar=release/modules/ext/grpc-grpclb-1.44.1.jar -file.reference.grpc-netty-shaded-1.44.1.jar=release/modules/ext/grpc-netty-shaded-1.44.1.jar -file.reference.grpc-protobuf-1.44.1.jar=release/modules/ext/grpc-protobuf-1.44.1.jar -file.reference.grpc-protobuf-lite-1.44.1.jar=release/modules/ext/grpc-protobuf-lite-1.44.1.jar -file.reference.grpc-services-1.44.1.jar=release/modules/ext/grpc-services-1.44.1.jar -file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar -file.reference.grpc-xds-1.44.1.jar=release/modules/ext/grpc-xds-1.44.1.jar -file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar +file.reference.commons-lang3-3.17.0.jar=release/modules/ext/commons-lang3-3.17.0.jar +file.reference.commons-logging-1.3.4.jar=release/modules/ext/commons-logging-1.3.4.jar +file.reference.commons-text-1.13.0.jar=release/modules/ext/commons-text-1.13.0.jar +file.reference.commons-validator-1.9.0.jar=release/modules/ext/commons-validator-1.9.0.jar +file.reference.compiler-0.9.14.jar=release/modules/ext/compiler-0.9.14.jar +file.reference.conscrypt-openjdk-uber-2.5.2.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.2.jar +file.reference.controlsfx-11.2.1-sources.jar=release/modules/ext/controlsfx-11.2.1-sources.jar +file.reference.controlsfx-11.2.1.jar=release/modules/ext/controlsfx-11.2.1.jar +file.reference.dd-plist-1.28.jar=release/modules/ext/dd-plist-1.28.jar +file.reference.error_prone_annotations-2.35.1.jar=release/modules/ext/error_prone_annotations-2.35.1.jar +file.reference.failureaccess-1.0.2.jar=release/modules/ext/failureaccess-1.0.2.jar +file.reference.gax-2.58.0.jar=release/modules/ext/gax-2.58.0.jar +file.reference.gax-grpc-2.58.0.jar=release/modules/ext/gax-grpc-2.58.0.jar +file.reference.gax-httpjson-2.58.0.jar=release/modules/ext/gax-httpjson-2.58.0.jar +file.reference.google-api-client-2.7.0.jar=release/modules/ext/google-api-client-2.7.0.jar +file.reference.google-api-services-translate-v2-rev20170525-2.0.0.jar=release/modules/ext/google-api-services-translate-v2-rev20170525-2.0.0.jar +file.reference.google-auth-library-credentials-1.30.0.jar=release/modules/ext/google-auth-library-credentials-1.30.0.jar +file.reference.google-auth-library-oauth2-http-1.30.0.jar=release/modules/ext/google-auth-library-oauth2-http-1.30.0.jar +file.reference.google-cloud-core-2.48.0.jar=release/modules/ext/google-cloud-core-2.48.0.jar +file.reference.google-cloud-core-http-2.48.0.jar=release/modules/ext/google-cloud-core-http-2.48.0.jar +file.reference.google-cloud-translate-2.54.0.jar=release/modules/ext/google-cloud-translate-2.54.0.jar +file.reference.google-http-client-1.45.0.jar=release/modules/ext/google-http-client-1.45.0.jar +file.reference.google-http-client-apache-v2-1.45.0.jar=release/modules/ext/google-http-client-apache-v2-1.45.0.jar +file.reference.google-http-client-appengine-1.45.0.jar=release/modules/ext/google-http-client-appengine-1.45.0.jar +file.reference.google-http-client-gson-1.45.0.jar=release/modules/ext/google-http-client-gson-1.45.0.jar +file.reference.google-http-client-jackson2-1.45.0.jar=release/modules/ext/google-http-client-jackson2-1.45.0.jar +file.reference.google-oauth-client-1.36.0.jar=release/modules/ext/google-oauth-client-1.36.0.jar +file.reference.grpc-alts-1.68.1.jar=release/modules/ext/grpc-alts-1.68.1.jar +file.reference.grpc-api-1.68.1.jar=release/modules/ext/grpc-api-1.68.1.jar +file.reference.grpc-auth-1.68.1.jar=release/modules/ext/grpc-auth-1.68.1.jar +file.reference.grpc-context-1.68.1.jar=release/modules/ext/grpc-context-1.68.1.jar +file.reference.grpc-core-1.68.1.jar=release/modules/ext/grpc-core-1.68.1.jar +file.reference.grpc-googleapis-1.68.1.jar=release/modules/ext/grpc-googleapis-1.68.1.jar +file.reference.grpc-grpclb-1.68.1.jar=release/modules/ext/grpc-grpclb-1.68.1.jar +file.reference.grpc-inprocess-1.68.1.jar=release/modules/ext/grpc-inprocess-1.68.1.jar +file.reference.grpc-netty-shaded-1.68.1.jar=release/modules/ext/grpc-netty-shaded-1.68.1.jar +file.reference.grpc-protobuf-1.68.1.jar=release/modules/ext/grpc-protobuf-1.68.1.jar +file.reference.grpc-protobuf-lite-1.68.1.jar=release/modules/ext/grpc-protobuf-lite-1.68.1.jar +file.reference.grpc-s2a-1.68.1.jar=release/modules/ext/grpc-s2a-1.68.1.jar +file.reference.grpc-services-1.68.1.jar=release/modules/ext/grpc-services-1.68.1.jar +file.reference.grpc-stub-1.68.1.jar=release/modules/ext/grpc-stub-1.68.1.jar +file.reference.grpc-util-1.68.1.jar=release/modules/ext/grpc-util-1.68.1.jar +file.reference.grpc-xds-1.68.1.jar=release/modules/ext/grpc-xds-1.68.1.jar +file.reference.gson-2.11.0.jar=release/modules/ext/gson-2.11.0.jar file.reference.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar -file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.jar -file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar -file.reference.httpcore-4.4.15.jar=release/modules/ext/httpcore-4.4.15.jar -file.reference.imageio-bmp-3.8.2.jar=release/modules/ext/imageio-bmp-3.8.2.jar -file.reference.imageio-core-3.8.2.jar=release/modules/ext/imageio-core-3.8.2.jar -file.reference.imageio-icns-3.8.2.jar=release/modules/ext/imageio-icns-3.8.2.jar -file.reference.imageio-iff-3.8.2.jar=release/modules/ext/imageio-iff-3.8.2.jar -file.reference.imageio-jpeg-3.8.2.jar=release/modules/ext/imageio-jpeg-3.8.2.jar -file.reference.imageio-metadata-3.8.2.jar=release/modules/ext/imageio-metadata-3.8.2.jar -file.reference.imageio-pcx-3.8.2.jar=release/modules/ext/imageio-pcx-3.8.2.jar -file.reference.imageio-pict-3.8.2.jar=release/modules/ext/imageio-pict-3.8.2.jar -file.reference.imageio-pnm-3.8.2.jar=release/modules/ext/imageio-pnm-3.8.2.jar -file.reference.imageio-psd-3.8.2.jar=release/modules/ext/imageio-psd-3.8.2.jar -file.reference.imageio-sgi-3.8.2.jar=release/modules/ext/imageio-sgi-3.8.2.jar -file.reference.imageio-tga-3.8.2.jar=release/modules/ext/imageio-tga-3.8.2.jar -file.reference.imageio-thumbsdb-3.8.2.jar=release/modules/ext/imageio-thumbsdb-3.8.2.jar -file.reference.imageio-tiff-3.8.2.jar=release/modules/ext/imageio-tiff-3.8.2.jar +file.reference.guava-33.4.0-jre.jar=release/modules/ext/guava-33.4.0-jre.jar +file.reference.httpclient-4.5.14.jar=release/modules/ext/httpclient-4.5.14.jar +file.reference.httpcore-4.4.16.jar=release/modules/ext/httpcore-4.4.16.jar +file.reference.imageio-bmp-3.12.0.jar=release/modules/ext/imageio-bmp-3.12.0.jar +file.reference.imageio-core-3.12.0.jar=release/modules/ext/imageio-core-3.12.0.jar +file.reference.imageio-icns-3.12.0.jar=release/modules/ext/imageio-icns-3.12.0.jar +file.reference.imageio-iff-3.12.0.jar=release/modules/ext/imageio-iff-3.12.0.jar +file.reference.imageio-jpeg-3.12.0.jar=release/modules/ext/imageio-jpeg-3.12.0.jar +file.reference.imageio-metadata-3.12.0.jar=release/modules/ext/imageio-metadata-3.12.0.jar +file.reference.imageio-pcx-3.12.0.jar=release/modules/ext/imageio-pcx-3.12.0.jar +file.reference.imageio-pict-3.12.0.jar=release/modules/ext/imageio-pict-3.12.0.jar +file.reference.imageio-pnm-3.12.0.jar=release/modules/ext/imageio-pnm-3.12.0.jar +file.reference.imageio-psd-3.12.0.jar=release/modules/ext/imageio-psd-3.12.0.jar +file.reference.imageio-sgi-3.12.0.jar=release/modules/ext/imageio-sgi-3.12.0.jar +file.reference.imageio-tga-3.12.0.jar=release/modules/ext/imageio-tga-3.12.0.jar +file.reference.imageio-thumbsdb-3.12.0.jar=release/modules/ext/imageio-thumbsdb-3.12.0.jar +file.reference.imageio-tiff-3.12.0.jar=release/modules/ext/imageio-tiff-3.12.0.jar file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar -file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar -file.reference.jackson-annotations-2.15.2.jar=release/modules/ext/jackson-annotations-2.15.2.jar -file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar -file.reference.jackson-databind-2.15.2.jar=release/modules/ext/jackson-databind-2.15.2.jar -file.reference.jackson-dataformat-csv-2.15.2.jar=release/modules/ext/jackson-dataformat-csv-2.15.2.jar -file.reference.jackson-datatype-jsr310-2.15.2.jar=release/modules/ext/jackson-datatype-jsr310-2.15.2.jar -file.reference.javafx-base-17.0.7-linux.jar=release/modules/ext/javafx-base-17.0.7-linux.jar -file.reference.javafx-base-17.0.7-mac.jar=release/modules/ext/javafx-base-17.0.7-mac.jar -file.reference.javafx-base-17.0.7-win.jar=release/modules/ext/javafx-base-17.0.7-win.jar -file.reference.javafx-base-17.0.7.jar=release/modules/ext/javafx-base-17.0.7.jar -file.reference.javafx-controls-17.0.7-linux.jar=release/modules/ext/javafx-controls-17.0.7-linux.jar -file.reference.javafx-controls-17.0.7-mac.jar=release/modules/ext/javafx-controls-17.0.7-mac.jar -file.reference.javafx-controls-17.0.7-win.jar=release/modules/ext/javafx-controls-17.0.7-win.jar -file.reference.javafx-controls-17.0.7.jar=release/modules/ext/javafx-controls-17.0.7.jar -file.reference.javafx-fxml-17.0.7-linux.jar=release/modules/ext/javafx-fxml-17.0.7-linux.jar -file.reference.javafx-fxml-17.0.7-mac.jar=release/modules/ext/javafx-fxml-17.0.7-mac.jar -file.reference.javafx-fxml-17.0.7-win.jar=release/modules/ext/javafx-fxml-17.0.7-win.jar -file.reference.javafx-fxml-17.0.7.jar=release/modules/ext/javafx-fxml-17.0.7.jar -file.reference.javafx-graphics-17.0.7-linux.jar=release/modules/ext/javafx-graphics-17.0.7-linux.jar -file.reference.javafx-graphics-17.0.7-mac.jar=release/modules/ext/javafx-graphics-17.0.7-mac.jar -file.reference.javafx-graphics-17.0.7-win.jar=release/modules/ext/javafx-graphics-17.0.7-win.jar -file.reference.javafx-graphics-17.0.7.jar=release/modules/ext/javafx-graphics-17.0.7.jar -file.reference.javafx-media-17.0.7-linux.jar=release/modules/ext/javafx-media-17.0.7-linux.jar -file.reference.javafx-media-17.0.7-mac.jar=release/modules/ext/javafx-media-17.0.7-mac.jar -file.reference.javafx-media-17.0.7-win.jar=release/modules/ext/javafx-media-17.0.7-win.jar -file.reference.javafx-media-17.0.7.jar=release/modules/ext/javafx-media-17.0.7.jar -file.reference.javafx-swing-17.0.7-linux.jar=release/modules/ext/javafx-swing-17.0.7-linux.jar -file.reference.javafx-swing-17.0.7-mac.jar=release/modules/ext/javafx-swing-17.0.7-mac.jar -file.reference.javafx-swing-17.0.7-win.jar=release/modules/ext/javafx-swing-17.0.7-win.jar -file.reference.javafx-swing-17.0.7.jar=release/modules/ext/javafx-swing-17.0.7.jar -file.reference.javafx-web-17.0.7-linux.jar=release/modules/ext/javafx-web-17.0.7-linux.jar -file.reference.javafx-web-17.0.7-mac.jar=release/modules/ext/javafx-web-17.0.7-mac.jar -file.reference.javafx-web-17.0.7-win.jar=release/modules/ext/javafx-web-17.0.7-win.jar -file.reference.javafx-web-17.0.7.jar=release/modules/ext/javafx-web-17.0.7.jar +file.reference.j2objc-annotations-3.0.0.jar=release/modules/ext/j2objc-annotations-3.0.0.jar +file.reference.jackson-annotations-2.18.2.jar=release/modules/ext/jackson-annotations-2.18.2.jar +file.reference.jackson-core-2.18.2.jar=release/modules/ext/jackson-core-2.18.2.jar +file.reference.jackson-databind-2.18.2.jar=release/modules/ext/jackson-databind-2.18.2.jar +file.reference.jackson-dataformat-csv-2.18.2.jar=release/modules/ext/jackson-dataformat-csv-2.18.2.jar +file.reference.jackson-datatype-jsr310-2.18.2.jar=release/modules/ext/jackson-datatype-jsr310-2.18.2.jar +file.reference.javafx-base-17.0.14-ea2-linux.jar=release/modules/ext/javafx-base-17.0.14-ea2-linux.jar +file.reference.javafx-base-17.0.14-ea2-mac.jar=release/modules/ext/javafx-base-17.0.14-ea2-mac.jar +file.reference.javafx-base-17.0.14-ea2-win.jar=release/modules/ext/javafx-base-17.0.14-ea2-win.jar +file.reference.javafx-base-17.0.14-ea2.jar=release/modules/ext/javafx-base-17.0.14-ea2.jar +file.reference.javafx-controls-17.0.14-ea2-linux.jar=release/modules/ext/javafx-controls-17.0.14-ea2-linux.jar +file.reference.javafx-controls-17.0.14-ea2-mac.jar=release/modules/ext/javafx-controls-17.0.14-ea2-mac.jar +file.reference.javafx-controls-17.0.14-ea2-win.jar=release/modules/ext/javafx-controls-17.0.14-ea2-win.jar +file.reference.javafx-controls-17.0.14-ea2.jar=release/modules/ext/javafx-controls-17.0.14-ea2.jar +file.reference.javafx-fxml-17.0.14-ea2-linux.jar=release/modules/ext/javafx-fxml-17.0.14-ea2-linux.jar +file.reference.javafx-fxml-17.0.14-ea2-mac.jar=release/modules/ext/javafx-fxml-17.0.14-ea2-mac.jar +file.reference.javafx-fxml-17.0.14-ea2-win.jar=release/modules/ext/javafx-fxml-17.0.14-ea2-win.jar +file.reference.javafx-fxml-17.0.14-ea2.jar=release/modules/ext/javafx-fxml-17.0.14-ea2.jar +file.reference.javafx-graphics-17.0.14-ea2-linux.jar=release/modules/ext/javafx-graphics-17.0.14-ea2-linux.jar +file.reference.javafx-graphics-17.0.14-ea2-mac.jar=release/modules/ext/javafx-graphics-17.0.14-ea2-mac.jar +file.reference.javafx-graphics-17.0.14-ea2-win.jar=release/modules/ext/javafx-graphics-17.0.14-ea2-win.jar +file.reference.javafx-graphics-17.0.14-ea2.jar=release/modules/ext/javafx-graphics-17.0.14-ea2.jar +file.reference.javafx-media-17.0.14-ea2-linux.jar=release/modules/ext/javafx-media-17.0.14-ea2-linux.jar +file.reference.javafx-media-17.0.14-ea2-mac.jar=release/modules/ext/javafx-media-17.0.14-ea2-mac.jar +file.reference.javafx-media-17.0.14-ea2-win.jar=release/modules/ext/javafx-media-17.0.14-ea2-win.jar +file.reference.javafx-media-17.0.14-ea2.jar=release/modules/ext/javafx-media-17.0.14-ea2.jar +file.reference.javafx-swing-17.0.14-ea2-linux.jar=release/modules/ext/javafx-swing-17.0.14-ea2-linux.jar +file.reference.javafx-swing-17.0.14-ea2-mac.jar=release/modules/ext/javafx-swing-17.0.14-ea2-mac.jar +file.reference.javafx-swing-17.0.14-ea2-win.jar=release/modules/ext/javafx-swing-17.0.14-ea2-win.jar +file.reference.javafx-swing-17.0.14-ea2.jar=release/modules/ext/javafx-swing-17.0.14-ea2.jar +file.reference.javafx-web-17.0.14-ea2-linux.jar=release/modules/ext/javafx-web-17.0.14-ea2-linux.jar +file.reference.javafx-web-17.0.14-ea2-mac.jar=release/modules/ext/javafx-web-17.0.14-ea2-mac.jar +file.reference.javafx-web-17.0.14-ea2-win.jar=release/modules/ext/javafx-web-17.0.14-ea2-win.jar +file.reference.javafx-web-17.0.14-ea2.jar=release/modules/ext/javafx-web-17.0.14-ea2.jar file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar file.reference.jfxtras-common-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar @@ -120,29 +122,27 @@ file.reference.jfxtras-controls-17-r1.jar=release/modules/ext/jfxtras-controls-1 file.reference.jfxtras-fxml-17-r1.jar=release/modules/ext/jfxtras-fxml-17-r1.jar file.reference.jna-5.16.0.jar=release/modules/ext/jna-5.16.0.jar file.reference.jna-platform-5.16.0.jar=release/modules/ext/jna-platform-5.16.0.jar -file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar +file.reference.joda-time-2.13.0.jar=release/modules/ext/joda-time-2.13.0.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar -file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -file.reference.log4j-api-2.17.2.jar=release/modules/ext/log4j-api-2.17.2.jar -file.reference.log4j-core-2.17.2.jar=release/modules/ext/log4j-core-2.17.2.jar -file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar -file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar -file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.jar +file.reference.log4j-api-2.24.3.jar=release/modules/ext/log4j-api-2.24.3.jar +file.reference.log4j-core-2.24.3.jar=release/modules/ext/log4j-core-2.24.3.jar +file.reference.opencensus-api-0.31.1.jar=release/modules/ext/opencensus-api-0.31.1.jar +file.reference.opencensus-contrib-http-util-0.31.1.jar=release/modules/ext/opencensus-contrib-http-util-0.31.1.jar file.reference.opencv-2413.jar=release/modules/ext/opencv-2413.jar -file.reference.perfmark-api-0.23.0.jar=release/modules/ext/perfmark-api-0.23.0.jar -file.reference.proto-google-cloud-translate-v3-2.1.11.jar=release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar -file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar -file.reference.proto-google-common-protos-2.7.4.jar=release/modules/ext/proto-google-common-protos-2.7.4.jar -file.reference.proto-google-iam-v1-1.2.6.jar=release/modules/ext/proto-google-iam-v1-1.2.6.jar -file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar -file.reference.protobuf-java-util-3.19.4.jar=release/modules/ext/protobuf-java-util-3.19.4.jar -file.reference.re2j-1.5.jar=release/modules/ext/re2j-1.5.jar -file.reference.reload4j-1.2.19.jar=release/modules/ext/reload4j-1.2.19.jar -file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar -file.reference.slf4j-reload4j-1.7.36.jar=release/modules/ext/slf4j-reload4j-1.7.36.jar -file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar +file.reference.perfmark-api-0.27.0.jar=release/modules/ext/perfmark-api-0.27.0.jar +file.reference.proto-google-cloud-translate-v3-2.54.0.jar=release/modules/ext/proto-google-cloud-translate-v3-2.54.0.jar +file.reference.proto-google-cloud-translate-v3beta1-0.136.0.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.136.0.jar +file.reference.proto-google-common-protos-2.49.0.jar=release/modules/ext/proto-google-common-protos-2.49.0.jar +file.reference.proto-google-iam-v1-1.44.0.jar=release/modules/ext/proto-google-iam-v1-1.44.0.jar +file.reference.protobuf-java-3.25.5.jar=release/modules/ext/protobuf-java-3.25.5.jar +file.reference.protobuf-java-util-3.25.5.jar=release/modules/ext/protobuf-java-util-3.25.5.jar +file.reference.re2j-1.7.jar=release/modules/ext/re2j-1.7.jar +file.reference.reload4j-1.2.22.jar=release/modules/ext/reload4j-1.2.22.jar +file.reference.slf4j-api-2.0.16.jar=release/modules/ext/slf4j-api-2.0.16.jar +file.reference.slf4j-reload4j-2.0.16.jar=release/modules/ext/slf4j-reload4j-2.0.16.jar +file.reference.threetenbp-1.7.0.jar=release/modules/ext/threetenbp-1.7.0.jar file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar +javac.compilerargs=-Xlint -Xlint\:-serial javac.source=17 -javac.compilerargs=-Xlint -Xlint:-serial nbm.needs.restart=true diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index f0ad9874d0..962c45afab 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -405,6 +405,7 @@ org.apache.commons.io org.apache.commons.io.comparator org.apache.commons.io.filefilter + org.apache.commons.io.function org.apache.commons.io.input org.apache.commons.io.monitor org.apache.commons.io.output @@ -561,464 +562,468 @@ org.slf4j.spi - ext/animal-sniffer-annotations-1.21.jar - release/modules/ext/animal-sniffer-annotations-1.21.jar + ext/animal-sniffer-annotations-1.24.jar + release/modules/ext/animal-sniffer-annotations-1.24.jar ext/annotations-4.1.1.4.jar release/modules/ext/annotations-4.1.1.4.jar - ext/ant-1.10.12.jar - release/modules/ext/ant-1.10.12.jar + ext/ant-1.10.15.jar + release/modules/ext/ant-1.10.15.jar - ext/ant-launcher-1.10.12.jar - release/modules/ext/ant-launcher-1.10.12.jar + ext/ant-launcher-1.10.15.jar + release/modules/ext/ant-launcher-1.10.15.jar - ext/api-common-2.1.4.jar - release/modules/ext/api-common-2.1.4.jar + ext/api-common-2.41.0.jar + release/modules/ext/api-common-2.41.0.jar ext/AppleJavaExtensions-1.4.jar release/modules/ext/AppleJavaExtensions-1.4.jar - ext/auto-value-annotations-1.9.jar - release/modules/ext/auto-value-annotations-1.9.jar + ext/auto-value-annotations-1.11.0.jar + release/modules/ext/auto-value-annotations-1.11.0.jar - ext/bcpkix-jdk15on-1.70.jar - release/modules/ext/bcpkix-jdk15on-1.70.jar + ext/checker-qual-3.47.0.jar + release/modules/ext/checker-qual-3.47.0.jar - ext/bcprov-jdk15on-1.70.jar - release/modules/ext/bcprov-jdk15on-1.70.jar + ext/common-image-3.12.0.jar + release/modules/ext/common-image-3.12.0.jar - ext/bcutil-jdk15on-1.70.jar - release/modules/ext/bcutil-jdk15on-1.70.jar + ext/common-io-3.12.0.jar + release/modules/ext/common-io-3.12.0.jar - ext/checker-qual-3.21.3.jar - release/modules/ext/checker-qual-3.21.3.jar - - - ext/common-image-3.8.2.jar - release/modules/ext/common-image-3.8.2.jar - - - ext/common-io-3.8.2.jar - release/modules/ext/common-io-3.8.2.jar - - - ext/common-lang-3.8.2.jar - release/modules/ext/common-lang-3.8.2.jar + ext/common-lang-3.12.0.jar + release/modules/ext/common-lang-3.12.0.jar ext/commons-beanutils-1.9.4.jar release/modules/ext/commons-beanutils-1.9.4.jar - ext/commons-codec-1.15.jar - release/modules/ext/commons-codec-1.15.jar + ext/commons-codec-1.17.1.jar + release/modules/ext/commons-codec-1.17.1.jar ext/commons-collections-3.2.2.jar release/modules/ext/commons-collections-3.2.2.jar - ext/commons-collections4-4.4.jar - release/modules/ext/commons-collections4-4.4.jar + ext/commons-collections4-4.5.0-M2.jar + release/modules/ext/commons-collections4-4.5.0-M2.jar - ext/commons-csv-1.9.0.jar - release/modules/ext/commons-csv-1.9.0.jar + ext/commons-csv-1.12.0.jar + release/modules/ext/commons-csv-1.12.0.jar ext/commons-digester-2.1.jar release/modules/ext/commons-digester-2.1.jar - ext/commons-io-2.11.0.jar - release/modules/ext/commons-io-2.11.0.jar + ext/commons-io-2.18.0.jar + release/modules/ext/commons-io-2.18.0.jar ext/commons-lang-2.6.jar release/modules/ext/commons-lang-2.6.jar - ext/commons-lang3-3.12.0.jar - release/modules/ext/commons-lang3-3.12.0.jar + ext/commons-lang3-3.17.0.jar + release/modules/ext/commons-lang3-3.17.0.jar - ext/commons-logging-1.2.jar - release/modules/ext/commons-logging-1.2.jar + ext/commons-logging-1.3.4.jar + release/modules/ext/commons-logging-1.3.4.jar - ext/commons-text-1.10.0.jar - release/modules/ext/commons-text-1.10.0.jar + ext/commons-text-1.13.0.jar + release/modules/ext/commons-text-1.13.0.jar - ext/commons-validator-1.7.jar - release/modules/ext/commons-validator-1.7.jar + ext/commons-validator-1.9.0.jar + release/modules/ext/commons-validator-1.9.0.jar - ext/compiler-0.9.10.jar - release/modules/ext/compiler-0.9.10.jar + ext/compiler-0.9.14.jar + release/modules/ext/compiler-0.9.14.jar - ext/conscrypt-openjdk-uber-2.5.1.jar - release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar + ext/conscrypt-openjdk-uber-2.5.2.jar + release/modules/ext/conscrypt-openjdk-uber-2.5.2.jar - ext/controlsfx-11.1.2-sources.jar - release/modules/ext/controlsfx-11.1.2-sources.jar + ext/controlsfx-11.2.1-sources.jar + release/modules/ext/controlsfx-11.2.1-sources.jar - ext/controlsfx-11.1.2.jar - release/modules/ext/controlsfx-11.1.2.jar + ext/controlsfx-11.2.1.jar + release/modules/ext/controlsfx-11.2.1.jar - ext/dd-plist-1.23.jar - release/modules/ext/dd-plist-1.23.jar + ext/dd-plist-1.28.jar + release/modules/ext/dd-plist-1.28.jar - ext/error_prone_annotations-2.11.0.jar - release/modules/ext/error_prone_annotations-2.11.0.jar + ext/error_prone_annotations-2.35.1.jar + release/modules/ext/error_prone_annotations-2.35.1.jar - ext/failureaccess-1.0.1.jar - release/modules/ext/failureaccess-1.0.1.jar + ext/failureaccess-1.0.2.jar + release/modules/ext/failureaccess-1.0.2.jar - ext/gax-2.12.2.jar - release/modules/ext/gax-2.12.2.jar + ext/gax-2.58.0.jar + release/modules/ext/gax-2.58.0.jar - ext/gax-grpc-2.12.2.jar - release/modules/ext/gax-grpc-2.12.2.jar + ext/gax-grpc-2.58.0.jar + release/modules/ext/gax-grpc-2.58.0.jar - ext/gax-httpjson-0.97.2.jar - release/modules/ext/gax-httpjson-0.97.2.jar + ext/gax-httpjson-2.58.0.jar + release/modules/ext/gax-httpjson-2.58.0.jar - ext/google-api-client-1.33.2.jar - release/modules/ext/google-api-client-1.33.2.jar + ext/google-api-client-2.7.0.jar + release/modules/ext/google-api-client-2.7.0.jar - ext/google-api-services-translate-v2-rev20170525-1.32.1.jar - release/modules/ext/google-api-services-translate-v2-rev20170525-1.32.1.jar + ext/google-api-services-translate-v2-rev20170525-2.0.0.jar + release/modules/ext/google-api-services-translate-v2-rev20170525-2.0.0.jar - ext/google-auth-library-credentials-1.5.3.jar - release/modules/ext/google-auth-library-credentials-1.5.3.jar + ext/google-auth-library-credentials-1.30.0.jar + release/modules/ext/google-auth-library-credentials-1.30.0.jar - ext/google-auth-library-oauth2-http-1.5.3.jar - release/modules/ext/google-auth-library-oauth2-http-1.5.3.jar + ext/google-auth-library-oauth2-http-1.30.0.jar + release/modules/ext/google-auth-library-oauth2-http-1.30.0.jar - ext/google-cloud-core-2.5.6.jar - release/modules/ext/google-cloud-core-2.5.6.jar + ext/google-cloud-core-2.48.0.jar + release/modules/ext/google-cloud-core-2.48.0.jar - ext/google-cloud-core-http-2.5.6.jar - release/modules/ext/google-cloud-core-http-2.5.6.jar + ext/google-cloud-core-http-2.48.0.jar + release/modules/ext/google-cloud-core-http-2.48.0.jar - ext/google-cloud-translate-2.1.11.jar - release/modules/ext/google-cloud-translate-2.1.11.jar + ext/google-cloud-translate-2.54.0.jar + release/modules/ext/google-cloud-translate-2.54.0.jar - ext/google-http-client-1.41.4.jar - release/modules/ext/google-http-client-1.41.4.jar + ext/google-http-client-1.45.0.jar + release/modules/ext/google-http-client-1.45.0.jar - ext/google-http-client-apache-v2-1.41.4.jar - release/modules/ext/google-http-client-apache-v2-1.41.4.jar + ext/google-http-client-apache-v2-1.45.0.jar + release/modules/ext/google-http-client-apache-v2-1.45.0.jar - ext/google-http-client-appengine-1.41.4.jar - release/modules/ext/google-http-client-appengine-1.41.4.jar + ext/google-http-client-appengine-1.45.0.jar + release/modules/ext/google-http-client-appengine-1.45.0.jar - ext/google-http-client-gson-1.41.4.jar - release/modules/ext/google-http-client-gson-1.41.4.jar + ext/google-http-client-gson-1.45.0.jar + release/modules/ext/google-http-client-gson-1.45.0.jar - ext/google-http-client-jackson2-1.41.4.jar - release/modules/ext/google-http-client-jackson2-1.41.4.jar + ext/google-http-client-jackson2-1.45.0.jar + release/modules/ext/google-http-client-jackson2-1.45.0.jar - ext/google-oauth-client-1.33.1.jar - release/modules/ext/google-oauth-client-1.33.1.jar + ext/google-oauth-client-1.36.0.jar + release/modules/ext/google-oauth-client-1.36.0.jar - ext/grpc-alts-1.44.1.jar - release/modules/ext/grpc-alts-1.44.1.jar + ext/grpc-alts-1.68.1.jar + release/modules/ext/grpc-alts-1.68.1.jar - ext/grpc-api-1.44.1.jar - release/modules/ext/grpc-api-1.44.1.jar + ext/grpc-api-1.68.1.jar + release/modules/ext/grpc-api-1.68.1.jar - ext/grpc-auth-1.44.1.jar - release/modules/ext/grpc-auth-1.44.1.jar + ext/grpc-auth-1.68.1.jar + release/modules/ext/grpc-auth-1.68.1.jar - ext/grpc-context-1.44.1.jar - release/modules/ext/grpc-context-1.44.1.jar + ext/grpc-context-1.68.1.jar + release/modules/ext/grpc-context-1.68.1.jar - ext/grpc-core-1.44.1.jar - release/modules/ext/grpc-core-1.44.1.jar + ext/grpc-core-1.68.1.jar + release/modules/ext/grpc-core-1.68.1.jar - ext/grpc-grpclb-1.44.1.jar - release/modules/ext/grpc-grpclb-1.44.1.jar + ext/grpc-googleapis-1.68.1.jar + release/modules/ext/grpc-googleapis-1.68.1.jar - ext/grpc-netty-shaded-1.44.1.jar - release/modules/ext/grpc-netty-shaded-1.44.1.jar + ext/grpc-grpclb-1.68.1.jar + release/modules/ext/grpc-grpclb-1.68.1.jar - ext/grpc-protobuf-1.44.1.jar - release/modules/ext/grpc-protobuf-1.44.1.jar + ext/grpc-inprocess-1.68.1.jar + release/modules/ext/grpc-inprocess-1.68.1.jar - ext/grpc-protobuf-lite-1.44.1.jar - release/modules/ext/grpc-protobuf-lite-1.44.1.jar + ext/grpc-netty-shaded-1.68.1.jar + release/modules/ext/grpc-netty-shaded-1.68.1.jar - ext/grpc-services-1.44.1.jar - release/modules/ext/grpc-services-1.44.1.jar + ext/grpc-protobuf-1.68.1.jar + release/modules/ext/grpc-protobuf-1.68.1.jar - ext/grpc-stub-1.44.1.jar - release/modules/ext/grpc-stub-1.44.1.jar + ext/grpc-protobuf-lite-1.68.1.jar + release/modules/ext/grpc-protobuf-lite-1.68.1.jar - ext/grpc-xds-1.44.1.jar - release/modules/ext/grpc-xds-1.44.1.jar + ext/grpc-s2a-1.68.1.jar + release/modules/ext/grpc-s2a-1.68.1.jar - ext/gson-2.9.0.jar - release/modules/ext/gson-2.9.0.jar + ext/grpc-services-1.68.1.jar + release/modules/ext/grpc-services-1.68.1.jar + + + ext/grpc-stub-1.68.1.jar + release/modules/ext/grpc-stub-1.68.1.jar + + + ext/grpc-util-1.68.1.jar + release/modules/ext/grpc-util-1.68.1.jar + + + ext/grpc-xds-1.68.1.jar + release/modules/ext/grpc-xds-1.68.1.jar + + + ext/gson-2.11.0.jar + release/modules/ext/gson-2.11.0.jar ext/gst1-java-core-1.4.0.jar release/modules/ext/gst1-java-core-1.4.0.jar - ext/guava-32.0.1-jre.jar - release/modules/ext/guava-32.0.1-jre.jar + ext/guava-33.4.0-jre.jar + release/modules/ext/guava-33.4.0-jre.jar - ext/httpclient-4.5.13.jar - release/modules/ext/httpclient-4.5.13.jar + ext/httpclient-4.5.14.jar + release/modules/ext/httpclient-4.5.14.jar - ext/httpcore-4.4.15.jar - release/modules/ext/httpcore-4.4.15.jar + ext/httpcore-4.4.16.jar + release/modules/ext/httpcore-4.4.16.jar - ext/imageio-bmp-3.8.2.jar - release/modules/ext/imageio-bmp-3.8.2.jar + ext/imageio-bmp-3.12.0.jar + release/modules/ext/imageio-bmp-3.12.0.jar - ext/imageio-core-3.8.2.jar - release/modules/ext/imageio-core-3.8.2.jar + ext/imageio-core-3.12.0.jar + release/modules/ext/imageio-core-3.12.0.jar - ext/imageio-icns-3.8.2.jar - release/modules/ext/imageio-icns-3.8.2.jar + ext/imageio-icns-3.12.0.jar + release/modules/ext/imageio-icns-3.12.0.jar - ext/imageio-iff-3.8.2.jar - release/modules/ext/imageio-iff-3.8.2.jar + ext/imageio-iff-3.12.0.jar + release/modules/ext/imageio-iff-3.12.0.jar - ext/imageio-jpeg-3.8.2.jar - release/modules/ext/imageio-jpeg-3.8.2.jar + ext/imageio-jpeg-3.12.0.jar + release/modules/ext/imageio-jpeg-3.12.0.jar - ext/imageio-metadata-3.8.2.jar - release/modules/ext/imageio-metadata-3.8.2.jar + ext/imageio-metadata-3.12.0.jar + release/modules/ext/imageio-metadata-3.12.0.jar - ext/imageio-pcx-3.8.2.jar - release/modules/ext/imageio-pcx-3.8.2.jar + ext/imageio-pcx-3.12.0.jar + release/modules/ext/imageio-pcx-3.12.0.jar - ext/imageio-pict-3.8.2.jar - release/modules/ext/imageio-pict-3.8.2.jar + ext/imageio-pict-3.12.0.jar + release/modules/ext/imageio-pict-3.12.0.jar - ext/imageio-pnm-3.8.2.jar - release/modules/ext/imageio-pnm-3.8.2.jar + ext/imageio-pnm-3.12.0.jar + release/modules/ext/imageio-pnm-3.12.0.jar - ext/imageio-psd-3.8.2.jar - release/modules/ext/imageio-psd-3.8.2.jar + ext/imageio-psd-3.12.0.jar + release/modules/ext/imageio-psd-3.12.0.jar - ext/imageio-sgi-3.8.2.jar - release/modules/ext/imageio-sgi-3.8.2.jar + ext/imageio-sgi-3.12.0.jar + release/modules/ext/imageio-sgi-3.12.0.jar - ext/imageio-tga-3.8.2.jar - release/modules/ext/imageio-tga-3.8.2.jar + ext/imageio-tga-3.12.0.jar + release/modules/ext/imageio-tga-3.12.0.jar - ext/imageio-thumbsdb-3.8.2.jar - release/modules/ext/imageio-thumbsdb-3.8.2.jar + ext/imageio-thumbsdb-3.12.0.jar + release/modules/ext/imageio-thumbsdb-3.12.0.jar - ext/imageio-tiff-3.8.2.jar - release/modules/ext/imageio-tiff-3.8.2.jar + ext/imageio-tiff-3.12.0.jar + release/modules/ext/imageio-tiff-3.12.0.jar ext/imgscalr-lib-4.2.jar release/modules/ext/imgscalr-lib-4.2.jar - ext/j2objc-annotations-1.3.jar - release/modules/ext/j2objc-annotations-1.3.jar + ext/j2objc-annotations-3.0.0.jar + release/modules/ext/j2objc-annotations-3.0.0.jar - ext/jackson-annotations-2.15.2.jar - release/modules/ext/jackson-annotations-2.15.2.jar + ext/jackson-annotations-2.18.2.jar + release/modules/ext/jackson-annotations-2.18.2.jar - ext/jackson-core-2.15.2.jar - release/modules/ext/jackson-core-2.15.2.jar + ext/jackson-core-2.18.2.jar + release/modules/ext/jackson-core-2.18.2.jar - ext/jackson-databind-2.15.2.jar - release/modules/ext/jackson-databind-2.15.2.jar + ext/jackson-databind-2.18.2.jar + release/modules/ext/jackson-databind-2.18.2.jar - ext/jackson-dataformat-csv-2.15.2.jar - release/modules/ext/jackson-dataformat-csv-2.15.2.jar + ext/jackson-dataformat-csv-2.18.2.jar + release/modules/ext/jackson-dataformat-csv-2.18.2.jar - ext/jackson-datatype-jsr310-2.15.2.jar - release/modules/ext/jackson-datatype-jsr310-2.15.2.jar + ext/jackson-datatype-jsr310-2.18.2.jar + release/modules/ext/jackson-datatype-jsr310-2.18.2.jar - ext/javafx-base-17.0.7-linux.jar - release/modules/ext/javafx-base-17.0.7-linux.jar + ext/javafx-base-17.0.14-ea2-linux.jar + release/modules/ext/javafx-base-17.0.14-ea2-linux.jar - ext/javafx-base-17.0.7-mac.jar - release/modules/ext/javafx-base-17.0.7-mac.jar + ext/javafx-base-17.0.14-ea2-mac.jar + release/modules/ext/javafx-base-17.0.14-ea2-mac.jar - ext/javafx-base-17.0.7-win.jar - release/modules/ext/javafx-base-17.0.7-win.jar + ext/javafx-base-17.0.14-ea2-win.jar + release/modules/ext/javafx-base-17.0.14-ea2-win.jar - ext/javafx-base-17.0.7.jar - release/modules/ext/javafx-base-17.0.7.jar + ext/javafx-base-17.0.14-ea2.jar + release/modules/ext/javafx-base-17.0.14-ea2.jar - ext/javafx-controls-17.0.7-linux.jar - release/modules/ext/javafx-controls-17.0.7-linux.jar + ext/javafx-controls-17.0.14-ea2-linux.jar + release/modules/ext/javafx-controls-17.0.14-ea2-linux.jar - ext/javafx-controls-17.0.7-mac.jar - release/modules/ext/javafx-controls-17.0.7-mac.jar + ext/javafx-controls-17.0.14-ea2-mac.jar + release/modules/ext/javafx-controls-17.0.14-ea2-mac.jar - ext/javafx-controls-17.0.7-win.jar - release/modules/ext/javafx-controls-17.0.7-win.jar + ext/javafx-controls-17.0.14-ea2-win.jar + release/modules/ext/javafx-controls-17.0.14-ea2-win.jar - ext/javafx-controls-17.0.7.jar - release/modules/ext/javafx-controls-17.0.7.jar + ext/javafx-controls-17.0.14-ea2.jar + release/modules/ext/javafx-controls-17.0.14-ea2.jar - ext/javafx-fxml-17.0.7-linux.jar - release/modules/ext/javafx-fxml-17.0.7-linux.jar + ext/javafx-fxml-17.0.14-ea2-linux.jar + release/modules/ext/javafx-fxml-17.0.14-ea2-linux.jar - ext/javafx-fxml-17.0.7-mac.jar - release/modules/ext/javafx-fxml-17.0.7-mac.jar + ext/javafx-fxml-17.0.14-ea2-mac.jar + release/modules/ext/javafx-fxml-17.0.14-ea2-mac.jar - ext/javafx-fxml-17.0.7-win.jar - release/modules/ext/javafx-fxml-17.0.7-win.jar + ext/javafx-fxml-17.0.14-ea2-win.jar + release/modules/ext/javafx-fxml-17.0.14-ea2-win.jar - ext/javafx-fxml-17.0.7.jar - release/modules/ext/javafx-fxml-17.0.7.jar + ext/javafx-fxml-17.0.14-ea2.jar + release/modules/ext/javafx-fxml-17.0.14-ea2.jar - ext/javafx-graphics-17.0.7-linux.jar - release/modules/ext/javafx-graphics-17.0.7-linux.jar + ext/javafx-graphics-17.0.14-ea2-linux.jar + release/modules/ext/javafx-graphics-17.0.14-ea2-linux.jar - ext/javafx-graphics-17.0.7-mac.jar - release/modules/ext/javafx-graphics-17.0.7-mac.jar + ext/javafx-graphics-17.0.14-ea2-mac.jar + release/modules/ext/javafx-graphics-17.0.14-ea2-mac.jar - ext/javafx-graphics-17.0.7-win.jar - release/modules/ext/javafx-graphics-17.0.7-win.jar + ext/javafx-graphics-17.0.14-ea2-win.jar + release/modules/ext/javafx-graphics-17.0.14-ea2-win.jar - ext/javafx-graphics-17.0.7.jar - release/modules/ext/javafx-graphics-17.0.7.jar + ext/javafx-graphics-17.0.14-ea2.jar + release/modules/ext/javafx-graphics-17.0.14-ea2.jar - ext/javafx-media-17.0.7-linux.jar - release/modules/ext/javafx-media-17.0.7-linux.jar + ext/javafx-media-17.0.14-ea2-linux.jar + release/modules/ext/javafx-media-17.0.14-ea2-linux.jar - ext/javafx-media-17.0.7-mac.jar - release/modules/ext/javafx-media-17.0.7-mac.jar + ext/javafx-media-17.0.14-ea2-mac.jar + release/modules/ext/javafx-media-17.0.14-ea2-mac.jar - ext/javafx-media-17.0.7-win.jar - release/modules/ext/javafx-media-17.0.7-win.jar + ext/javafx-media-17.0.14-ea2-win.jar + release/modules/ext/javafx-media-17.0.14-ea2-win.jar - ext/javafx-media-17.0.7.jar - release/modules/ext/javafx-media-17.0.7.jar + ext/javafx-media-17.0.14-ea2.jar + release/modules/ext/javafx-media-17.0.14-ea2.jar - ext/javafx-swing-17.0.7-linux.jar - release/modules/ext/javafx-swing-17.0.7-linux.jar + ext/javafx-swing-17.0.14-ea2-linux.jar + release/modules/ext/javafx-swing-17.0.14-ea2-linux.jar - ext/javafx-swing-17.0.7-mac.jar - release/modules/ext/javafx-swing-17.0.7-mac.jar + ext/javafx-swing-17.0.14-ea2-mac.jar + release/modules/ext/javafx-swing-17.0.14-ea2-mac.jar - ext/javafx-swing-17.0.7-win.jar - release/modules/ext/javafx-swing-17.0.7-win.jar + ext/javafx-swing-17.0.14-ea2-win.jar + release/modules/ext/javafx-swing-17.0.14-ea2-win.jar - ext/javafx-swing-17.0.7.jar - release/modules/ext/javafx-swing-17.0.7.jar + ext/javafx-swing-17.0.14-ea2.jar + release/modules/ext/javafx-swing-17.0.14-ea2.jar - ext/javafx-web-17.0.7-linux.jar - release/modules/ext/javafx-web-17.0.7-linux.jar + ext/javafx-web-17.0.14-ea2-linux.jar + release/modules/ext/javafx-web-17.0.14-ea2-linux.jar - ext/javafx-web-17.0.7-mac.jar - release/modules/ext/javafx-web-17.0.7-mac.jar + ext/javafx-web-17.0.14-ea2-mac.jar + release/modules/ext/javafx-web-17.0.14-ea2-mac.jar - ext/javafx-web-17.0.7-win.jar - release/modules/ext/javafx-web-17.0.7-win.jar + ext/javafx-web-17.0.14-ea2-win.jar + release/modules/ext/javafx-web-17.0.14-ea2-win.jar - ext/javafx-web-17.0.7.jar - release/modules/ext/javafx-web-17.0.7.jar + ext/javafx-web-17.0.14-ea2.jar + release/modules/ext/javafx-web-17.0.14-ea2.jar ext/javax.annotation-api-1.3.2.jar @@ -1049,8 +1054,8 @@ release/modules/ext/jna-platform-5.16.0.jar - ext/joda-time-2.10.14.jar - release/modules/ext/joda-time-2.10.14.jar + ext/joda-time-2.13.0.jar + release/modules/ext/joda-time-2.13.0.jar ext/jsr305-3.0.2.jar @@ -1065,76 +1070,72 @@ release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - ext/log4j-api-2.17.2.jar - release/modules/ext/log4j-api-2.17.2.jar + ext/log4j-api-2.24.3.jar + release/modules/ext/log4j-api-2.24.3.jar - ext/log4j-core-2.17.2.jar - release/modules/ext/log4j-core-2.17.2.jar + ext/log4j-core-2.24.3.jar + release/modules/ext/log4j-core-2.24.3.jar - ext/opencensus-api-0.31.0.jar - release/modules/ext/opencensus-api-0.31.0.jar + ext/opencensus-api-0.31.1.jar + release/modules/ext/opencensus-api-0.31.1.jar - ext/opencensus-contrib-http-util-0.31.0.jar - release/modules/ext/opencensus-contrib-http-util-0.31.0.jar - - - ext/opencensus-proto-0.2.0.jar - release/modules/ext/opencensus-proto-0.2.0.jar + ext/opencensus-contrib-http-util-0.31.1.jar + release/modules/ext/opencensus-contrib-http-util-0.31.1.jar ext/opencv-2413.jar release/modules/ext/opencv-2413.jar - ext/perfmark-api-0.23.0.jar - release/modules/ext/perfmark-api-0.23.0.jar + ext/perfmark-api-0.27.0.jar + release/modules/ext/perfmark-api-0.27.0.jar - ext/proto-google-cloud-translate-v3-2.1.11.jar - release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar + ext/proto-google-cloud-translate-v3-2.54.0.jar + release/modules/ext/proto-google-cloud-translate-v3-2.54.0.jar - ext/proto-google-cloud-translate-v3beta1-0.83.11.jar - release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar + ext/proto-google-cloud-translate-v3beta1-0.136.0.jar + release/modules/ext/proto-google-cloud-translate-v3beta1-0.136.0.jar - ext/proto-google-common-protos-2.7.4.jar - release/modules/ext/proto-google-common-protos-2.7.4.jar + ext/proto-google-common-protos-2.49.0.jar + release/modules/ext/proto-google-common-protos-2.49.0.jar - ext/proto-google-iam-v1-1.2.6.jar - release/modules/ext/proto-google-iam-v1-1.2.6.jar + ext/proto-google-iam-v1-1.44.0.jar + release/modules/ext/proto-google-iam-v1-1.44.0.jar - ext/protobuf-java-3.19.4.jar - release/modules/ext/protobuf-java-3.19.4.jar + ext/protobuf-java-3.25.5.jar + release/modules/ext/protobuf-java-3.25.5.jar - ext/protobuf-java-util-3.19.4.jar - release/modules/ext/protobuf-java-util-3.19.4.jar + ext/protobuf-java-util-3.25.5.jar + release/modules/ext/protobuf-java-util-3.25.5.jar - ext/re2j-1.5.jar - release/modules/ext/re2j-1.5.jar + ext/re2j-1.7.jar + release/modules/ext/re2j-1.7.jar - ext/reload4j-1.2.19.jar - release/modules/ext/reload4j-1.2.19.jar + ext/reload4j-1.2.22.jar + release/modules/ext/reload4j-1.2.22.jar - ext/slf4j-api-1.7.36.jar - release/modules/ext/slf4j-api-1.7.36.jar + ext/slf4j-api-2.0.16.jar + release/modules/ext/slf4j-api-2.0.16.jar - ext/slf4j-reload4j-1.7.36.jar - release/modules/ext/slf4j-reload4j-1.7.36.jar + ext/slf4j-reload4j-2.0.16.jar + release/modules/ext/slf4j-reload4j-2.0.16.jar - ext/threetenbp-1.5.2.jar - release/modules/ext/threetenbp-1.5.2.jar + ext/threetenbp-1.7.0.jar + release/modules/ext/threetenbp-1.7.0.jar ext/webp-imageio-sejda-0.1.0.jar diff --git a/CoreTestLibs/ivy.xml b/CoreTestLibs/ivy.xml index 7cbcd8e48d..ca83f300b3 100644 --- a/CoreTestLibs/ivy.xml +++ b/CoreTestLibs/ivy.xml @@ -5,9 +5,12 @@ - - - + + + + + + \ No newline at end of file diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties index 6ea6cbac47..3cfbab46f8 100644 --- a/CoreTestLibs/nbproject/project.properties +++ b/CoreTestLibs/nbproject/project.properties @@ -1,8 +1,8 @@ -file.reference.byte-buddy-1.10.13.jar=release/modules/ext/byte-buddy-1.10.13.jar -file.reference.byte-buddy-agent-1.10.13.jar=release/modules/ext/byte-buddy-agent-1.10.13.jar +file.reference.byte-buddy-1.15.11.jar=release/modules/ext/byte-buddy-1.15.11.jar +file.reference.byte-buddy-agent-1.15.11.jar=release/modules/ext/byte-buddy-agent-1.15.11.jar file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar file.reference.mockito-core-4.8.1.jar=release/modules/ext/mockito-core-4.8.1.jar -file.reference.objenesis-3.1.jar=release/modules/ext/objenesis-3.1.jar -javac.source=11 -javac.compilerargs=-Xlint -Xlint:-serial +file.reference.objenesis-3.4.jar=release/modules/ext/objenesis-3.4.jar +javac.compilerargs=-Xlint -Xlint\:-serial +javac.source=17 diff --git a/CoreTestLibs/nbproject/project.xml b/CoreTestLibs/nbproject/project.xml index 94d755e3b9..38125bd744 100644 --- a/CoreTestLibs/nbproject/project.xml +++ b/CoreTestLibs/nbproject/project.xml @@ -44,12 +44,12 @@ org.junit.validator - ext/byte-buddy-1.12.18.jar - release/modules/ext/byte-buddy-1.12.18.jar + ext/byte-buddy-1.15.11.jar + release/modules/ext/byte-buddy-1.15.11.jar - ext/byte-buddy-agent-1.12.18.jar - release/modules/ext/byte-buddy-agent-1.12.18.jar + ext/byte-buddy-agent-1.15.11.jar + release/modules/ext/byte-buddy-agent-1.15.11.jar ext/hamcrest-core-1.3.jar @@ -64,8 +64,8 @@ release/modules/ext/mockito-core-4.8.1.jar - ext/objenesis-3.3.jar - release/modules/ext/objenesis-3.3.jar + ext/objenesis-3.4.jar + release/modules/ext/objenesis-3.4.jar diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties index 5f135c60e4..bbab824d65 100644 --- a/Experimental/nbproject/project.properties +++ b/Experimental/nbproject/project.properties @@ -1,4 +1,4 @@ file.reference.jtidy-r938.jar=release/modules/ext/jtidy-r938.jar +javac.compilerargs=-Xlint -Xlint\:-serial javac.source=17 -javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.0 diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index a2bf2cb14c..3a03cb9dd8 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -17,45 +17,53 @@ - + - + - + - + + + - - - - + + + + - - - + + + - + + + - - - - - - - + + + + + + + - - - - - + + + + + + + + + diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml index a776ab49c3..b582aee40a 100644 --- a/KeywordSearch/ivysettings.xml +++ b/KeywordSearch/ivysettings.xml @@ -1,4 +1,12 @@ + + + + + + + + diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 16289e9e73..93c35e470f 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -1,51 +1,55 @@ file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.jar -file.reference.commons-io-2.8.0.jar=release/modules/ext/commons-io-2.8.0.jar +file.reference.checker-qual-3.43.0.jar=release/modules/ext/checker-qual-3.43.0.jar +file.reference.commons-io-2.18.0.jar=release/modules/ext/commons-io-2.18.0.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar -file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.error_prone_annotations-2.36.0.jar=release/modules/ext/error_prone_annotations-2.36.0.jar +file.reference.failureaccess-1.0.2.jar=release/modules/ext/failureaccess-1.0.2.jar +file.reference.guava-33.4.0-jre.jar=release/modules/ext/guava-33.4.0-jre.jar file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar -file.reference.http2-client-9.4.44.v20210927.jar=release/modules/ext/http2-client-9.4.44.v20210927.jar -file.reference.http2-common-9.4.44.v20210927.jar=release/modules/ext/http2-common-9.4.44.v20210927.jar -file.reference.http2-hpack-9.4.44.v20210927.jar=release/modules/ext/http2-hpack-9.4.44.v20210927.jar -file.reference.http2-http-client-transport-9.4.44.v20210927.jar=release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar +file.reference.http2-client-11.0.24.jar=release/modules/ext/http2-client-11.0.24.jar +file.reference.http2-common-9.4.53.v20231009.jar=release/modules/ext/http2-common-9.4.53.v20231009.jar +file.reference.http2-hpack-9.4.53.v20231009.jar=release/modules/ext/http2-hpack-9.4.53.v20231009.jar +file.reference.http2-http-client-transport-9.4.53.v20231009.jar=release/modules/ext/http2-http-client-transport-9.4.53.v20231009.jar file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar file.reference.httpcore-4.4.14.jar=release/modules/ext/httpcore-4.4.14.jar file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar -file.reference.icu4j-70.1.jar=release/modules/ext/icu4j-70.1.jar -file.reference.jcl-over-slf4j-1.7.24.jar=release/modules/ext/jcl-over-slf4j-1.7.24.jar -file.reference.jetty-alpn-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar -file.reference.jetty-alpn-java-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar -file.reference.jetty-alpn-openjdk8-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar -file.reference.jetty-client-9.4.44.v20210927.jar=release/modules/ext/jetty-client-9.4.44.v20210927.jar -file.reference.jetty-http-9.4.44.v20210927.jar=release/modules/ext/jetty-http-9.4.44.v20210927.jar -file.reference.jetty-io-9.4.44.v20210927.jar=release/modules/ext/jetty-io-9.4.44.v20210927.jar -file.reference.jetty-util-9.4.44.v20210927.jar=release/modules/ext/jetty-util-9.4.44.v20210927.jar +file.reference.icu4j-76.1.jar=release/modules/ext/icu4j-76.1.jar +file.reference.j2objc-annotations-3.0.0.jar=release/modules/ext/j2objc-annotations-3.0.0.jar +file.reference.jcl-over-slf4j-1.7.36.jar=release/modules/ext/jcl-over-slf4j-1.7.36.jar +file.reference.jetty-alpn-client-9.4.53.v20231009.jar=release/modules/ext/jetty-alpn-client-9.4.53.v20231009.jar +file.reference.jetty-alpn-java-client-9.4.53.v20231009.jar=release/modules/ext/jetty-alpn-java-client-9.4.53.v20231009.jar +file.reference.jetty-client-9.4.53.v20231009.jar=release/modules/ext/jetty-client-9.4.53.v20231009.jar +file.reference.jetty-http-9.4.53.v20231009.jar=release/modules/ext/jetty-http-9.4.53.v20231009.jar +file.reference.jetty-io-9.4.53.v20231009.jar=release/modules/ext/jetty-io-9.4.53.v20231009.jar +file.reference.jetty-util-9.4.53.v20231009.jar=release/modules/ext/jetty-util-9.4.53.v20231009.jar file.reference.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar +file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.jar -file.reference.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar -file.reference.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar -file.reference.lucene-core-8.11.2.jar=release/modules/ext/lucene-core-8.11.2.jar -file.reference.netty-buffer-4.1.68.Final.jar=release/modules/ext/netty-buffer-4.1.68.Final.jar -file.reference.netty-codec-4.1.68.Final.jar=release/modules/ext/netty-codec-4.1.68.Final.jar -file.reference.netty-common-4.1.68.Final.jar=release/modules/ext/netty-common-4.1.68.Final.jar -file.reference.netty-handler-4.1.68.Final.jar=release/modules/ext/netty-handler-4.1.68.Final.jar -file.reference.netty-resolver-4.1.68.Final.jar=release/modules/ext/netty-resolver-4.1.68.Final.jar -file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.Final.jar -file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar -file.reference.netty-transport-4.1.68.Final.jar=release/modules/ext/netty-transport-4.1.68.Final.jar -file.reference.netty-transport-native-epoll-4.1.68.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar -file.reference.netty-transport-native-unix-common-4.1.68.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar +file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +file.reference.lucene-core-8.11.4.jar=release/modules/ext/lucene-core-8.11.4.jar +file.reference.netty-buffer-4.1.99.Final.jar=release/modules/ext/netty-buffer-4.1.99.Final.jar +file.reference.netty-codec-4.1.99.Final.jar=release/modules/ext/netty-codec-4.1.99.Final.jar +file.reference.netty-common-4.1.116.Final.jar=release/modules/ext/netty-common-4.1.116.Final.jar +file.reference.netty-handler-4.1.99.Final.jar=release/modules/ext/netty-handler-4.1.99.Final.jar +file.reference.netty-resolver-4.1.99.Final.jar=release/modules/ext/netty-resolver-4.1.99.Final.jar +file.reference.netty-tcnative-boringssl-static-2.0.66.Final.jar=release/modules/ext/netty-tcnative-boringssl-static-2.0.66.Final.jar +file.reference.netty-tcnative-classes-2.0.66.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar +file.reference.netty-transport-4.1.116.Final.jar=release/modules/ext/netty-transport-4.1.116.Final.jar +file.reference.netty-transport-classes-epoll-4.1.116.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar +file.reference.netty-transport-native-epoll-4.1.116.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.116.Final.jar +file.reference.netty-transport-native-unix-common-4.1.99.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.99.Final.jar file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar -file.reference.snappy-java-1.1.7.6.jar=release/modules/ext/snappy-java-1.1.7.6.jar -file.reference.solr-solrj-8.11.2.jar=release/modules/ext/solr-solrj-8.11.2.jar +file.reference.snappy-java-1.1.10.7.jar=release/modules/ext/snappy-java-1.1.10.7.jar +file.reference.solr-solrj-8.11.4.jar=release/modules/ext/solr-solrj-8.11.4.jar file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar -file.reference.woodstox-core-6.2.4.jar=release/modules/ext/woodstox-core-6.2.4.jar -file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar -file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.jar +file.reference.woodstox-core-6.5.1.jar=release/modules/ext/woodstox-core-6.5.1.jar +file.reference.zookeeper-3.9.3.jar=release/modules/ext/zookeeper-3.9.3.jar +file.reference.zookeeper-jute-3.9.3.jar=release/modules/ext/zookeeper-jute-3.9.3.jar +javac.compilerargs=-Xlint -Xlint\:-serial javac.source=17 -javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt -nbm.homepage=http://www.sleuthkit.org/autopsy/ +nbm.homepage=http\://www.sleuthkit.org/autopsy/ nbm.needs.restart=true spec.version.base=6.7 diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 98a84faeb5..ca03edaf12 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -239,8 +239,12 @@ release/modules/ext/annotations-12.0.jar - ext/commons-io-2.8.0.jar - release/modules/ext/commons-io-2.8.0.jar + ext/checker-qual-3.43.0.jar + release/modules/ext/checker-qual-3.43.0.jar + + + ext/commons-io-2.18.0.jar + release/modules/ext/commons-io-2.18.0.jar ext/commons-lang-2.6.jar @@ -251,28 +255,36 @@ release/modules/ext/commons-math3-3.6.1.jar - ext/guava-31.1-jre.jar - release/modules/ext/guava-31.1-jre.jar + ext/error_prone_annotations-2.36.0.jar + release/modules/ext/error_prone_annotations-2.36.0.jar + + + ext/failureaccess-1.0.2.jar + release/modules/ext/failureaccess-1.0.2.jar + + + ext/guava-33.4.0-jre.jar + release/modules/ext/guava-33.4.0-jre.jar ext/hamcrest-core-1.3.jar release/modules/ext/hamcrest-core-1.3.jar - ext/http2-client-9.4.44.v20210927.jar - release/modules/ext/http2-client-9.4.44.v20210927.jar + ext/http2-client-11.0.24.jar + release/modules/ext/http2-client-11.0.24.jar - ext/http2-common-9.4.44.v20210927.jar - release/modules/ext/http2-common-9.4.44.v20210927.jar + ext/http2-common-9.4.53.v20231009.jar + release/modules/ext/http2-common-9.4.53.v20231009.jar - ext/http2-hpack-9.4.44.v20210927.jar - release/modules/ext/http2-hpack-9.4.44.v20210927.jar + ext/http2-hpack-9.4.53.v20231009.jar + release/modules/ext/http2-hpack-9.4.53.v20231009.jar - ext/http2-http-client-transport-9.4.44.v20210927.jar - release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar + ext/http2-http-client-transport-9.4.53.v20231009.jar + release/modules/ext/http2-http-client-transport-9.4.53.v20231009.jar ext/httpclient-4.5.13.jar @@ -287,45 +299,49 @@ release/modules/ext/httpmime-4.5.13.jar - ext/icu4j-70.1.jar - release/modules/ext/icu4j-70.1.jar + ext/icu4j-76.1.jar + release/modules/ext/icu4j-76.1.jar - ext/jcl-over-slf4j-1.7.24.jar - release/modules/ext/jcl-over-slf4j-1.7.24.jar + ext/j2objc-annotations-3.0.0.jar + release/modules/ext/j2objc-annotations-3.0.0.jar - ext/jetty-alpn-client-9.4.44.v20210927.jar - release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar + ext/jcl-over-slf4j-1.7.36.jar + release/modules/ext/jcl-over-slf4j-1.7.36.jar - ext/jetty-alpn-java-client-9.4.44.v20210927.jar - release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar + ext/jetty-alpn-client-9.4.53.v20231009.jar + release/modules/ext/jetty-alpn-client-9.4.53.v20231009.jar - ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar - release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar + ext/jetty-alpn-java-client-9.4.53.v20231009.jar + release/modules/ext/jetty-alpn-java-client-9.4.53.v20231009.jar - ext/jetty-client-9.4.44.v20210927.jar - release/modules/ext/jetty-client-9.4.44.v20210927.jar + ext/jetty-client-9.4.53.v20231009.jar + release/modules/ext/jetty-client-9.4.53.v20231009.jar - ext/jetty-http-9.4.44.v20210927.jar - release/modules/ext/jetty-http-9.4.44.v20210927.jar + ext/jetty-http-9.4.53.v20231009.jar + release/modules/ext/jetty-http-9.4.53.v20231009.jar - ext/jetty-io-9.4.44.v20210927.jar - release/modules/ext/jetty-io-9.4.44.v20210927.jar + ext/jetty-io-9.4.53.v20231009.jar + release/modules/ext/jetty-io-9.4.53.v20231009.jar - ext/jetty-util-9.4.44.v20210927.jar - release/modules/ext/jetty-util-9.4.44.v20210927.jar + ext/jetty-util-9.4.53.v20231009.jar + release/modules/ext/jetty-util-9.4.53.v20231009.jar ext/jsonic-1.2.11.jar release/modules/ext/jsonic-1.2.11.jar + + ext/jsr305-3.0.2.jar + release/modules/ext/jsr305-3.0.2.jar + ext/junit-4.13.2.jar release/modules/ext/junit-4.13.2.jar @@ -335,84 +351,84 @@ release/modules/ext/language-detector-0.6.jar - ext/logback-classic-1.2.10.jar - release/modules/ext/logback-classic-1.2.10.jar + ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - ext/logback-core-1.2.10.jar - release/modules/ext/logback-core-1.2.10.jar + ext/lucene-core-8.11.4.jar + release/modules/ext/lucene-core-8.11.4.jar - ext/lucene-core-8.11.2.jar - release/modules/ext/lucene-core-8.11.2.jar + ext/netty-buffer-4.1.99.Final.jar + release/modules/ext/netty-buffer-4.1.99.Final.jar - ext/netty-buffer-4.1.68.Final.jar - release/modules/ext/netty-buffer-4.1.68.Final.jar + ext/netty-codec-4.1.99.Final.jar + release/modules/ext/netty-codec-4.1.99.Final.jar - ext/netty-codec-4.1.68.Final.jar - release/modules/ext/netty-codec-4.1.68.Final.jar + ext/netty-common-4.1.116.Final.jar + release/modules/ext/netty-common-4.1.116.Final.jar - ext/netty-common-4.1.68.Final.jar - release/modules/ext/netty-common-4.1.68.Final.jar + ext/netty-handler-4.1.99.Final.jar + release/modules/ext/netty-handler-4.1.99.Final.jar - ext/netty-handler-4.1.68.Final.jar - release/modules/ext/netty-handler-4.1.68.Final.jar + ext/netty-resolver-4.1.99.Final.jar + release/modules/ext/netty-resolver-4.1.99.Final.jar - ext/netty-resolver-4.1.68.Final.jar - release/modules/ext/netty-resolver-4.1.68.Final.jar + ext/netty-tcnative-boringssl-static-2.0.66.Final.jar + release/modules/ext/netty-tcnative-boringssl-static-2.0.66.Final.jar - ext/netty-tcnative-2.0.48.Final.jar - release/modules/ext/netty-tcnative-2.0.48.Final.jar + ext/netty-tcnative-classes-2.0.66.Final.jar + release/modules/ext/netty-tcnative-classes-2.0.66.Final.jar - ext/netty-tcnative-classes-2.0.48.Final.jar - release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar + ext/netty-transport-4.1.116.Final.jar + release/modules/ext/netty-transport-4.1.116.Final.jar - ext/netty-transport-4.1.68.Final.jar - release/modules/ext/netty-transport-4.1.68.Final.jar + ext/netty-transport-classes-epoll-4.1.116.Final.jar + release/modules/ext/netty-transport-classes-epoll-4.1.116.Final.jar - ext/netty-transport-native-epoll-4.1.68.Final.jar - release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar + ext/netty-transport-native-epoll-4.1.116.Final.jar + release/modules/ext/netty-transport-native-epoll-4.1.116.Final.jar - ext/netty-transport-native-unix-common-4.1.68.Final.jar - release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar + ext/netty-transport-native-unix-common-4.1.99.Final.jar + release/modules/ext/netty-transport-native-unix-common-4.1.99.Final.jar ext/slf4j-api-1.7.36.jar release/modules/ext/slf4j-api-1.7.36.jar - ext/snappy-java-1.1.7.6.jar - release/modules/ext/snappy-java-1.1.7.6.jar + ext/snappy-java-1.1.10.7.jar + release/modules/ext/snappy-java-1.1.10.7.jar - ext/solr-solrj-8.11.2.jar - release/modules/ext/solr-solrj-8.11.2.jar + ext/solr-solrj-8.11.4.jar + release/modules/ext/solr-solrj-8.11.4.jar ext/stax2-api-4.2.1.jar release/modules/ext/stax2-api-4.2.1.jar - ext/woodstox-core-6.2.4.jar - release/modules/ext/woodstox-core-6.2.4.jar + ext/woodstox-core-6.5.1.jar + release/modules/ext/woodstox-core-6.5.1.jar - ext/zookeeper-3.8.0.jar - release/modules/ext/zookeeper-3.8.0.jar + ext/zookeeper-3.9.3.jar + release/modules/ext/zookeeper-3.9.3.jar - ext/zookeeper-jute-3.8.0.jar - release/modules/ext/zookeeper-jute-3.8.0.jar + ext/zookeeper-jute-3.9.3.jar + release/modules/ext/zookeeper-jute-3.9.3.jar diff --git a/KeywordSearch/solr/server/etc/security.policy b/KeywordSearch/solr/server/etc/security.policy index 7716da090a..e10da56348 100755 --- a/KeywordSearch/solr/server/etc/security.policy +++ b/KeywordSearch/solr/server/etc/security.policy @@ -146,7 +146,7 @@ grant { permission java.security.SecurityPermission "putProviderProperty.SaslPlainServer"; permission java.security.SecurityPermission "insertProvider"; - permission javax.xml.bind.JAXBPermission "setDatatypeConverter"; + permission jakarta.xml.bind.JAXBPermission "setDatatypeConverter"; // SSL related properties for Solr tests permission javax.net.ssl.SSLPermission "setDefaultSSLContext"; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java index b918a81054..158dd48453 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java @@ -395,7 +395,6 @@ public class Server { CloudSolrClient client = new CloudSolrClient.Builder(solrUrls) .withConnectionTimeout(connectionTimeoutMs) .withSocketTimeout(connectionTimeoutMs) - .withResponseParser(new XMLResponseParser()) .build(); if (!defaultCollectionName.isEmpty()) { client.setDefaultCollection(defaultCollectionName); diff --git a/Tika/ivy.xml b/Tika/ivy.xml index 62b93e7cae..e489429b6f 100755 --- a/Tika/ivy.xml +++ b/Tika/ivy.xml @@ -4,21 +4,27 @@ - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/Tika/ivysettings.xml b/Tika/ivysettings.xml index fd792f6844..fc14bbafde 100755 --- a/Tika/ivysettings.xml +++ b/Tika/ivysettings.xml @@ -1,5 +1,9 @@ + + + + diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index e3794f4203..48b03ab6a8 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -1,120 +1,122 @@ -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.SparseBitSet-1.3.jar=release/modules/ext/SparseBitSet-1.3.jar +file.reference.angus-activation-2.0.2.jar=release/modules/ext/angus-activation-2.0.2.jar +file.reference.apache-mime4j-core-0.8.11.jar=release/modules/ext/apache-mime4j-core-0.8.11.jar +file.reference.apache-mime4j-dom-0.8.11.jar=release/modules/ext/apache-mime4j-dom-0.8.11.jar +file.reference.asm-9.7.1.jar=release/modules/ext/asm-9.7.1.jar +file.reference.bcjmail-jdk18on-1.78.1.jar=release/modules/ext/bcjmail-jdk18on-1.78.1.jar +file.reference.bcpkix-jdk18on-1.79.jar=release/modules/ext/bcpkix-jdk18on-1.79.jar +file.reference.bcprov-jdk18on-1.79.jar=release/modules/ext/bcprov-jdk18on-1.79.jar +file.reference.bcutil-jdk18on-1.78.1.jar=release/modules/ext/bcutil-jdk18on-1.78.1.jar file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar -file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar -file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar -file.reference.checker-qual-3.33.0.jar=release/modules/ext/checker-qual-3.33.0.jar -file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.jar +file.reference.commons-codec-1.17.1.jar=release/modules/ext/commons-codec-1.17.1.jar file.reference.commons-collections4-4.4.jar=release/modules/ext/commons-collections4-4.4.jar -file.reference.commons-compress-1.21.jar=release/modules/ext/commons-compress-1.21.jar -file.reference.commons-csv-1.9.0.jar=release/modules/ext/commons-csv-1.9.0.jar -file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar -file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar -file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar -file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar +file.reference.commons-compress-1.27.1.jar=release/modules/ext/commons-compress-1.27.1.jar +file.reference.commons-csv-1.12.0.jar=release/modules/ext/commons-csv-1.12.0.jar +file.reference.commons-exec-1.4.0.jar=release/modules/ext/commons-exec-1.4.0.jar +file.reference.commons-io-2.17.0.jar=release/modules/ext/commons-io-2.17.0.jar +file.reference.commons-lang3-3.17.0.jar=release/modules/ext/commons-lang3-3.17.0.jar +file.reference.commons-logging-1.3.4.jar=release/modules/ext/commons-logging-1.3.4.jar file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar -file.reference.curvesapi-1.06.jar=release/modules/ext/curvesapi-1.06.jar -file.reference.cxf-core-3.5.0.jar=release/modules/ext/cxf-core-3.5.0.jar -file.reference.cxf-rt-frontend-jaxrs-3.5.0.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.5.0.jar -file.reference.cxf-rt-rs-client-3.5.0.jar=release/modules/ext/cxf-rt-rs-client-3.5.0.jar -file.reference.cxf-rt-security-3.5.0.jar=release/modules/ext/cxf-rt-security-3.5.0.jar -file.reference.cxf-rt-transports-http-3.5.0.jar=release/modules/ext/cxf-rt-transports-http-3.5.0.jar -file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar +file.reference.curvesapi-1.08.jar=release/modules/ext/curvesapi-1.08.jar +file.reference.dd-plist-1.28.jar=release/modules/ext/dd-plist-1.28.jar file.reference.dec-0.1.2.jar=release/modules/ext/dec-0.1.2.jar -file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar -file.reference.error_prone_annotations-2.18.0.jar=release/modules/ext/error_prone_annotations-2.18.0.jar -file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar -file.reference.fontbox-2.0.25.jar=release/modules/ext/fontbox-2.0.25.jar -file.reference.geoapi-3.0.1.jar=release/modules/ext/geoapi-3.0.1.jar +file.reference.fontbox-3.0.3.jar=release/modules/ext/fontbox-3.0.3.jar +file.reference.geoapi-3.0.2.jar=release/modules/ext/geoapi-3.0.2.jar file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar -file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar -file.reference.guava-32.0.1-jre.jar=release/modules/ext/guava-32.0.1-jre.jar -file.reference.HikariCP-java7-2.4.13.jar=release/modules/ext/HikariCP-java7-2.4.13.jar -file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar -file.reference.httpcore-4.4.13.jar=release/modules/ext/httpcore-4.4.13.jar -file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar -file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar -file.reference.isoparser-1.9.41.7.jar=release/modules/ext/isoparser-1.9.41.7.jar -file.reference.istack-commons-runtime-3.0.12.jar=release/modules/ext/istack-commons-runtime-3.0.12.jar -file.reference.j2objc-annotations-2.8.jar=release/modules/ext/j2objc-annotations-2.8.jar -file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar -file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar -file.reference.jackson-annotations-2.15.2.jar=release/modules/ext/jackson-annotations-2.15.2.jar -file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar -file.reference.jackson-databind-2.15.2.jar=release/modules/ext/jackson-databind-2.15.2.jar +file.reference.httpclient-4.5.14.jar=release/modules/ext/httpclient-4.5.14.jar +file.reference.httpcore-4.4.16.jar=release/modules/ext/httpcore-4.4.16.jar +file.reference.httpmime-4.5.14.jar=release/modules/ext/httpmime-4.5.14.jar +file.reference.istack-commons-runtime-4.1.2.jar=release/modules/ext/istack-commons-runtime-4.1.2.jar +file.reference.jackcess-4.0.7.jar=release/modules/ext/jackcess-4.0.7.jar +file.reference.jackcess-encrypt-4.0.2.jar=release/modules/ext/jackcess-encrypt-4.0.2.jar +file.reference.jackson-annotations-2.18.0.jar=release/modules/ext/jackson-annotations-2.18.0.jar +file.reference.jackson-core-2.18.0.jar=release/modules/ext/jackson-core-2.18.0.jar +file.reference.jackson-databind-2.18.0.jar=release/modules/ext/jackson-databind-2.18.0.jar file.reference.jai-imageio-core-1.4.0.jar=release/modules/ext/jai-imageio-core-1.4.0.jar -file.reference.jakarta.activation-1.2.2.jar=release/modules/ext/jakarta.activation-1.2.2.jar -file.reference.jakarta.activation-api-1.2.2.jar=release/modules/ext/jakarta.activation-api-1.2.2.jar -file.reference.jakarta.annotation-api-1.3.5.jar=release/modules/ext/jakarta.annotation-api-1.3.5.jar -file.reference.jakarta.ws.rs-api-2.1.6.jar=release/modules/ext/jakarta.ws.rs-api-2.1.6.jar -file.reference.jakarta.xml.bind-api-2.3.3.jar=release/modules/ext/jakarta.xml.bind-api-2.3.3.jar +file.reference.jakarta.activation-api-2.1.3.jar=release/modules/ext/jakarta.activation-api-2.1.3.jar +file.reference.jakarta.ws.rs-api-3.1.0.jar=release/modules/ext/jakarta.ws.rs-api-3.1.0.jar +file.reference.jakarta.xml.bind-api-4.0.2.jar=release/modules/ext/jakarta.xml.bind-api-4.0.2.jar file.reference.java-libpst-0.9.3.jar=release/modules/ext/java-libpst-0.9.3.jar -file.reference.jaxb-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.jaxb-core-4.0.5.jar=release/modules/ext/jaxb-core-4.0.5.jar +file.reference.jaxb-runtime-4.0.5.jar=release/modules/ext/jaxb-runtime-4.0.5.jar +file.reference.jbig2-imageio-3.0.4.jar=release/modules/ext/jbig2-imageio-3.0.4.jar file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar -file.reference.jcl-over-slf4j-1.7.36.jar=release/modules/ext/jcl-over-slf4j-1.7.36.jar -file.reference.jcommander-1.82.jar=release/modules/ext/jcommander-1.82.jar +file.reference.jcl-over-slf4j-2.0.16.jar=release/modules/ext/jcl-over-slf4j-2.0.16.jar file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar -file.reference.jempbox-1.8.16.jar=release/modules/ext/jempbox-1.8.16.jar -file.reference.jhighlight-1.0.3.jar=release/modules/ext/jhighlight-1.0.3.jar +file.reference.jempbox-1.8.17.jar=release/modules/ext/jempbox-1.8.17.jar +file.reference.jhighlight-1.1.0.jar=release/modules/ext/jhighlight-1.1.0.jar +file.reference.jj2000-5.2.jar=release/modules/ext/jj2000-5.2.jar file.reference.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar -file.reference.jna-5.16.0.jar=release/modules/ext/jna-5.16.0.jar -file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar +file.reference.jna-5.15.0.jar=release/modules/ext/jna-5.15.0.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar -file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar -file.reference.jul-to-slf4j-1.7.36.jar=release/modules/ext/jul-to-slf4j-1.7.36.jar -file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar -file.reference.junrar-7.4.1.jar=release/modules/ext/junrar-7.4.1.jar -file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar -file.reference.mchange-commons-java-0.2.19.jar=release/modules/ext/mchange-commons-java-0.2.19.jar -file.reference.metadata-extractor-2.15.0.1.jar=release/modules/ext/metadata-extractor-2.15.0.1.jar +file.reference.jsoup-1.18.1.jar=release/modules/ext/jsoup-1.18.1.jar +file.reference.juniversalchardet-2.5.0.jar=release/modules/ext/juniversalchardet-2.5.0.jar +file.reference.junrar-7.5.5.jar=release/modules/ext/junrar-7.5.5.jar +file.reference.jwarc-0.30.0.jar=release/modules/ext/jwarc-0.30.0.jar +file.reference.log4j-api-2.24.3.jar=release/modules/ext/log4j-api-2.24.3.jar +file.reference.metadata-extractor-2.19.0.jar=release/modules/ext/metadata-extractor-2.19.0.jar file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar -file.reference.openjson-1.0.12.jar=release/modules/ext/openjson-1.0.12.jar -file.reference.opennlp-tools-1.9.4.jar=release/modules/ext/opennlp-tools-1.9.4.jar +file.reference.openjson-1.0.13.jar=release/modules/ext/openjson-1.0.13.jar file.reference.parso-2.0.14.jar=release/modules/ext/parso-2.0.14.jar -file.reference.pdfbox-2.0.25.jar=release/modules/ext/pdfbox-2.0.25.jar -file.reference.pdfbox-tools-2.0.25.jar=release/modules/ext/pdfbox-tools-2.0.25.jar -file.reference.poi-4.1.2.jar=release/modules/ext/poi-4.1.2.jar -file.reference.poi-ooxml-4.1.2.jar=release/modules/ext/poi-ooxml-4.1.2.jar -file.reference.poi-ooxml-schemas-4.1.2.jar=release/modules/ext/poi-ooxml-schemas-4.1.2.jar -file.reference.poi-scratchpad-4.1.2.jar=release/modules/ext/poi-scratchpad-4.1.2.jar -file.reference.preflight-2.0.25.jar=release/modules/ext/preflight-2.0.25.jar -file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar -file.reference.quartz-2.3.2.jar=release/modules/ext/quartz-2.3.2.jar -file.reference.rome-1.18.0.jar=release/modules/ext/rome-1.18.0.jar -file.reference.rome-utils-1.18.0.jar=release/modules/ext/rome-utils-1.18.0.jar -file.reference.sentiment-analysis-parser-0.1.jar=release/modules/ext/sentiment-analysis-parser-0.1.jar -file.reference.sis-feature-1.1.jar=release/modules/ext/sis-feature-1.1.jar -file.reference.sis-metadata-1.1.jar=release/modules/ext/sis-metadata-1.1.jar -file.reference.sis-netcdf-1.1.jar=release/modules/ext/sis-netcdf-1.1.jar -file.reference.sis-referencing-1.1.jar=release/modules/ext/sis-referencing-1.1.jar -file.reference.sis-storage-1.1.jar=release/modules/ext/sis-storage-1.1.jar -file.reference.sis-utility-1.1.jar=release/modules/ext/sis-utility-1.1.jar -file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar -file.reference.SparseBitSet-1.2.jar=release/modules/ext/SparseBitSet-1.2.jar -file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar +file.reference.pdfbox-3.0.3.jar=release/modules/ext/pdfbox-3.0.3.jar +file.reference.pdfbox-io-3.0.3.jar=release/modules/ext/pdfbox-io-3.0.3.jar +file.reference.pdfbox-tools-3.0.3.jar=release/modules/ext/pdfbox-tools-3.0.3.jar +file.reference.picocli-4.7.6.jar=release/modules/ext/picocli-4.7.6.jar +file.reference.poi-5.3.0.jar=release/modules/ext/poi-5.3.0.jar +file.reference.poi-ooxml-5.3.0.jar=release/modules/ext/poi-ooxml-5.3.0.jar +file.reference.poi-ooxml-lite-5.3.0.jar=release/modules/ext/poi-ooxml-lite-5.3.0.jar +file.reference.poi-scratchpad-5.3.0.jar=release/modules/ext/poi-scratchpad-5.3.0.jar +file.reference.protobuf-java-3.25.5.jar=release/modules/ext/protobuf-java-3.25.5.jar +file.reference.rome-2.1.0.jar=release/modules/ext/rome-2.1.0.jar +file.reference.rome-utils-2.1.0.jar=release/modules/ext/rome-utils-2.1.0.jar +file.reference.sis-feature-1.4.jar=release/modules/ext/sis-feature-1.4.jar +file.reference.sis-metadata-1.4.jar=release/modules/ext/sis-metadata-1.4.jar +file.reference.sis-netcdf-1.4.jar=release/modules/ext/sis-netcdf-1.4.jar +file.reference.sis-referencing-1.4.jar=release/modules/ext/sis-referencing-1.4.jar +file.reference.sis-storage-1.4.jar=release/modules/ext/sis-storage-1.4.jar +file.reference.sis-utility-1.4.jar=release/modules/ext/sis-utility-1.4.jar +file.reference.slf4j-api-2.0.16.jar=release/modules/ext/slf4j-api-2.0.16.jar +file.reference.sqlite-jdbc-3.46.1.3.jar=release/modules/ext/sqlite-jdbc-3.46.1.3.jar file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar -file.reference.tika-core-1.28.1.jar=release/modules/ext/tika-core-1.28.1.jar -file.reference.tika-parsers-1.28.1.jar=release/modules/ext/tika-parsers-1.28.1.jar -file.reference.txw2-2.3.5.jar=release/modules/ext/txw2-2.3.5.jar -file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar -file.reference.unit-api-1.0.jar=release/modules/ext/unit-api-1.0.jar +file.reference.tika-core-3.0.0.jar=release/modules/ext/tika-core-3.0.0.jar +file.reference.tika-parser-advancedmedia-module-3.0.0.jar=release/modules/ext/tika-parser-advancedmedia-module-3.0.0.jar +file.reference.tika-parser-advancedmedia-package-3.0.0.jar=release/modules/ext/tika-parser-advancedmedia-package-3.0.0.jar +file.reference.tika-parser-apple-module-3.0.0.jar=release/modules/ext/tika-parser-apple-module-3.0.0.jar +file.reference.tika-parser-audiovideo-module-3.0.0.jar=release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar +file.reference.tika-parser-cad-module-3.0.0.jar=release/modules/ext/tika-parser-cad-module-3.0.0.jar +file.reference.tika-parser-code-module-3.0.0.jar=release/modules/ext/tika-parser-code-module-3.0.0.jar +file.reference.tika-parser-crypto-module-3.0.0.jar=release/modules/ext/tika-parser-crypto-module-3.0.0.jar +file.reference.tika-parser-digest-commons-3.0.0.jar=release/modules/ext/tika-parser-digest-commons-3.0.0.jar +file.reference.tika-parser-font-module-3.0.0.jar=release/modules/ext/tika-parser-font-module-3.0.0.jar +file.reference.tika-parser-html-module-3.0.0.jar=release/modules/ext/tika-parser-html-module-3.0.0.jar +file.reference.tika-parser-image-module-3.0.0.jar=release/modules/ext/tika-parser-image-module-3.0.0.jar +file.reference.tika-parser-jdbc-commons-3.0.0.jar=release/modules/ext/tika-parser-jdbc-commons-3.0.0.jar +file.reference.tika-parser-mail-commons-3.0.0.jar=release/modules/ext/tika-parser-mail-commons-3.0.0.jar +file.reference.tika-parser-mail-module-3.0.0.jar=release/modules/ext/tika-parser-mail-module-3.0.0.jar +file.reference.tika-parser-microsoft-module-3.0.0.jar=release/modules/ext/tika-parser-microsoft-module-3.0.0.jar +file.reference.tika-parser-miscoffice-module-3.0.0.jar=release/modules/ext/tika-parser-miscoffice-module-3.0.0.jar +file.reference.tika-parser-news-module-3.0.0.jar=release/modules/ext/tika-parser-news-module-3.0.0.jar +file.reference.tika-parser-ocr-module-3.0.0.jar=release/modules/ext/tika-parser-ocr-module-3.0.0.jar +file.reference.tika-parser-pdf-module-3.0.0.jar=release/modules/ext/tika-parser-pdf-module-3.0.0.jar +file.reference.tika-parser-pkg-module-3.0.0.jar=release/modules/ext/tika-parser-pkg-module-3.0.0.jar +file.reference.tika-parser-scientific-module-3.0.0.jar=release/modules/ext/tika-parser-scientific-module-3.0.0.jar +file.reference.tika-parser-scientific-package-3.0.0.jar=release/modules/ext/tika-parser-scientific-package-3.0.0.jar +file.reference.tika-parser-sqlite3-module-3.0.0.jar=release/modules/ext/tika-parser-sqlite3-module-3.0.0.jar +file.reference.tika-parser-sqlite3-package-3.0.0.jar=release/modules/ext/tika-parser-sqlite3-package-3.0.0.jar +file.reference.tika-parser-text-module-3.0.0.jar=release/modules/ext/tika-parser-text-module-3.0.0.jar +file.reference.tika-parser-webarchive-module-3.0.0.jar=release/modules/ext/tika-parser-webarchive-module-3.0.0.jar +file.reference.tika-parser-xml-module-3.0.0.jar=release/modules/ext/tika-parser-xml-module-3.0.0.jar +file.reference.tika-parser-xmp-commons-3.0.0.jar=release/modules/ext/tika-parser-xmp-commons-3.0.0.jar +file.reference.tika-parser-zip-commons-3.0.0.jar=release/modules/ext/tika-parser-zip-commons-3.0.0.jar +file.reference.tika-parsers-standard-package-3.0.0.jar=release/modules/ext/tika-parsers-standard-package-3.0.0.jar +file.reference.txw2-4.0.5.jar=release/modules/ext/txw2-4.0.5.jar +file.reference.unit-api-2.2.jar=release/modules/ext/unit-api-2.2.jar file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar -file.reference.woodstox-core-6.2.8.jar=release/modules/ext/woodstox-core-6.2.8.jar -file.reference.xercesImpl-2.12.2.jar=release/modules/ext/xercesImpl-2.12.2.jar -file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar -file.reference.xmlbeans-3.1.0.jar=release/modules/ext/xmlbeans-3.1.0.jar -file.reference.xmlschema-core-2.3.0.jar=release/modules/ext/xmlschema-core-2.3.0.jar -file.reference.xmpbox-2.0.25.jar=release/modules/ext/xmpbox-2.0.25.jar -file.reference.xmpcore-shaded-6.1.11.jar=release/modules/ext/xmpcore-shaded-6.1.11.jar -file.reference.xz-1.9.jar=release/modules/ext/xz-1.9.jar +file.reference.xmlbeans-5.2.1.jar=release/modules/ext/xmlbeans-5.2.1.jar +file.reference.xmpbox-3.0.3.jar=release/modules/ext/xmpbox-3.0.3.jar +file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar +file.reference.xz-1.10.jar=release/modules/ext/xz-1.10.jar +javac.compilerargs=-Xlint -Xlint\:-serial javac.source=17 -javac.compilerargs=-Xlint -Xlint:-serial diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml index a653584351..2403fa7ea0 100755 --- a/Tika/nbproject/project.xml +++ b/Tika/nbproject/project.xml @@ -356,308 +356,228 @@ schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443 - ext/apache-mime4j-core-0.8.4.jar - release/modules/ext/apache-mime4j-core-0.8.4.jar + ext/angus-activation-2.0.2.jar + release/modules/ext/angus-activation-2.0.2.jar - ext/apache-mime4j-dom-0.8.4.jar - release/modules/ext/apache-mime4j-dom-0.8.4.jar + ext/apache-mime4j-core-0.8.11.jar + release/modules/ext/apache-mime4j-core-0.8.11.jar - ext/asm-9.2.jar - release/modules/ext/asm-9.2.jar + ext/apache-mime4j-dom-0.8.11.jar + release/modules/ext/apache-mime4j-dom-0.8.11.jar - ext/bcmail-jdk15on-1.70.jar - release/modules/ext/bcmail-jdk15on-1.70.jar + ext/asm-9.7.1.jar + release/modules/ext/asm-9.7.1.jar - ext/bcpkix-jdk15on-1.70.jar - release/modules/ext/bcpkix-jdk15on-1.70.jar + ext/bcjmail-jdk18on-1.78.1.jar + release/modules/ext/bcjmail-jdk18on-1.78.1.jar - ext/bcprov-jdk15on-1.70.jar - release/modules/ext/bcprov-jdk15on-1.70.jar + ext/bcpkix-jdk18on-1.79.jar + release/modules/ext/bcpkix-jdk18on-1.79.jar - ext/bcutil-jdk15on-1.70.jar - release/modules/ext/bcutil-jdk15on-1.70.jar + ext/bcprov-jdk18on-1.79.jar + release/modules/ext/bcprov-jdk18on-1.79.jar - ext/boilerpipe-1.1.0.jar - release/modules/ext/boilerpipe-1.1.0.jar + ext/bcutil-jdk18on-1.78.1.jar + release/modules/ext/bcutil-jdk18on-1.78.1.jar ext/bzip2-0.9.1.jar release/modules/ext/bzip2-0.9.1.jar - ext/c3p0-0.9.5.5.jar - release/modules/ext/c3p0-0.9.5.5.jar - - - ext/cdm-4.5.5.jar - release/modules/ext/cdm-4.5.5.jar - - - ext/checker-qual-3.33.0.jar - release/modules/ext/checker-qual-3.33.0.jar - - - ext/commons-codec-1.15.jar - release/modules/ext/commons-codec-1.15.jar + ext/commons-codec-1.17.1.jar + release/modules/ext/commons-codec-1.17.1.jar ext/commons-collections4-4.4.jar release/modules/ext/commons-collections4-4.4.jar - ext/commons-compress-1.21.jar - release/modules/ext/commons-compress-1.21.jar + ext/commons-compress-1.27.1.jar + release/modules/ext/commons-compress-1.27.1.jar - ext/commons-csv-1.9.0.jar - release/modules/ext/commons-csv-1.9.0.jar + ext/commons-csv-1.12.0.jar + release/modules/ext/commons-csv-1.12.0.jar - ext/commons-exec-1.3.jar - release/modules/ext/commons-exec-1.3.jar + ext/commons-exec-1.4.0.jar + release/modules/ext/commons-exec-1.4.0.jar - ext/commons-io-2.11.0.jar - release/modules/ext/commons-io-2.11.0.jar + ext/commons-io-2.17.0.jar + release/modules/ext/commons-io-2.17.0.jar - ext/commons-lang3-3.12.0.jar - release/modules/ext/commons-lang3-3.12.0.jar + ext/commons-lang3-3.17.0.jar + release/modules/ext/commons-lang3-3.17.0.jar - ext/commons-logging-1.2.jar - release/modules/ext/commons-logging-1.2.jar + ext/commons-logging-1.3.4.jar + release/modules/ext/commons-logging-1.3.4.jar ext/commons-math3-3.6.1.jar release/modules/ext/commons-math3-3.6.1.jar - ext/curvesapi-1.06.jar - release/modules/ext/curvesapi-1.06.jar + ext/curvesapi-1.08.jar + release/modules/ext/curvesapi-1.08.jar - ext/cxf-core-3.5.0.jar - release/modules/ext/cxf-core-3.5.0.jar - - - ext/cxf-rt-frontend-jaxrs-3.5.0.jar - release/modules/ext/cxf-rt-frontend-jaxrs-3.5.0.jar - - - ext/cxf-rt-rs-client-3.5.0.jar - release/modules/ext/cxf-rt-rs-client-3.5.0.jar - - - ext/cxf-rt-security-3.5.0.jar - release/modules/ext/cxf-rt-security-3.5.0.jar - - - ext/cxf-rt-transports-http-3.5.0.jar - release/modules/ext/cxf-rt-transports-http-3.5.0.jar - - - ext/dd-plist-1.23.jar - release/modules/ext/dd-plist-1.23.jar + ext/dd-plist-1.28.jar + release/modules/ext/dd-plist-1.28.jar ext/dec-0.1.2.jar release/modules/ext/dec-0.1.2.jar - ext/ehcache-core-2.6.2.jar - release/modules/ext/ehcache-core-2.6.2.jar + ext/fontbox-3.0.3.jar + release/modules/ext/fontbox-3.0.3.jar - ext/error_prone_annotations-2.18.0.jar - release/modules/ext/error_prone_annotations-2.18.0.jar - - - ext/failureaccess-1.0.1.jar - release/modules/ext/failureaccess-1.0.1.jar - - - ext/fontbox-2.0.25.jar - release/modules/ext/fontbox-2.0.25.jar - - - ext/geoapi-3.0.1.jar - release/modules/ext/geoapi-3.0.1.jar + ext/geoapi-3.0.2.jar + release/modules/ext/geoapi-3.0.2.jar ext/grib-4.5.5.jar release/modules/ext/grib-4.5.5.jar - ext/gson-2.9.0.jar - release/modules/ext/gson-2.9.0.jar + ext/httpclient-4.5.14.jar + release/modules/ext/httpclient-4.5.14.jar - ext/guava-32.0.1-jre.jar - release/modules/ext/guava-32.0.1-jre.jar + ext/httpcore-4.4.16.jar + release/modules/ext/httpcore-4.4.16.jar - ext/HikariCP-java7-2.4.13.jar - release/modules/ext/HikariCP-java7-2.4.13.jar + ext/httpmime-4.5.14.jar + release/modules/ext/httpmime-4.5.14.jar - ext/httpclient-4.5.13.jar - release/modules/ext/httpclient-4.5.13.jar + ext/istack-commons-runtime-4.1.2.jar + release/modules/ext/istack-commons-runtime-4.1.2.jar - ext/httpcore-4.4.13.jar - release/modules/ext/httpcore-4.4.13.jar + ext/jackcess-4.0.7.jar + release/modules/ext/jackcess-4.0.7.jar - ext/httpmime-4.5.13.jar - release/modules/ext/httpmime-4.5.13.jar + ext/jackcess-encrypt-4.0.2.jar + release/modules/ext/jackcess-encrypt-4.0.2.jar - ext/httpservices-4.5.5.jar - release/modules/ext/httpservices-4.5.5.jar + ext/jackson-annotations-2.18.0.jar + release/modules/ext/jackson-annotations-2.18.0.jar - ext/isoparser-1.9.41.7.jar - release/modules/ext/isoparser-1.9.41.7.jar + ext/jackson-core-2.18.0.jar + release/modules/ext/jackson-core-2.18.0.jar - ext/istack-commons-runtime-3.0.12.jar - release/modules/ext/istack-commons-runtime-3.0.12.jar - - - ext/j2objc-annotations-2.8.jar - release/modules/ext/j2objc-annotations-2.8.jar - - - ext/jackcess-4.0.1.jar - release/modules/ext/jackcess-4.0.1.jar - - - ext/jackcess-encrypt-4.0.1.jar - release/modules/ext/jackcess-encrypt-4.0.1.jar - - - ext/jackson-annotations-2.15.2.jar - release/modules/ext/jackson-annotations-2.15.2.jar - - - ext/jackson-core-2.15.2.jar - release/modules/ext/jackson-core-2.15.2.jar - - - ext/jackson-databind-2.15.2.jar - release/modules/ext/jackson-databind-2.15.2.jar + ext/jackson-databind-2.18.0.jar + release/modules/ext/jackson-databind-2.18.0.jar ext/jai-imageio-core-1.4.0.jar release/modules/ext/jai-imageio-core-1.4.0.jar - ext/jakarta.activation-1.2.2.jar - release/modules/ext/jakarta.activation-1.2.2.jar + ext/jakarta.activation-api-2.1.3.jar + release/modules/ext/jakarta.activation-api-2.1.3.jar - ext/jakarta.activation-api-1.2.2.jar - release/modules/ext/jakarta.activation-api-1.2.2.jar + ext/jakarta.ws.rs-api-3.1.0.jar + release/modules/ext/jakarta.ws.rs-api-3.1.0.jar - ext/jakarta.annotation-api-1.3.5.jar - release/modules/ext/jakarta.annotation-api-1.3.5.jar - - - ext/jakarta.ws.rs-api-2.1.6.jar - release/modules/ext/jakarta.ws.rs-api-2.1.6.jar - - - ext/jakarta.xml.bind-api-2.3.3.jar - release/modules/ext/jakarta.xml.bind-api-2.3.3.jar + ext/jakarta.xml.bind-api-4.0.2.jar + release/modules/ext/jakarta.xml.bind-api-4.0.2.jar ext/java-libpst-0.9.3.jar release/modules/ext/java-libpst-0.9.3.jar - ext/jaxb-runtime-2.3.5.jar - release/modules/ext/jaxb-runtime-2.3.5.jar + ext/jaxb-core-4.0.5.jar + release/modules/ext/jaxb-core-4.0.5.jar - ext/jbig2-imageio-3.0.3.jar - release/modules/ext/jbig2-imageio-3.0.3.jar + ext/jaxb-runtime-4.0.5.jar + release/modules/ext/jaxb-runtime-4.0.5.jar + + + ext/jbig2-imageio-3.0.4.jar + release/modules/ext/jbig2-imageio-3.0.4.jar ext/jcip-annotations-1.0.jar release/modules/ext/jcip-annotations-1.0.jar - ext/jcl-over-slf4j-1.7.36.jar - release/modules/ext/jcl-over-slf4j-1.7.36.jar - - - ext/jcommander-1.82.jar - release/modules/ext/jcommander-1.82.jar + ext/jcl-over-slf4j-2.0.16.jar + release/modules/ext/jcl-over-slf4j-2.0.16.jar ext/jdom2-2.0.6.1.jar release/modules/ext/jdom2-2.0.6.1.jar - ext/jempbox-1.8.16.jar - release/modules/ext/jempbox-1.8.16.jar + ext/jempbox-1.8.17.jar + release/modules/ext/jempbox-1.8.17.jar - ext/jhighlight-1.0.3.jar - release/modules/ext/jhighlight-1.0.3.jar + ext/jhighlight-1.1.0.jar + release/modules/ext/jhighlight-1.1.0.jar + + + ext/jj2000-5.2.jar + release/modules/ext/jj2000-5.2.jar ext/jmatio-1.5.jar release/modules/ext/jmatio-1.5.jar - ext/jna-5.16.0.jar - release/modules/ext/jna-5.16.0.jar - - - ext/joda-time-2.2.jar - release/modules/ext/joda-time-2.2.jar + ext/jna-5.15.0.jar + release/modules/ext/jna-5.15.0.jar ext/json-simple-1.1.1.jar release/modules/ext/json-simple-1.1.1.jar - ext/jsr305-3.0.2.jar - release/modules/ext/jsr305-3.0.2.jar + ext/jsoup-1.18.1.jar + release/modules/ext/jsoup-1.18.1.jar - ext/jul-to-slf4j-1.7.36.jar - release/modules/ext/jul-to-slf4j-1.7.36.jar + ext/juniversalchardet-2.5.0.jar + release/modules/ext/juniversalchardet-2.5.0.jar - ext/juniversalchardet-1.0.3.jar - release/modules/ext/juniversalchardet-1.0.3.jar + ext/junrar-7.5.5.jar + release/modules/ext/junrar-7.5.5.jar - ext/junrar-7.4.1.jar - release/modules/ext/junrar-7.4.1.jar + ext/jwarc-0.30.0.jar + release/modules/ext/jwarc-0.30.0.jar - ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + ext/log4j-api-2.24.3.jar + release/modules/ext/log4j-api-2.24.3.jar - ext/mchange-commons-java-0.2.19.jar - release/modules/ext/mchange-commons-java-0.2.19.jar - - - ext/metadata-extractor-2.15.0.1.jar - release/modules/ext/metadata-extractor-2.15.0.1.jar + ext/metadata-extractor-2.19.0.jar + release/modules/ext/metadata-extractor-2.19.0.jar ext/netcdf4-4.5.5.jar @@ -668,124 +588,228 @@ release/modules/ext/ooxml-schemas-1.4.jar - ext/openjson-1.0.12.jar - release/modules/ext/openjson-1.0.12.jar - - - ext/opennlp-tools-1.9.4.jar - release/modules/ext/opennlp-tools-1.9.4.jar + ext/openjson-1.0.13.jar + release/modules/ext/openjson-1.0.13.jar ext/parso-2.0.14.jar release/modules/ext/parso-2.0.14.jar - ext/pdfbox-2.0.25.jar - release/modules/ext/pdfbox-2.0.25.jar + ext/pdfbox-3.0.3.jar + release/modules/ext/pdfbox-3.0.3.jar - ext/pdfbox-tools-2.0.25.jar - release/modules/ext/pdfbox-tools-2.0.25.jar + ext/pdfbox-io-3.0.3.jar + release/modules/ext/pdfbox-io-3.0.3.jar - ext/poi-4.1.2.jar - release/modules/ext/poi-4.1.2.jar + ext/pdfbox-tools-3.0.3.jar + release/modules/ext/pdfbox-tools-3.0.3.jar - ext/poi-ooxml-4.1.2.jar - release/modules/ext/poi-ooxml-4.1.2.jar + ext/picocli-4.7.6.jar + release/modules/ext/picocli-4.7.6.jar - ext/poi-ooxml-schemas-4.1.2.jar - release/modules/ext/poi-ooxml-schemas-4.1.2.jar + ext/poi-5.3.0.jar + release/modules/ext/poi-5.3.0.jar - ext/poi-scratchpad-4.1.2.jar - release/modules/ext/poi-scratchpad-4.1.2.jar + ext/poi-ooxml-5.3.0.jar + release/modules/ext/poi-ooxml-5.3.0.jar - ext/preflight-2.0.25.jar - release/modules/ext/preflight-2.0.25.jar + ext/poi-ooxml-lite-5.3.0.jar + release/modules/ext/poi-ooxml-lite-5.3.0.jar - ext/protobuf-java-3.19.4.jar - release/modules/ext/protobuf-java-3.19.4.jar + ext/poi-scratchpad-5.3.0.jar + release/modules/ext/poi-scratchpad-5.3.0.jar - ext/quartz-2.3.2.jar - release/modules/ext/quartz-2.3.2.jar + ext/protobuf-java-3.25.5.jar + release/modules/ext/protobuf-java-3.25.5.jar - ext/rome-1.18.0.jar - release/modules/ext/rome-1.18.0.jar + ext/rome-2.1.0.jar + release/modules/ext/rome-2.1.0.jar - ext/rome-utils-1.18.0.jar - release/modules/ext/rome-utils-1.18.0.jar + ext/rome-utils-2.1.0.jar + release/modules/ext/rome-utils-2.1.0.jar - ext/sentiment-analysis-parser-0.1.jar - release/modules/ext/sentiment-analysis-parser-0.1.jar + ext/sis-feature-1.4.jar + release/modules/ext/sis-feature-1.4.jar - ext/sis-feature-1.1.jar - release/modules/ext/sis-feature-1.1.jar + ext/sis-metadata-1.4.jar + release/modules/ext/sis-metadata-1.4.jar - ext/sis-metadata-1.1.jar - release/modules/ext/sis-metadata-1.1.jar + ext/sis-netcdf-1.4.jar + release/modules/ext/sis-netcdf-1.4.jar - ext/sis-netcdf-1.1.jar - release/modules/ext/sis-netcdf-1.1.jar + ext/sis-referencing-1.4.jar + release/modules/ext/sis-referencing-1.4.jar - ext/sis-referencing-1.1.jar - release/modules/ext/sis-referencing-1.1.jar + ext/sis-storage-1.4.jar + release/modules/ext/sis-storage-1.4.jar - ext/sis-storage-1.1.jar - release/modules/ext/sis-storage-1.1.jar + ext/sis-utility-1.4.jar + release/modules/ext/sis-utility-1.4.jar - ext/sis-utility-1.1.jar - release/modules/ext/sis-utility-1.1.jar + ext/slf4j-api-2.0.16.jar + release/modules/ext/slf4j-api-2.0.16.jar - ext/slf4j-api-1.7.36.jar - release/modules/ext/slf4j-api-1.7.36.jar + ext/SparseBitSet-1.3.jar + release/modules/ext/SparseBitSet-1.3.jar - ext/SparseBitSet-1.2.jar - release/modules/ext/SparseBitSet-1.2.jar - - - ext/stax2-api-4.2.1.jar - release/modules/ext/stax2-api-4.2.1.jar + ext/sqlite-jdbc-3.46.1.3.jar + release/modules/ext/sqlite-jdbc-3.46.1.3.jar ext/tagsoup-1.2.1.jar release/modules/ext/tagsoup-1.2.1.jar - ext/tika-core-1.28.1.jar - release/modules/ext/tika-core-1.28.1.jar + ext/tika-core-3.0.0.jar + release/modules/ext/tika-core-3.0.0.jar - ext/tika-parsers-1.28.1.jar - release/modules/ext/tika-parsers-1.28.1.jar + ext/tika-parser-advancedmedia-module-3.0.0.jar + release/modules/ext/tika-parser-advancedmedia-module-3.0.0.jar - ext/txw2-2.3.5.jar - release/modules/ext/txw2-2.3.5.jar + ext/tika-parser-advancedmedia-package-3.0.0.jar + release/modules/ext/tika-parser-advancedmedia-package-3.0.0.jar - ext/udunits-4.5.5.jar - release/modules/ext/udunits-4.5.5.jar + ext/tika-parser-apple-module-3.0.0.jar + release/modules/ext/tika-parser-apple-module-3.0.0.jar - ext/unit-api-1.0.jar - release/modules/ext/unit-api-1.0.jar + ext/tika-parser-audiovideo-module-3.0.0.jar + release/modules/ext/tika-parser-audiovideo-module-3.0.0.jar + + + ext/tika-parser-cad-module-3.0.0.jar + release/modules/ext/tika-parser-cad-module-3.0.0.jar + + + ext/tika-parser-code-module-3.0.0.jar + release/modules/ext/tika-parser-code-module-3.0.0.jar + + + ext/tika-parser-crypto-module-3.0.0.jar + release/modules/ext/tika-parser-crypto-module-3.0.0.jar + + + ext/tika-parser-digest-commons-3.0.0.jar + release/modules/ext/tika-parser-digest-commons-3.0.0.jar + + + ext/tika-parser-font-module-3.0.0.jar + release/modules/ext/tika-parser-font-module-3.0.0.jar + + + ext/tika-parser-html-module-3.0.0.jar + release/modules/ext/tika-parser-html-module-3.0.0.jar + + + ext/tika-parser-image-module-3.0.0.jar + release/modules/ext/tika-parser-image-module-3.0.0.jar + + + ext/tika-parser-jdbc-commons-3.0.0.jar + release/modules/ext/tika-parser-jdbc-commons-3.0.0.jar + + + ext/tika-parser-mail-commons-3.0.0.jar + release/modules/ext/tika-parser-mail-commons-3.0.0.jar + + + ext/tika-parser-mail-module-3.0.0.jar + release/modules/ext/tika-parser-mail-module-3.0.0.jar + + + ext/tika-parser-microsoft-module-3.0.0.jar + release/modules/ext/tika-parser-microsoft-module-3.0.0.jar + + + ext/tika-parser-miscoffice-module-3.0.0.jar + release/modules/ext/tika-parser-miscoffice-module-3.0.0.jar + + + ext/tika-parser-news-module-3.0.0.jar + release/modules/ext/tika-parser-news-module-3.0.0.jar + + + ext/tika-parser-ocr-module-3.0.0.jar + release/modules/ext/tika-parser-ocr-module-3.0.0.jar + + + ext/tika-parser-pdf-module-3.0.0.jar + release/modules/ext/tika-parser-pdf-module-3.0.0.jar + + + ext/tika-parser-pkg-module-3.0.0.jar + release/modules/ext/tika-parser-pkg-module-3.0.0.jar + + + ext/tika-parser-scientific-module-3.0.0.jar + release/modules/ext/tika-parser-scientific-module-3.0.0.jar + + + ext/tika-parser-scientific-package-3.0.0.jar + release/modules/ext/tika-parser-scientific-package-3.0.0.jar + + + ext/tika-parser-sqlite3-module-3.0.0.jar + release/modules/ext/tika-parser-sqlite3-module-3.0.0.jar + + + ext/tika-parser-sqlite3-package-3.0.0.jar + release/modules/ext/tika-parser-sqlite3-package-3.0.0.jar + + + ext/tika-parser-text-module-3.0.0.jar + release/modules/ext/tika-parser-text-module-3.0.0.jar + + + ext/tika-parser-webarchive-module-3.0.0.jar + release/modules/ext/tika-parser-webarchive-module-3.0.0.jar + + + ext/tika-parser-xml-module-3.0.0.jar + release/modules/ext/tika-parser-xml-module-3.0.0.jar + + + ext/tika-parser-xmp-commons-3.0.0.jar + release/modules/ext/tika-parser-xmp-commons-3.0.0.jar + + + ext/tika-parser-zip-commons-3.0.0.jar + release/modules/ext/tika-parser-zip-commons-3.0.0.jar + + + ext/tika-parsers-standard-package-3.0.0.jar + release/modules/ext/tika-parsers-standard-package-3.0.0.jar + + + ext/txw2-4.0.5.jar + release/modules/ext/txw2-4.0.5.jar + + + ext/unit-api-2.2.jar + release/modules/ext/unit-api-2.2.jar ext/vorbis-java-core-0.8.jar @@ -796,36 +820,20 @@ release/modules/ext/vorbis-java-tika-0.8.jar - ext/woodstox-core-6.2.8.jar - release/modules/ext/woodstox-core-6.2.8.jar + ext/xmlbeans-5.2.1.jar + release/modules/ext/xmlbeans-5.2.1.jar - ext/xercesImpl-2.12.2.jar - release/modules/ext/xercesImpl-2.12.2.jar + ext/xmpbox-3.0.3.jar + release/modules/ext/xmpbox-3.0.3.jar - ext/xml-apis-1.4.01.jar - release/modules/ext/xml-apis-1.4.01.jar + ext/xmpcore-6.1.11.jar + release/modules/ext/xmpcore-6.1.11.jar - ext/xmlbeans-3.1.0.jar - release/modules/ext/xmlbeans-3.1.0.jar - - - ext/xmlschema-core-2.3.0.jar - release/modules/ext/xmlschema-core-2.3.0.jar - - - ext/xmpbox-2.0.25.jar - release/modules/ext/xmpbox-2.0.25.jar - - - ext/xmpcore-shaded-6.1.11.jar - release/modules/ext/xmpcore-shaded-6.1.11.jar - - - ext/xz-1.9.jar - release/modules/ext/xz-1.9.jar + ext/xz-1.10.jar + release/modules/ext/xz-1.10.jar diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 4973262834..c5f050315a 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 20 Jul 2023 19:55:04 -0400 +#Fri, 03 Jan 2025 17:15:38 -0500 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=314 SPLASH_WIDTH=538 @@ -8,4 +8,4 @@ SplashRunningTextBounds=0,289,538,18 SplashRunningTextColor=0x0 SplashRunningTextFontSize=19 -currentVersion=Autopsy 4.20.0 +currentVersion=Autopsy 4.21.0 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index a6687c35a0..9f44e2301b 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,4 +1,4 @@ #Updated by build script -#Thu, 20 Jul 2023 19:55:04 -0400 -CTL_MainWindow_Title=Autopsy 4.20.0 -CTL_MainWindow_Title_No_Project=Autopsy 4.20.0 +#Fri, 03 Jan 2025 17:15:38 -0500 +CTL_MainWindow_Title=Autopsy 4.21.0 +CTL_MainWindow_Title_No_Project=Autopsy 4.21.0 diff --git a/dependency-check.xml b/dependency-check.xml new file mode 100644 index 0000000000..e9b9ba264f --- /dev/null +++ b/dependency-check.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/thunderbirdparser/ivy.xml b/thunderbirdparser/ivy.xml index df9efc8130..fce2d5e95e 100644 --- a/thunderbirdparser/ivy.xml +++ b/thunderbirdparser/ivy.xml @@ -7,9 +7,9 @@ - - - - + + + diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties index 8d13059ed6..66a9ccce1e 100644 --- a/thunderbirdparser/nbproject/project.properties +++ b/thunderbirdparser/nbproject/project.properties @@ -1,13 +1,13 @@ -file.reference.apache-mime4j-mbox-iterator-0.8.4.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar -file.reference.ez-vcard-0.11.3.jar=release/modules/ext/ez-vcard-0.11.3.jar -file.reference.freemarker-2.3.31.jar=release/modules/ext/freemarker-2.3.31.jar +file.reference.apache-mime4j-mbox-iterator-0.8.11.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.11.jar +file.reference.ez-vcard-0.12.1.jar=release/modules/ext/ez-vcard-0.12.1.jar +file.reference.freemarker-2.3.32.jar=release/modules/ext/freemarker-2.3.32.jar file.reference.jackson-core-2.15.2.jar=release/modules/ext/jackson-core-2.15.2.jar file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar file.reference.jsoup-1.16.1.jar=release/modules/ext/jsoup-1.16.1.jar file.reference.vinnie-2.0.2.jar=release/modules/ext/vinnie-2.0.2.jar +javac.compilerargs=-Xlint -Xlint\:-serial javac.source=17 -javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt -nbm.homepage=http://www.sleuthkit.org/autopsy/ +nbm.homepage=http\://www.sleuthkit.org/autopsy/ nbm.needs.restart=true spec.version.base=4.0 diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml index abcccdc19c..c9a66fe5db 100644 --- a/thunderbirdparser/nbproject/project.xml +++ b/thunderbirdparser/nbproject/project.xml @@ -78,16 +78,16 @@ - ext/apache-mime4j-mbox-iterator-0.8.4.jar - release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar + ext/apache-mime4j-mbox-iterator-0.8.11.jar + release/modules/ext/apache-mime4j-mbox-iterator-0.8.11.jar - ext/ez-vcard-0.11.3.jar - release/modules/ext/ez-vcard-0.11.3.jar + ext/ez-vcard-0.12.1.jar + release/modules/ext/ez-vcard-0.12.1.jar - ext/freemarker-2.3.31.jar - release/modules/ext/freemarker-2.3.31.jar + ext/freemarker-2.3.32.jar + release/modules/ext/freemarker-2.3.32.jar ext/jackson-core-2.15.2.jar