diff --git a/Core/build.xml b/Core/build.xml index cefad9f857..9d989820f5 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -104,9 +104,9 @@ - + - + @@ -138,10 +138,10 @@ tofile="${ext.dir}/sqlite-jdbc-3.25.2.jar"/> - - + + - - - diff --git a/Core/ivy.xml b/Core/ivy.xml index 5173860c32..3986db3d11 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -3,63 +3,82 @@ - - + - - - - + + + + - - + + - - + + - - - + - - - - - - - - - + + - - - - + - + - + - - - - + - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml index 9c3b496314..fd792f6844 100644 --- a/Core/ivysettings.xml +++ b/Core/ivysettings.xml @@ -6,4 +6,5 @@ + diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 5a98c05e19..8622056d37 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,130 +1,83 @@ -file.reference.activemq-all-5.11.1.jar=release\\modules\\ext\\activemq-all-5.11.1.jar -file.reference.animal-sniffer-annotations-1.17.jar=release\\modules\\ext\\animal-sniffer-annotations-1.17.jar -file.reference.api-common-1.7.0.jar=release\\modules\\ext\\api-common-1.7.0.jar -file.reference.batik-awt-util-1.6.jar=release\\modules\\ext\\batik-awt-util-1.6.jar -file.reference.batik-dom-1.6.jar=release\\modules\\ext\\batik-dom-1.6.jar -file.reference.batik-svg-dom-1.6.jar=release\\modules\\ext\\batik-svg-dom-1.6.jar -file.reference.batik-svggen-1.6.jar=release\\modules\\ext\\batik-svggen-1.6.jar -file.reference.batik-util-1.6.jar=release\\modules\\ext\\batik-util-1.6.jar -file.reference.batik-xml-1.6.jar=release\\modules\\ext\\batik-xml-1.6.jar -file.reference.bcpkix-jdk15on-1.54.jar=release\\modules\\ext\\bcpkix-jdk15on-1.54.jar -file.reference.bcprov-ext-jdk15on-1.54.jar=release\\modules\\ext\\bcprov-ext-jdk15on-1.54.jar -file.reference.bcprov-jdk15on-1.52.jar=release\\modules\\ext\\bcprov-jdk15on-1.52.jar -file.reference.bcprov-jdk15on-1.54.jar=release\\modules\\ext\\bcprov-jdk15on-1.54.jar -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.c3p0-0.9.5.jar=release\\modules\\ext\\c3p0-0.9.5.jar -file.reference.checker-compat-qual-2.5.3.jar=release\\modules\\ext\\checker-compat-qual-2.5.3.jar -file.reference.commons-beanutils-1.9.2.jar=release\\modules\\ext\\commons-beanutils-1.9.2.jar -file.reference.commons-codec-1.11.jar=release\\modules\\ext\\commons-codec-1.11.jar -file.reference.commons-collections-3.2.2.jar=release\\modules\\ext\\commons-collections-3.2.2.jar -file.reference.commons-dbcp2-2.1.1.jar=release\\modules\\ext\\commons-dbcp2-2.1.1.jar -file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar -file.reference.commons-lang-2.6.jar=release\\modules\\ext\\commons-lang-2.6.jar -file.reference.commons-lang3-3.5.jar=release\\modules\\ext\\commons-lang3-3.5.jar -file.reference.commons-logging-1.2.jar=release\\modules\\ext\\commons-logging-1.2.jar -file.reference.commons-pool2-2.4.2.jar=release\\modules\\ext\\commons-pool2-2.4.2.jar -file.reference.java-diff-utils-4.8.jar=release\\modules\\ext\\java-diff-utils-4.8.jar -file.reference.commons-validator-1.6.jar=release\\modules\\ext\\commons-validator-1.6.jar -file.reference.curator-client-2.8.0.jar=release\\modules\\ext\\curator-client-2.8.0.jar -file.reference.curator-framework-2.8.0.jar=release\\modules\\ext\\curator-framework-2.8.0.jar -file.reference.curator-recipes-2.8.0.jar=release\\modules\\ext\\curator-recipes-2.8.0.jar -file.reference.DatCon.jar=release\\modules\\ext\\DatCon.jar -file.reference.decodetect-core-0.3.jar=release\\modules\\ext\\decodetect-core-0.3.jar -file.reference.error_prone_annotations-2.3.2.jar=release\\modules\\ext\\error_prone_annotations-2.3.2.jar -file.reference.failureaccess-1.0.1.jar=release\\modules\\ext\\failureaccess-1.0.1.jar -file.reference.gax-1.44.0.jar=release\\modules\\ext\\gax-1.44.0.jar -file.reference.gax-grpc-1.44.0.jar=release\\modules\\ext\\gax-grpc-1.44.0.jar -file.reference.gax-httpjson-0.61.0.jar=release\\modules\\ext\\gax-httpjson-0.61.0.jar -file.reference.google-api-client-1.27.0.jar=release\\modules\\ext\\google-api-client-1.27.0.jar -file.reference.google-api-services-translate-v2-rev20170525-1.27.0.jar=release\\modules\\ext\\google-api-services-translate-v2-rev20170525-1.27.0.jar -file.reference.google-auth-library-credentials-0.15.0.jar=release\\modules\\ext\\google-auth-library-credentials-0.15.0.jar -file.reference.google-auth-library-oauth2-http-0.15.0.jar=release\\modules\\ext\\google-auth-library-oauth2-http-0.15.0.jar -file.reference.google-cloud-core-1.70.0.jar=release\\modules\\ext\\google-cloud-core-1.70.0.jar -file.reference.google-cloud-core-grpc-1.70.0.jar=release\\modules\\ext\\google-cloud-core-grpc-1.70.0.jar -file.reference.google-cloud-core-http-1.70.0.jar=release\\modules\\ext\\google-cloud-core-http-1.70.0.jar -file.reference.google-cloud-translate-1.70.0.jar=release\\modules\\ext\\google-cloud-translate-1.70.0.jar -file.reference.google-http-client-1.29.0.jar=release\\modules\\ext\\google-http-client-1.29.0.jar -file.reference.google-http-client-appengine-1.29.0.jar=release\\modules\\ext\\google-http-client-appengine-1.29.0.jar -file.reference.google-http-client-jackson2-1.29.0.jar=release\\modules\\ext\\google-http-client-jackson2-1.29.0.jar -file.reference.google-oauth-client-1.28.0.jar=release\\modules\\ext\\google-oauth-client-1.28.0.jar -file.reference.grpc-alts-1.19.0.jar=release\\modules\\ext\\grpc-alts-1.19.0.jar -file.reference.grpc-auth-1.19.0.jar=release\\modules\\ext\\grpc-auth-1.19.0.jar -file.reference.grpc-context-1.19.0.jar=release\\modules\\ext\\grpc-context-1.19.0.jar -file.reference.grpc-core-1.19.0.jar=release\\modules\\ext\\grpc-core-1.19.0.jar -file.reference.grpc-grpclb-1.19.0.jar=release\\modules\\ext\\grpc-grpclb-1.19.0.jar -file.reference.grpc-netty-shaded-1.19.0.jar=release\\modules\\ext\\grpc-netty-shaded-1.19.0.jar -file.reference.grpc-protobuf-1.19.0.jar=release\\modules\\ext\\grpc-protobuf-1.19.0.jar -file.reference.grpc-protobuf-lite-1.19.0.jar=release\\modules\\ext\\grpc-protobuf-lite-1.19.0.jar -file.reference.grpc-stub-1.19.0.jar=release\\modules\\ext\\grpc-stub-1.19.0.jar -file.reference.gson-2.7.jar=release\\modules\\ext\\gson-2.7.jar -file.reference.guava-27.1-android.jar=release\\modules\\ext\\guava-27.1-android.jar -file.reference.httpclient-4.5.5.jar=release\\modules\\ext\\httpclient-4.5.5.jar -file.reference.httpcore-4.4.9.jar=release\\modules\\ext\\httpcore-4.4.9.jar -file.reference.icepdf-core-6.2.2.jar=release\\modules\\ext\\icepdf-core-6.2.2.jar -file.reference.icepdf-viewer-6.2.2.jar=release\\modules\\ext\\icepdf-viewer-6.2.2.jar -file.reference.j2objc-annotations-1.1.jar=release\\modules\\ext\\j2objc-annotations-1.1.jar -file.reference.jackcess-2.2.0.jar=release\\modules\\ext\\jackcess-2.2.0.jar -file.reference.jackcess-encrypt-2.1.4.jar=release\\modules\\ext\\jackcess-encrypt-2.1.4.jar -file.reference.jackson-annotations-2.9.0.jar=release\\modules\\ext\\jackson-annotations-2.9.0.jar -file.reference.jackson-core-2.9.7.jar=release\\modules\\ext\\jackson-core-2.9.7.jar -file.reference.jackson-databind-2.9.7.jar=release\\modules\\ext\\jackson-databind-2.9.7.jar -file.reference.jackson-dataformat-csv-2.9.7.jar=release\\modules\\ext\\jackson-dataformat-csv-2.9.7.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.javax.annotation-api-1.3.2.jar=release\\modules\\ext\\javax.annotation-api-1.3.2.jar -file.reference.javax.ws.rs-api-2.0.jar=release\\modules\\ext\\javax.ws.rs-api-2.0.jar -file.reference.jcommon-1.0.23.jar=release/modules/ext/jcommon-1.0.23.jar -file.reference.jdom-2.0.5-contrib.jar=release\\modules\\ext\\jdom-2.0.5-contrib.jar -file.reference.jdom-2.0.5.jar=release\\modules\\ext\\jdom-2.0.5.jar -file.reference.jericho-html-3.3.jar=release\\modules\\ext\\jericho-html-3.3.jar -file.reference.jfreechart-1.0.19.jar=release/modules/ext/jfreechart-1.0.19.jar -file.reference.jgraphx-4.1.0.jar=release\\modules\\ext\\jgraphx-4.1.0.jar -file.reference.jline-0.9.94.jar=release\\modules\\ext\\jline-0.9.94.jar -file.reference.jsoup-1.10.3.jar=release\\modules\\ext\\jsoup-1.10.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.4.jar=release\\modules\\ext\\jxmapviewer2-2.4.jar -file.reference.jython-standalone-2.7.0.jar=release\\modules\\ext\\jython-standalone-2.7.0.jar -file.reference.libphonenumber-3.5.jar=release\\modules\\ext\\libphonenumber-3.5.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.9.jar=release\\modules\\ext\\mchange-commons-java-0.2.9.jar -file.reference.metadata-extractor-2.11.0.jar=release\\modules\\ext\\metadata-extractor-2.11.0.jar -file.reference.mockito-core-3.5.7.jar=release\\modules\\ext\\mockito-core-3.5.7.jar -file.reference.netty-3.7.0.Final.jar=release\\modules\\ext\\netty-3.7.0.Final.jar -file.reference.objenesis-3.1.jar=release\\modules\\ext\\objenesis-3.1.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.opencensus-api-0.19.2.jar=release\\modules\\ext\\opencensus-api-0.19.2.jar -file.reference.opencensus-contrib-grpc-metrics-0.19.2.jar=release\\modules\\ext\\opencensus-contrib-grpc-metrics-0.19.2.jar -file.reference.opencensus-contrib-http-util-0.19.2.jar=release\\modules\\ext\\opencensus-contrib-http-util-0.19.2.jar -file.reference.opennlp-tools-1.9.1.jar=release\\modules\\ext\\opennlp-tools-1.9.1.jar -file.reference.postgresql-42.2.18.jar=release\\modules\\ext\\postgresql-42.2.18.jar -file.reference.proto-google-cloud-translate-v3beta1-0.53.0.jar=release\\modules\\ext\\proto-google-cloud-translate-v3beta1-0.53.0.jar -file.reference.proto-google-common-protos-1.15.0.jar=release\\modules\\ext\\proto-google-common-protos-1.15.0.jar -file.reference.proto-google-iam-v1-0.12.0.jar=release\\modules\\ext\\proto-google-iam-v1-0.12.0.jar -file.reference.protobuf-java-3.7.0.jar=release\\modules\\ext\\protobuf-java-3.7.0.jar -file.reference.protobuf-java-util-3.7.0.jar=release\\modules\\ext\\protobuf-java-util-3.7.0.jar -file.reference.Rejistry-1.1-SNAPSHOT.jar=release\\modules\\ext\\Rejistry-1.1-SNAPSHOT.jar -file.reference.sevenzipjbinding-AllPlatforms.jar=release\\modules\\ext\\sevenzipjbinding-AllPlatforms.jar -file.reference.sevenzipjbinding.jar=release\\modules\\ext\\sevenzipjbinding.jar +file.reference.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-dom-1.14.jar=release/modules/ext/batik-dom-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.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar +file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar +file.reference.commons-dbcp2-2.9.0.jar=release/modules/ext/commons-dbcp2-2.9.0.jar +file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar +file.reference.commons-lang3-3.10.jar=release/modules/ext/commons-lang3-3.10.jar +file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar +file.reference.commons-pool2-2.10.0.jar=release/modules/ext/commons-pool2-2.10.0.jar +file.reference.curator-client-5.2.1.jar=release/modules/ext/curator-client-5.2.1.jar +file.reference.curator-framework-5.2.1.jar=release/modules/ext/curator-framework-5.2.1.jar +file.reference.curator-recipes-5.2.1.jar=release/modules/ext/curator-recipes-5.2.1.jar +file.reference.DatCon.jar=release/modules/ext/DatCon.jar +file.reference.decodetect-core-0.3.jar=release/modules/ext/decodetect-core-0.3.jar +file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar +file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar +file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.icepdf-core-6.2.2.jar=release/modules/ext/icepdf-core-6.2.2.jar +file.reference.icepdf-viewer-6.2.2.jar=release/modules/ext/icepdf-viewer-6.2.2.jar +file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar +file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar +file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar +file.reference.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar +file.reference.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar +file.reference.java-diff-utils-4.11.jar=release/modules/ext/java-diff-utils-4.11.jar +file.reference.javax.ws.rs-api-2.1.1.jar=release/modules/ext/javax.ws.rs-api-2.1.1.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.jgraphx-4.2.2.jar=release/modules/ext/jgraphx-4.2.2.jar +file.reference.jsoup-1.14.3.jar=release/modules/ext/jsoup-1.14.3.jar +file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar +file.reference.jutf7-1.0.0.jar=release/modules/ext/jutf7-1.0.0.jar +file.reference.jxmapviewer2-2.6.jar=release/modules/ext/jxmapviewer2-2.6.jar +file.reference.jython-standalone-2.7.2.jar=release/modules/ext/jython-standalone-2.7.2.jar +file.reference.libphonenumber-8.12.45.jar=release/modules/ext/libphonenumber-8.12.45.jar +file.reference.listenablefuture-1.0.jar=release/modules/ext/listenablefuture-1.0.jar +file.reference.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar +file.reference.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar +file.reference.mchange-commons-java-0.2.20.jar=release/modules/ext/mchange-commons-java-0.2.20.jar +file.reference.metadata-extractor-2.17.0.jar=release/modules/ext/metadata-extractor-2.17.0.jar +file.reference.netty-buffer-4.1.73.Final.jar=release/modules/ext/netty-buffer-4.1.73.Final.jar +file.reference.netty-codec-4.1.73.Final.jar=release/modules/ext/netty-codec-4.1.73.Final.jar +file.reference.netty-common-4.1.73.Final.jar=release/modules/ext/netty-common-4.1.73.Final.jar +file.reference.netty-handler-4.1.73.Final.jar=release/modules/ext/netty-handler-4.1.73.Final.jar +file.reference.netty-resolver-4.1.73.Final.jar=release/modules/ext/netty-resolver-4.1.73.Final.jar +file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.Final.jar +file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar +file.reference.netty-transport-4.1.73.Final.jar=release/modules/ext/netty-transport-4.1.73.Final.jar +file.reference.netty-transport-classes-epoll-4.1.73.Final.jar=release/modules/ext/netty-transport-classes-epoll-4.1.73.Final.jar +file.reference.netty-transport-native-epoll-4.1.73.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.73.Final.jar +file.reference.netty-transport-native-unix-common-4.1.73.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.73.Final.jar +file.reference.okhttp-2.7.5.jar=release/modules/ext/okhttp-2.7.5.jar +file.reference.okio-1.6.0.jar=release/modules/ext/okio-1.6.0.jar +file.reference.postgresql-42.2.18.jar=release/modules/ext/postgresql-42.2.18.jar +file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar +file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar +file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sleuthkit-4.11.1.jar=release/modules/ext/sleuthkit-4.11.1.jar file.reference.sleuthkit-caseuco-4.11.1.jar=release/modules/ext/sleuthkit-caseuco-4.11.1.jar -file.reference.slf4j-api-1.7.6.jar=release\\modules\\ext\\slf4j-api-1.7.6.jar -file.reference.slf4j-log4j12-1.7.6.jar=release\\modules\\ext\\slf4j-log4j12-1.7.6.jar -file.reference.SparseBitSet-1.1.jar=release\\modules\\ext\\SparseBitSet-1.1.jar -file.reference.sqlite-jdbc-3.25.2.jar=release\\modules\\ext\\sqlite-jdbc-3.25.2.jar -file.reference.StixLib.jar=release\\modules\\ext\\StixLib.jar -file.reference.threetenbp-1.3.3.jar=release\\modules\\ext\\threetenbp-1.3.3.jar -file.reference.webp-imageio-sejda-0.1.0.jar=release\\modules\\ext\\webp-imageio-sejda-0.1.0.jar -file.reference.xmpcore-5.1.3.jar=release\\modules\\ext\\xmpcore-5.1.3.jar +file.reference.snakeyaml-1.30.jar=release/modules/ext/snakeyaml-1.30.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.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.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.4.6.jar=release\\modules\\ext\\zookeeper-3.4.6.jar +file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar +file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt nbm.homepage=http://www.sleuthkit.org/ nbm.module.author=Brian Carrier nbm.needs.restart=true -source.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0-sources.jar spec.version.base=10.24 diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index b4465d58b6..a78165956f 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -269,6 +269,11 @@ org.netbeans.modules.nbjunit + + org.sleuthkit.autopsy.coretestlibs + + + qa-functional @@ -293,6 +298,10 @@ + + org.sleuthkit.autopsy.coretestlibs + + @@ -342,496 +351,304 @@ org.sleuthkit.datamodel.blackboardutils.attributes - ext/batik-xml-1.6.jar - release\modules\ext\batik-xml-1.6.jar + ext/activemq-all-5.16.4.jar + release/modules/ext/activemq-all-5.16.4.jar - ext/commons-digester-1.8.1.jar - release\modules\ext\commons-digester-1.8.1.jar + ext/audience-annotations-0.12.0.jar + release/modules/ext/audience-annotations-0.12.0.jar - ext/jai_core-1.1.3.jar - release\modules\ext\jai_core-1.1.3.jar + ext/batik-awt-util-1.14.jar + release/modules/ext/batik-awt-util-1.14.jar - ext/gax-grpc-1.44.0.jar - release\modules\ext\gax-grpc-1.44.0.jar + ext/batik-dom-1.14.jar + release/modules/ext/batik-dom-1.14.jar - ext/failureaccess-1.0.1.jar - release\modules\ext\failureaccess-1.0.1.jar + ext/batik-svg-dom-1.14.jar + release/modules/ext/batik-svg-dom-1.14.jar - ext/grpc-protobuf-1.19.0.jar - release\modules\ext\grpc-protobuf-1.19.0.jar + ext/batik-svggen-1.14.jar + release/modules/ext/batik-svggen-1.14.jar - ext/opencensus-api-0.19.2.jar - release\modules\ext\opencensus-api-0.19.2.jar + ext/batik-util-1.14.jar + release/modules/ext/batik-util-1.14.jar - ext/batik-svg-dom-1.6.jar - release\modules\ext\batik-svg-dom-1.6.jar + ext/batik-xml-1.14.jar + release/modules/ext/batik-xml-1.14.jar - ext/gax-httpjson-0.61.0.jar - release\modules\ext\gax-httpjson-0.61.0.jar + ext/bcpkix-jdk15on-1.70.jar + release/modules/ext/bcpkix-jdk15on-1.70.jar - ext/sevenzipjbinding.jar - release\modules\ext\sevenzipjbinding.jar + ext/bcprov-ext-jdk15on-1.70.jar + release/modules/ext/bcprov-ext-jdk15on-1.70.jar - ext/mchange-commons-java-0.2.9.jar - release\modules\ext\mchange-commons-java-0.2.9.jar + ext/bcprov-jdk15on-1.70.jar + release/modules/ext/bcprov-jdk15on-1.70.jar - ext/api-common-1.7.0.jar - release\modules\ext\api-common-1.7.0.jar + ext/c3p0-0.9.5.5.jar + release/modules/ext/c3p0-0.9.5.5.jar - ext/jackson-databind-2.9.7.jar - release\modules\ext\jackson-databind-2.9.7.jar + ext/checker-qual-3.12.0.jar + release/modules/ext/checker-qual-3.12.0.jar - ext/jackson-dataformat-csv-2.9.7.jar - release\modules\ext\jackson-dataformat-csv-2.9.7.jar + ext/commons-dbcp2-2.9.0.jar + release/modules/ext/commons-dbcp2-2.9.0.jar - ext/okhttp-2.7.5.jar - release\modules\ext\okhttp-2.7.5.jar + ext/commons-io-2.11.0.jar + release/modules/ext/commons-io-2.11.0.jar - ext/proto-google-cloud-translate-v3beta1-0.53.0.jar - release\modules\ext\proto-google-cloud-translate-v3beta1-0.53.0.jar - - - ext/byte-buddy-1.10.13.jar - release\modules\ext\byte-buddy-1.10.13.jar - - - ext/error_prone_annotations-2.3.2.jar - release\modules\ext\error_prone_annotations-2.3.2.jar - - - ext/libphonenumber-3.5.jar - release\modules\ext\libphonenumber-3.5.jar - - - ext/StixLib.jar - release\modules\ext\StixLib.jar - - - ext/google-auth-library-credentials-0.15.0.jar - release\modules\ext\google-auth-library-credentials-0.15.0.jar - - - ext/grpc-auth-1.19.0.jar - release\modules\ext\grpc-auth-1.19.0.jar - - - ext/j2objc-annotations-1.1.jar - release\modules\ext\j2objc-annotations-1.1.jar - - - ext/metadata-extractor-2.11.0.jar - release\modules\ext\metadata-extractor-2.11.0.jar - - - ext/commons-codec-1.11.jar - release\modules\ext\commons-codec-1.11.jar - - - ext/postgresql-42.2.18.jar - release\modules\ext\postgresql-42.2.18.jar - - - ext/commons-pool2-2.4.2.jar - release\modules\ext\commons-pool2-2.4.2.jar - - - ext/jxmapviewer2-2.4.jar - release\modules\ext\jxmapviewer2-2.4.jar - - - ext/jdom-2.0.5-contrib.jar - release\modules\ext\jdom-2.0.5-contrib.jar - - - ext/xmpcore-5.1.3.jar - release\modules\ext\xmpcore-5.1.3.jar - - - ext/batik-util-1.6.jar - release\modules\ext\batik-util-1.6.jar - - - ext/javax.annotation-api-1.3.2.jar - release\modules\ext\javax.annotation-api-1.3.2.jar - - - ext/jgraphx-4.1.0.jar - release\modules\ext\jgraphx-4.1.0.jar - - - ext/jline-0.9.94.jar - release\modules\ext\jline-0.9.94.jar - - - ext/DatCon.jar - release\modules\ext\DatCon.jar - - - ext/okio-1.6.0.jar - release\modules\ext\okio-1.6.0.jar - - - ext/bcprov-jdk15on-1.54.jar - release\modules\ext\bcprov-jdk15on-1.54.jar - - - ext/curator-framework-2.8.0.jar - release\modules\ext\curator-framework-2.8.0.jar - - - ext/commons-dbcp2-2.1.1.jar - release\modules\ext\commons-dbcp2-2.1.1.jar - - - ext/google-http-client-appengine-1.29.0.jar - release\modules\ext\google-http-client-appengine-1.29.0.jar - - - ext/proto-google-iam-v1-0.12.0.jar - release\modules\ext\proto-google-iam-v1-0.12.0.jar - - - ext/jackcess-encrypt-2.1.4.jar - release\modules\ext\jackcess-encrypt-2.1.4.jar - - - ext/google-http-client-1.29.0.jar - release\modules\ext\google-http-client-1.29.0.jar - - - ext/opennlp-tools-1.9.1.jar - release\modules\ext\opennlp-tools-1.9.1.jar - - - ext/bcprov-ext-jdk15on-1.54.jar - release\modules\ext\bcprov-ext-jdk15on-1.54.jar - - - ext/google-cloud-core-1.70.0.jar - release\modules\ext\google-cloud-core-1.70.0.jar - - - ext/protobuf-java-3.7.0.jar - release\modules\ext\protobuf-java-3.7.0.jar - - - ext/bcpkix-jdk15on-1.54.jar - release\modules\ext\bcpkix-jdk15on-1.54.jar - - - ext/sqlite-jdbc-3.25.2.jar - release\modules\ext\sqlite-jdbc-3.25.2.jar - - - ext/grpc-protobuf-lite-1.19.0.jar - release\modules\ext\grpc-protobuf-lite-1.19.0.jar - - - ext/httpcore-4.4.9.jar - release\modules\ext\httpcore-4.4.9.jar - - - ext/guava-27.1-android.jar - release\modules\ext\guava-27.1-android.jar - - - ext/bcprov-jdk15on-1.52.jar - release\modules\ext\bcprov-jdk15on-1.52.jar - - - ext/checker-compat-qual-2.5.3.jar - release\modules\ext\checker-compat-qual-2.5.3.jar - - - ext/animal-sniffer-annotations-1.17.jar - release\modules\ext\animal-sniffer-annotations-1.17.jar - - - ext/gax-1.44.0.jar - release\modules\ext\gax-1.44.0.jar - - - ext/jsoup-1.10.3.jar - release\modules\ext\jsoup-1.10.3.jar - - - ext/YaraJNIWrapper.jar - release/modules/ext/YaraJNIWrapper.jar - - - ext/grpc-context-1.19.0.jar - release\modules\ext\grpc-context-1.19.0.jar - - - ext/jackcess-2.2.0.jar - release\modules\ext\jackcess-2.2.0.jar - - - ext/slf4j-log4j12-1.7.6.jar - release\modules\ext\slf4j-log4j12-1.7.6.jar - - - ext/jericho-html-3.3.jar - release\modules\ext\jericho-html-3.3.jar - - - ext/google-cloud-core-grpc-1.70.0.jar - release\modules\ext\google-cloud-core-grpc-1.70.0.jar - - - ext/commons-validator-1.6.jar - release\modules\ext\commons-validator-1.6.jar - - - ext/slf4j-api-1.7.6.jar - release\modules\ext\slf4j-api-1.7.6.jar - - - ext/decodetect-core-0.3.jar - release\modules\ext\decodetect-core-0.3.jar - - - ext/mockito-core-3.5.7.jar - release\modules\ext\mockito-core-3.5.7.jar - - - ext/httpclient-4.5.5.jar - release\modules\ext\httpclient-4.5.5.jar - - - ext/curator-recipes-2.8.0.jar - release\modules\ext\curator-recipes-2.8.0.jar - - - ext/jackson-annotations-2.9.0.jar - release\modules\ext\jackson-annotations-2.9.0.jar - - - ext/objenesis-3.1.jar - release\modules\ext\objenesis-3.1.jar - - - ext/jackson-core-2.9.7.jar - release\modules\ext\jackson-core-2.9.7.jar - - - ext/commons-lang3-3.5.jar - release\modules\ext\commons-lang3-3.5.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 + release/modules/ext/commons-logging-1.2.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/commons-pool2-2.10.0.jar + release/modules/ext/commons-pool2-2.10.0.jar - ext/protobuf-java-util-3.7.0.jar - release\modules\ext\protobuf-java-util-3.7.0.jar + ext/curator-client-5.2.1.jar + release/modules/ext/curator-client-5.2.1.jar - ext/commons-collections-3.2.2.jar - release\modules\ext\commons-collections-3.2.2.jar + ext/curator-framework-5.2.1.jar + release/modules/ext/curator-framework-5.2.1.jar - ext/java-diff-utils-4.8.jar - release\modules\ext\java-diff-utils-4.8.jar + ext/curator-recipes-5.2.1.jar + release/modules/ext/curator-recipes-5.2.1.jar - ext/SparseBitSet-1.1.jar - release\modules\ext\SparseBitSet-1.1.jar + ext/DatCon.jar + release/modules/ext/DatCon.jar - ext/grpc-grpclb-1.19.0.jar - release\modules\ext\grpc-grpclb-1.19.0.jar + ext/decodetect-core-0.3.jar + release/modules/ext/decodetect-core-0.3.jar - ext/batik-svggen-1.6.jar - release\modules\ext\batik-svggen-1.6.jar + ext/error_prone_annotations-2.11.0.jar + release/modules/ext/error_prone_annotations-2.11.0.jar - ext/c3p0-0.9.5.jar - release\modules\ext\c3p0-0.9.5.jar + ext/failureaccess-1.0.1.jar + release/modules/ext/failureaccess-1.0.1.jar - ext/zookeeper-3.4.6.jar - release\modules\ext\zookeeper-3.4.6.jar - - - ext/grpc-alts-1.19.0.jar - release\modules\ext\grpc-alts-1.19.0.jar - - - ext/sleuthkit-caseuco-4.11.1.jar - release/modules/ext/sleuthkit-caseuco-4.11.1.jar - - - ext/jdom-2.0.5.jar - release\modules\ext\jdom-2.0.5.jar - - - ext/gson-2.7.jar - release\modules\ext\gson-2.7.jar - - - ext/google-api-client-1.27.0.jar - release\modules\ext\google-api-client-1.27.0.jar - - - ext/opencensus-contrib-http-util-0.19.2.jar - release\modules\ext\opencensus-contrib-http-util-0.19.2.jar - - - ext/google-auth-library-oauth2-http-0.15.0.jar - release\modules\ext\google-auth-library-oauth2-http-0.15.0.jar - - - ext/jython-standalone-2.7.2.jar - release\modules\ext\jython-standalone-2.7.2.jar - - - ext/commons-lang-2.6.jar - release\modules\ext\commons-lang-2.6.jar - - - ext/jsr305-3.0.2.jar - release\modules\ext\jsr305-3.0.2.jar - - - ext/proto-google-common-protos-1.15.0.jar - release\modules\ext\proto-google-common-protos-1.15.0.jar - - - ext/netty-3.7.0.Final.jar - release\modules\ext\netty-3.7.0.Final.jar - - - ext/jfreechart-1.0.19.jar - release/modules/ext/jfreechart-1.0.19.jar - - - ext/opencensus-contrib-grpc-metrics-0.19.2.jar - release\modules\ext\opencensus-contrib-grpc-metrics-0.19.2.jar - - - ext/jai_imageio-1.1.jar - release\modules\ext\jai_imageio-1.1.jar - - - ext/curator-client-2.8.0.jar - release\modules\ext\curator-client-2.8.0.jar - - - ext/grpc-core-1.19.0.jar - release\modules\ext\grpc-core-1.19.0.jar - - - ext/javax.ws.rs-api-2.0.jar - release\modules\ext\javax.ws.rs-api-2.0.jar - - - ext/jcommon-1.0.23.jar - release/modules/ext/jcommon-1.0.23.jar + ext/guava-31.1-jre.jar + release/modules/ext/guava-31.1-jre.jar ext/icepdf-core-6.2.2.jar - release\modules\ext\icepdf-core-6.2.2.jar + release/modules/ext/icepdf-core-6.2.2.jar - ext/activemq-all-5.11.1.jar - release\modules\ext\activemq-all-5.11.1.jar + ext/icepdf-viewer-6.2.2.jar + release/modules/ext/icepdf-viewer-6.2.2.jar - ext/google-cloud-core-http-1.70.0.jar - release\modules\ext\google-cloud-core-http-1.70.0.jar + ext/j2objc-annotations-1.3.jar + release/modules/ext/j2objc-annotations-1.3.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/jai_core-1.1.3.jar + release/modules/ext/jai_core-1.1.3.jar + + + ext/jai_imageio-1.1.jar + release/modules/ext/jai_imageio-1.1.jar + + + ext/java-diff-utils-4.11.jar + release/modules/ext/java-diff-utils-4.11.jar + + + ext/javax.ws.rs-api-2.1.1.jar + release/modules/ext/javax.ws.rs-api-2.1.1.jar + + + ext/jdom-2.0.5.jar + release/modules/ext/jdom-2.0.5.jar + + + ext/jfreechart-1.5.3.jar + release/modules/ext/jfreechart-1.5.3.jar + + + ext/jgraphx-4.2.2.jar + release/modules/ext/jgraphx-4.2.2.jar + + + ext/jsoup-1.14.3.jar + release/modules/ext/jsoup-1.14.3.jar + + + ext/jutf7-1.0.0.jar + release/modules/ext/jutf7-1.0.0.jar + + + ext/jxmapviewer2-2.6.jar + release/modules/ext/jxmapviewer2-2.6.jar + + + ext/jython-standalone-2.7.2.jar + release/modules/ext/jython-standalone-2.7.2.jar + + + ext/libphonenumber-8.12.45.jar + release/modules/ext/libphonenumber-8.12.45.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.2.20.jar + release/modules/ext/mchange-commons-java-0.2.20.jar + + + ext/metadata-extractor-2.17.0.jar + release/modules/ext/metadata-extractor-2.17.0.jar + + + ext/netty-buffer-4.1.73.Final.jar + release/modules/ext/netty-buffer-4.1.73.Final.jar + + + ext/netty-codec-4.1.73.Final.jar + release/modules/ext/netty-codec-4.1.73.Final.jar + + + ext/netty-common-4.1.73.Final.jar + release/modules/ext/netty-common-4.1.73.Final.jar + + + ext/netty-handler-4.1.73.Final.jar + release/modules/ext/netty-handler-4.1.73.Final.jar + + + ext/netty-resolver-4.1.73.Final.jar + release/modules/ext/netty-resolver-4.1.73.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.48.Final.jar + release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar + + + ext/netty-transport-4.1.73.Final.jar + release/modules/ext/netty-transport-4.1.73.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-native-epoll-4.1.73.Final.jar + release/modules/ext/netty-transport-native-epoll-4.1.73.Final.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/okhttp-2.7.5.jar + release/modules/ext/okhttp-2.7.5.jar + + + ext/okio-1.6.0.jar + release/modules/ext/okio-1.6.0.jar + + + ext/postgresql-42.2.18.jar + release/modules/ext/postgresql-42.2.18.jar ext/Rejistry-1.1-SNAPSHOT.jar - release\modules\ext\Rejistry-1.1-SNAPSHOT.jar - - - ext/commons-beanutils-1.9.2.jar - release\modules\ext\commons-beanutils-1.9.2.jar - - - ext/batik-dom-1.6.jar - release\modules\ext\batik-dom-1.6.jar - - - ext/google-http-client-jackson2-1.29.0.jar - release\modules\ext\google-http-client-jackson2-1.29.0.jar - - - ext/threetenbp-1.3.3.jar - release\modules\ext\threetenbp-1.3.3.jar - - - ext/google-cloud-translate-1.70.0.jar - release\modules\ext\google-cloud-translate-1.70.0.jar - - - ext/grpc-stub-1.19.0.jar - release\modules\ext\grpc-stub-1.19.0.jar - - - ext/google-oauth-client-1.28.0.jar - release\modules\ext\google-oauth-client-1.28.0.jar + release/modules/ext/Rejistry-1.1-SNAPSHOT.jar ext/sevenzipjbinding-AllPlatforms.jar - release\modules\ext\sevenzipjbinding-AllPlatforms.jar + release/modules/ext/sevenzipjbinding-AllPlatforms.jar + + + ext/sevenzipjbinding.jar + release/modules/ext/sevenzipjbinding.jar ext/sleuthkit-4.11.1.jar release/modules/ext/sleuthkit-4.11.1.jar - ext/jutf7-1.0.0.jar - release\modules\ext\jutf7-1.0.0.jar + ext/sleuthkit-caseuco-4.11.1.jar + release/modules/ext/sleuthkit-caseuco-4.11.1.jar - ext/byte-buddy-agent-1.10.13.jar - release\modules\ext\byte-buddy-agent-1.10.13.jar + ext/snakeyaml-1.30.jar + release/modules/ext/snakeyaml-1.30.jar - ext/batik-awt-util-1.6.jar - release\modules\ext\batik-awt-util-1.6.jar + ext/SparseBitSet-1.1.jar + release/modules/ext/SparseBitSet-1.1.jar - ext/google-api-services-translate-v2-rev20170525-1.27.0.jar - release\modules\ext\google-api-services-translate-v2-rev20170525-1.27.0.jar + ext/spotbugs-annotations-4.6.0.jar + release/modules/ext/spotbugs-annotations-4.6.0.jar - ext/icepdf-viewer-6.2.2.jar - release\modules\ext\icepdf-viewer-6.2.2.jar + ext/sqlite-jdbc-3.25.2.jar + release/modules/ext/sqlite-jdbc-3.25.2.jar - ext/webp-imageio-sejda-0.1.0.jar - release\modules\ext\webp-imageio-sejda-0.1.0.jar + ext/xmpcore-6.1.11.jar + release/modules/ext/xmpcore-6.1.11.jar - ext/grpc-netty-shaded-1.19.0.jar - release\modules\ext\grpc-netty-shaded-1.19.0.jar + ext/YaraJNIWrapper.jar + release/modules/ext/YaraJNIWrapper.jar - ext/snakeyaml-1.27.jar - release\modules\ext\snakeyaml-1.27.jar + ext/zookeeper-3.8.0.jar + release/modules/ext/zookeeper-3.8.0.jar + + + ext/zookeeper-jute-3.8.0.jar + release/modules/ext/zookeeper-jute-3.8.0.jar diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultTableArtifactContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultTableArtifactContentViewer.java index 75882a39b0..b440d4c41c 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultTableArtifactContentViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultTableArtifactContentViewer.java @@ -348,8 +348,7 @@ public class DefaultTableArtifactContentViewer extends AbstractArtifactDetailsPa case JSON: // Get the attribute's JSON value and convert to indented multiline display string String jsonVal = attr.getValueString(); - JsonParser parser = new JsonParser(); - JsonObject json = parser.parse(jsonVal).getAsJsonObject(); + JsonObject json = JsonParser.parseString(jsonVal).getAsJsonObject(); value = toJsonDisplayString(json, ""); break; diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/EscapeUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/EscapeUtil.java index a95f74a10f..c5af8fa674 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/EscapeUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/EscapeUtil.java @@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.logging.Level; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; /** * Text escaping utilities. diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/CreditCards.java b/Core/src/org/sleuthkit/autopsy/datamodel/CreditCards.java index 7582846866..d0441f29d8 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/CreditCards.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/CreditCards.java @@ -132,7 +132,8 @@ public class CreditCards { if (binsLoaded == false) { try { InputStreamReader in = new InputStreamReader(CreditCards.class.getResourceAsStream("ranges.csv")); //NON-NLS - CSVParser rangesParser = CSVFormat.RFC4180.withFirstRecordAsHeader().parse(in); + + CSVParser rangesParser = CSVFormat.RFC4180.builder().setHeader().setSkipHeaderRecord(true).build().parse(in); //parse each row and add to range map for (CSVRecord record : rangesParser) { diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java index eb363a8a47..41a10d8393 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java @@ -77,7 +77,7 @@ public class BarChartPanel extends AbstractLoadableComponent> "{0}: {1} ({2})", new DecimalFormat("#,###"), new DecimalFormat("0.0%")); private final ChartMessageOverlay overlay = new ChartMessageOverlay(); - private final DefaultPieDataset dataset = new DefaultPieDataset(); + private final DefaultPieDataset dataset = new DefaultPieDataset<>(); private final JFreeChart chart; - private final PiePlot plot; + private final PiePlot plot; + @SuppressWarnings("unchecked") + private static PiePlot getTypedPlot(JFreeChart chart) { + return ((PiePlot) chart.getPlot()); + } + + /** * Main constructor. */ @@ -86,8 +92,7 @@ public class PieChartPanel extends AbstractLoadableComponent> chart.setBackgroundPaint(null); chart.getTitle().setFont(DEFAULT_HEADER_FONT); - - this.plot = ((PiePlot) chart.getPlot()); + this.plot = getTypedPlot(chart); plot.setInteriorGap(DEFAULT_CHART_PADDING); plot.setLabelGenerator(DEFAULT_LABEL_GENERATOR); plot.setLabelFont(DEFAULT_FONT); diff --git a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java index 3d08163c9e..8a40bf339d 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java @@ -18,10 +18,10 @@ */ package org.sleuthkit.autopsy.modules.encryptiondetection; -import com.healthmarketscience.jackcess.CryptCodecProvider; +import com.healthmarketscience.jackcess.crypt.CryptCodecProvider; import com.healthmarketscience.jackcess.Database; import com.healthmarketscience.jackcess.DatabaseBuilder; -import com.healthmarketscience.jackcess.InvalidCredentialsException; +import com.healthmarketscience.jackcess.crypt.InvalidCredentialsException; import com.healthmarketscience.jackcess.impl.CodecProvider; import com.healthmarketscience.jackcess.impl.UnsupportedCodecException; import com.healthmarketscience.jackcess.util.MemFileChannel; diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashkeeperHashSetParser.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashkeeperHashSetParser.java index e66af62eb3..9b75afabac 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashkeeperHashSetParser.java +++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashkeeperHashSetParser.java @@ -53,7 +53,9 @@ public class HashkeeperHashSetParser implements HashSetParser { // Create the parser inputStreamReader = new InputStreamReader(new FileInputStream(filename)); //NON-NLS - csvParser = CSVFormat.RFC4180.withFirstRecordAsHeader().parse(inputStreamReader); + + csvParser = CSVFormat.RFC4180.builder().setHeader().setSkipHeaderRecord(true).build().parse(inputStreamReader); + if (!csvParser.getHeaderMap().keySet().contains("hash")) { close(); throw new TskCoreException("Hashkeeper file format invalid - does not contain 'hash' column"); diff --git a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java index 5a7a1646ed..74921b087d 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java @@ -151,7 +151,8 @@ public class PlasoIngestModule implements DataSourceIngestModule { currentCase = Case.getCurrentCase(); fileManager = currentCase.getServices().getFileManager(); - String currentTime = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss z", Locale.US).format(System.currentTimeMillis());//NON-NLS + // Use Z here for timezone since the other formats can include a colon on some systems + String currentTime = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss Z", Locale.US).format(System.currentTimeMillis());//NON-NLS Path moduleOutputPath = Paths.get(currentCase.getModuleDirectory(), PLASO, currentTime); try { Files.createDirectories(moduleOutputPath); diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java index bafa7b4da1..0d9ca80cb9 100644 --- a/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java +++ b/Core/src/org/sleuthkit/autopsy/report/modules/html/HTMLReport.java @@ -52,7 +52,7 @@ import java.util.logging.Level; import javax.imageio.ImageIO; import javax.swing.JPanel; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.openide.filesystems.FileUtil; import org.openide.util.NbBundle; import org.openide.util.NbBundle.Messages; diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java index 6524c1835d..574cc44313 100644 --- a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java +++ b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslator.java @@ -165,9 +165,8 @@ public class BingTranslator implements TextTranslator { * the Spanish word for cat: [ { "detectedLanguage": { "language": "es", * "score": 1.0 }, "translations": [ { "text": "cat", "to": "en" } ] } ] */ - JsonParser parser = new JsonParser(); try { - JsonArray responses = parser.parse(json_text).getAsJsonArray(); + JsonArray responses = JsonParser.parseString(json_text).getAsJsonArray(); //As far as I know, there's always exactly one item in the array. JsonObject response0 = responses.get(0).getAsJsonObject(); JsonArray translations = response0.getAsJsonArray("translations"); diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java index 04e978dfa9..a679dccd13 100644 --- a/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettingsPanel.java @@ -107,9 +107,8 @@ public class BingTranslatorSettingsPanel extends javax.swing.JPanel { .url(GET_TARGET_LANGUAGES_URL).build(); try { Response response = new OkHttpClient().newCall(get_request).execute(); - JsonParser parser = new JsonParser(); String responseBody = response.body().string(); - JsonElement elementBody = parser.parse(responseBody); + JsonElement elementBody = JsonParser.parseString(responseBody); JsonObject asObject = elementBody.getAsJsonObject(); JsonElement translationElement = asObject.get("translation"); JsonObject responses = translationElement.getAsJsonObject(); @@ -368,8 +367,7 @@ public class BingTranslatorSettingsPanel extends javax.swing.JPanel { .addHeader("Content-type", "application/json").build(); try { Response response = new OkHttpClient().newCall(request).execute(); - JsonParser parser = new JsonParser(); - JsonArray responses = parser.parse(response.body().string()).getAsJsonArray(); + JsonArray responses = JsonParser.parseString(response.body().string()).getAsJsonArray(); //As far as I know, there's always exactly one item in the array. JsonObject response0 = responses.get(0).getAsJsonObject(); JsonArray translations = response0.getAsJsonArray("translations"); diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ShowInTimelineDialog.java b/Core/src/org/sleuthkit/autopsy/timeline/ShowInTimelineDialog.java index abad95b2ff..cf15062bf1 100755 --- a/Core/src/org/sleuthkit/autopsy/timeline/ShowInTimelineDialog.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ShowInTimelineDialog.java @@ -53,7 +53,7 @@ import javafx.stage.Modality; import javafx.util.converter.IntegerStringConverter; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import org.controlsfx.validation.ValidationMessage; import org.controlsfx.validation.ValidationSupport; import org.controlsfx.validation.Validator; diff --git a/CoreLibs/build.xml b/CoreLibs/build.xml index dbfc12987d..57ab10853e 100644 --- a/CoreLibs/build.xml +++ b/CoreLibs/build.xml @@ -41,9 +41,6 @@ - - - diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index cec7485556..de8be46b71 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -5,75 +5,100 @@ - - - - - - - + + + + + + + - - + + - + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - + + - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreLibs/ivysettings.xml b/CoreLibs/ivysettings.xml index dc6cdfd94f..da1e8e957b 100644 --- a/CoreLibs/ivysettings.xml +++ b/CoreLibs/ivysettings.xml @@ -7,4 +7,5 @@ + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 2e83c2371e..0ee54ddc28 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -1,84 +1,121 @@ -file.reference.ant-1.8.2.jar=release/modules/ext/ant-1.8.2.jar -file.reference.ant-launcher-1.8.2.jar=release/modules/ext/ant-launcher-1.8.2.jar +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.avalon-framework-4.1.5.jar=release/modules/ext/avalon-framework-4.1.5.jar -file.reference.common-image-3.2.jar=release/modules/ext/common-image-3.2.jar -file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar -file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar -file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar -file.reference.commons-collections4-4.2.jar=release\\modules\\ext\\commons-collections4-4.2.jar -file.reference.commons-compress-1.18.jar=release/modules/ext/commons-compress-1.18.jar -file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar -file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar -file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.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.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-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-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-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar -file.reference.commons-lang3-3.4.jar=release/modules/ext/commons-lang3-3.4.jar -file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar -file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar +file.reference.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.9.jar=release/modules/ext/commons-text-1.9.jar +file.reference.commons-validator-1.7.jar=release/modules/ext/commons-validator-1.7.jar +file.reference.compiler-0.9.10.jar=release/modules/ext/compiler-0.9.10.jar +file.reference.conscrypt-openjdk-uber-2.5.1.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar -file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar -file.reference.gson-2.8.5.jar=release/modules/ext/gson-2.8.5.jar -file.reference.gst1-java-core-1.0.0.jar=release\\modules\\ext\\gst1-java-core-1.0.0.jar -file.reference.guava-19.0.jar=release/modules/ext/guava-19.0.jar -file.reference.imageio-bmp-3.2.jar=release/modules/ext/imageio-bmp-3.2.jar -file.reference.imageio-core-3.2.jar=release/modules/ext/imageio-core-3.2.jar -file.reference.imageio-icns-3.2.jar=release/modules/ext/imageio-icns-3.2.jar -file.reference.imageio-iff-3.2.jar=release/modules/ext/imageio-iff-3.2.jar -file.reference.imageio-jpeg-3.2.jar=release/modules/ext/imageio-jpeg-3.2.jar -file.reference.imageio-metadata-3.2.jar=release/modules/ext/imageio-metadata-3.2.jar -file.reference.imageio-pcx-3.2.jar=release/modules/ext/imageio-pcx-3.2.jar -file.reference.imageio-pict-3.2.jar=release/modules/ext/imageio-pict-3.2.jar -file.reference.imageio-pnm-3.2.jar=release/modules/ext/imageio-pnm-3.2.jar -file.reference.imageio-psd-3.2.jar=release/modules/ext/imageio-psd-3.2.jar -file.reference.imageio-sgi-3.2.jar=release/modules/ext/imageio-sgi-3.2.jar -file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar -file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar -file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar +file.reference.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.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar +file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +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.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar -file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar +file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar +file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annotations-2.13.2.jar +file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar +file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar +file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar +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-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar file.reference.jna-5.11.0.jar=release/modules/ext/jna-5.11.0.jar file.reference.jna-platform-5.11.0.jar=release/modules/ext/jna-platform-5.11.0.jar -file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar -file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar -file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar +file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.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.logkit-1.0.1.jar=release/modules/ext/logkit-1.0.1.jar +file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar +file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar +file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar +file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.jar file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar -file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar -file.reference.poi-4.0.1.jar=release\\modules\\ext\\poi-4.0.1.jar -file.reference.poi-excelant-4.0.1.jar=release\\modules\\ext\\poi-excelant-4.0.1.jar -file.reference.poi-ooxml-4.0.1.jar=release\\modules\\ext\\poi-ooxml-4.0.1.jar -file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar -file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.jar -file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar -file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.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.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar -file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar -file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar -file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar -file.reference.xmlbeans-3.0.2.jar=release/modules/ext/xmlbeans-3.0.2.jar -file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.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.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial -javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar -javadoc.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5-javadoc.jar -javadoc.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-javadoc.jar -javadoc.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-javadoc.jar -javadoc.reference.guava-19.0.jar=release/modules/ext/guava-19.0-javadoc.jar -javadoc.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-javadoc.jar -javadoc.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-javadoc.jar -javadoc.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-javadoc.jar -javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar nbm.needs.restart=true -source.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-sources.jar -source.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5-sources.jar -source.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-sources.jar -source.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-sources.jar -source.reference.guava-19.0.jar=release/modules/ext/guava-19.0-sources.jar -source.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-sources.jar -source.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-sources.jar -source.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-sources.jar -source.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-sources.jar + diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 17249980ee..0d79f414b1 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -26,10 +26,6 @@ unit - - org.netbeans.libs.junit4 - - @@ -38,6 +34,35 @@ com.apple.eawt.event com.apple.eio com.dd.plist + com.fasterxml.jackson.annotation + com.fasterxml.jackson.core + com.fasterxml.jackson.core.base + com.fasterxml.jackson.core.exc + com.fasterxml.jackson.core.filter + com.fasterxml.jackson.core.format + com.fasterxml.jackson.core.io + com.fasterxml.jackson.core.json + com.fasterxml.jackson.core.type + com.fasterxml.jackson.core.util + com.fasterxml.jackson.databind + com.fasterxml.jackson.databind.annotation + com.fasterxml.jackson.databind.cfg + com.fasterxml.jackson.databind.deser + com.fasterxml.jackson.databind.deser.impl + com.fasterxml.jackson.databind.deser.std + com.fasterxml.jackson.databind.exc + com.fasterxml.jackson.databind.ext + com.fasterxml.jackson.databind.introspect + com.fasterxml.jackson.databind.json + com.fasterxml.jackson.databind.jsontype.impl + com.fasterxml.jackson.databind.module + com.fasterxml.jackson.databind.node + com.fasterxml.jackson.databind.ser + com.fasterxml.jackson.databind.ser.impl + com.fasterxml.jackson.databind.ser.std + com.fasterxml.jackson.databind.type + com.fasterxml.jackson.databind.util + com.fasterxml.jackson.dataformat.csv com.github.lgooddatepicker.components com.github.lgooddatepicker.optionalusertools com.github.lgooddatepicker.zinternaltools @@ -48,12 +73,95 @@ com.github.mustachejava.reflect.guards com.github.mustachejava.resolver com.github.mustachejava.util + com.google.api + com.google.api.client.auth.oauth + com.google.api.client.auth.oauth2 + com.google.api.client.auth.openidconnect + com.google.api.client.extensions.appengine.datastore + com.google.api.client.extensions.appengine.http + com.google.api.client.googleapis + com.google.api.client.googleapis.apache + com.google.api.client.googleapis.apache.v2 + com.google.api.client.googleapis.auth.oauth2 + com.google.api.client.googleapis.batch + com.google.api.client.googleapis.batch.json + com.google.api.client.googleapis.compute + com.google.api.client.googleapis.javanet + com.google.api.client.googleapis.json + com.google.api.client.googleapis.media + com.google.api.client.googleapis.mtls + com.google.api.client.googleapis.notifications + com.google.api.client.googleapis.notifications.json + com.google.api.client.googleapis.services + com.google.api.client.googleapis.services.json + com.google.api.client.googleapis.testing + com.google.api.client.googleapis.testing.auth.oauth2 + com.google.api.client.googleapis.testing.compute + com.google.api.client.googleapis.testing.json + com.google.api.client.googleapis.testing.notifications + com.google.api.client.googleapis.testing.services + com.google.api.client.googleapis.testing.services.json + com.google.api.client.googleapis.util + com.google.api.client.http + com.google.api.client.http.apache + com.google.api.client.http.javanet + com.google.api.client.http.json + com.google.api.client.json + com.google.api.client.json.jackson2 + com.google.api.client.json.rpc2 + com.google.api.client.json.webtoken + com.google.api.client.testing.http + com.google.api.client.testing.http.apache + com.google.api.client.testing.http.javanet + com.google.api.client.testing.json + com.google.api.client.testing.json.webtoken + com.google.api.client.testing.util + com.google.api.client.util + com.google.api.client.util.escape + com.google.api.client.util.store + com.google.api.core + com.google.api.gax.batching + com.google.api.gax.core + com.google.api.gax.grpc + com.google.api.gax.httpjson + com.google.api.gax.httpjson.longrunning + com.google.api.gax.httpjson.longrunning.stub + com.google.api.gax.longrunning + com.google.api.gax.paging + com.google.api.gax.retrying + com.google.api.gax.rpc + com.google.api.gax.rpc.internal + com.google.api.gax.rpc.mtls + com.google.api.gax.tracing + com.google.api.pathtemplate + com.google.api.resourcenames + com.google.api.services.translate + com.google.api.services.translate.model + com.google.auth + com.google.auth.http + com.google.auth.oauth2 + com.google.cloud + com.google.cloud.audit + com.google.cloud.http + com.google.cloud.location + com.google.cloud.spi + com.google.cloud.testing + com.google.cloud.translate + com.google.cloud.translate.spi + com.google.cloud.translate.spi.v2 + com.google.cloud.translate.testing + com.google.cloud.translate.v3 + com.google.cloud.translate.v3.stub + com.google.cloud.translate.v3beta1 + com.google.cloud.translate.v3beta1.stub com.google.common.annotations com.google.common.base + com.google.common.base.internal com.google.common.cache com.google.common.collect com.google.common.escape com.google.common.eventbus + com.google.common.graph com.google.common.hash com.google.common.html com.google.common.io @@ -62,34 +170,33 @@ com.google.common.primitives com.google.common.reflect com.google.common.util.concurrent + com.google.common.util.concurrent.internal com.google.common.xml + com.google.errorprone.annotations + com.google.errorprone.annotations.concurrent + com.google.geo.type com.google.gson com.google.gson.annotations com.google.gson.internal com.google.gson.internal.bind com.google.gson.internal.bind.util + com.google.gson.internal.reflect + com.google.gson.internal.sql com.google.gson.reflect com.google.gson.stream - com.microsoft.schemas.compatibility - com.microsoft.schemas.compatibility.impl - com.microsoft.schemas.office.excel - com.microsoft.schemas.office.excel.impl - com.microsoft.schemas.office.office - com.microsoft.schemas.office.office.impl - com.microsoft.schemas.office.visio.x2012.main - com.microsoft.schemas.office.visio.x2012.main.impl - com.microsoft.schemas.office.x2006.digsig - com.microsoft.schemas.office.x2006.digsig.impl - com.microsoft.schemas.office.x2006.encryption - com.microsoft.schemas.office.x2006.encryption.impl - com.microsoft.schemas.office.x2006.keyEncryptor.certificate - com.microsoft.schemas.office.x2006.keyEncryptor.certificate.impl - com.microsoft.schemas.office.x2006.keyEncryptor.password - com.microsoft.schemas.office.x2006.keyEncryptor.password.impl - com.microsoft.schemas.vml - com.microsoft.schemas.vml.impl - com.sun.activation.registries - com.sun.activation.viewers + com.google.iam.v1 + com.google.iam.v1.logging + com.google.j2objc.annotations + com.google.logging.type + com.google.longrunning + com.google.longrunning.stub + com.google.protobuf + com.google.protobuf.compiler + com.google.protobuf.util + com.google.rpc + com.google.rpc.context + com.google.thirdparty.publicsuffix + com.google.type com.sun.jna com.sun.jna.platform com.sun.jna.platform.dnd @@ -99,15 +206,6 @@ com.sun.jna.platform.wince com.sun.jna.ptr com.sun.jna.win32 - com.sun.mail.auth - com.sun.mail.handlers - com.sun.mail.iap - com.sun.mail.imap - com.sun.mail.imap.protocol - com.sun.mail.pop3 - com.sun.mail.smtp - com.sun.mail.util - com.sun.mail.util.logging com.twelvemonkeys.image com.twelvemonkeys.imageio com.twelvemonkeys.imageio.color @@ -143,94 +241,9 @@ com.twelvemonkeys.util.regex com.twelvemonkeys.util.service com.twelvemonkeys.xml - javassist - javassist.bytecode - javassist.bytecode.analysis - javassist.bytecode.annotation - javassist.bytecode.stackmap - javassist.compiler - javassist.compiler.ast - javassist.convert - javassist.expr - javassist.runtime - javassist.scopedpool - javassist.tools - javassist.tools.reflect - javassist.tools.rmi - javassist.tools.web - javassist.util - javassist.util.proxy - javax.activation javax.annotation javax.annotation.concurrent javax.annotation.meta - javax.annotation.security - javax.ejb - javax.ejb.spi - javax.enterprise.deploy.model - javax.enterprise.deploy.model.exceptions - javax.enterprise.deploy.shared - javax.enterprise.deploy.shared.factories - javax.enterprise.deploy.spi - javax.enterprise.deploy.spi.exceptions - javax.enterprise.deploy.spi.factories - javax.enterprise.deploy.spi.status - javax.interceptor - javax.jms - javax.jws - javax.jws.soap - javax.mail - javax.mail.event - javax.mail.internet - javax.mail.search - javax.mail.util - javax.management.j2ee - javax.management.j2ee.statistics - javax.persistence - javax.persistence.spi - javax.resource - javax.resource.cci - javax.resource.spi - javax.resource.spi.endpoint - javax.resource.spi.security - javax.resource.spi.work - javax.security.jacc - javax.servlet - javax.servlet.http - javax.transaction - javax.transaction.xa - javax.xml - javax.xml.bind - javax.xml.bind.annotation - javax.xml.bind.annotation.adapters - javax.xml.bind.attachment - javax.xml.bind.helpers - javax.xml.bind.util - javax.xml.namespace - javax.xml.parsers - javax.xml.registry - javax.xml.registry.infomodel - javax.xml.rpc - javax.xml.rpc.encoding - javax.xml.rpc.handler - javax.xml.rpc.handler.soap - javax.xml.rpc.holders - javax.xml.rpc.server - javax.xml.rpc.soap - javax.xml.soap - javax.xml.stream - javax.xml.stream.events - javax.xml.stream.util - javax.xml.transform - javax.xml.transform.dom - javax.xml.transform.sax - javax.xml.transform.stream - javax.xml.ws - javax.xml.ws.handler - javax.xml.ws.handler.soap - javax.xml.ws.http - javax.xml.ws.soap - javax.xml.ws.spi jfxtras.animation jfxtras.css jfxtras.css.converters @@ -238,16 +251,8 @@ jfxtras.scene.control jfxtras.scene.layout jfxtras.util - org.apache.avalon.framework - org.apache.avalon.framework.activity - org.apache.avalon.framework.component - org.apache.avalon.framework.configuration - org.apache.avalon.framework.container - org.apache.avalon.framework.context - org.apache.avalon.framework.logger - org.apache.avalon.framework.parameters - org.apache.avalon.framework.service - org.apache.avalon.framework.thread + net.htmlparser.jericho + net.htmlparser.jericho.nodoc org.apache.commons.codec org.apache.commons.codec.binary org.apache.commons.codec.cli @@ -255,6 +260,18 @@ org.apache.commons.codec.language org.apache.commons.codec.language.bm org.apache.commons.codec.net + org.apache.commons.collections + org.apache.commons.collections.bag + org.apache.commons.collections.bidimap + org.apache.commons.collections.buffer + org.apache.commons.collections.collection + org.apache.commons.collections.comparators + org.apache.commons.collections.functors + org.apache.commons.collections.iterators + org.apache.commons.collections.keyvalue + org.apache.commons.collections.list + org.apache.commons.collections.map + org.apache.commons.collections.set org.apache.commons.collections4 org.apache.commons.collections4.bag org.apache.commons.collections4.bidimap @@ -274,35 +291,6 @@ org.apache.commons.collections4.splitmap org.apache.commons.collections4.trie org.apache.commons.collections4.trie.analyzer - org.apache.commons.compress - org.apache.commons.compress.archivers - org.apache.commons.compress.archivers.ar - org.apache.commons.compress.archivers.arj - org.apache.commons.compress.archivers.cpio - org.apache.commons.compress.archivers.dump - org.apache.commons.compress.archivers.examples - org.apache.commons.compress.archivers.jar - org.apache.commons.compress.archivers.sevenz - org.apache.commons.compress.archivers.tar - org.apache.commons.compress.archivers.zip - org.apache.commons.compress.changes - org.apache.commons.compress.compressors - org.apache.commons.compress.compressors.brotli - org.apache.commons.compress.compressors.bzip2 - org.apache.commons.compress.compressors.deflate - org.apache.commons.compress.compressors.deflate64 - org.apache.commons.compress.compressors.gzip - org.apache.commons.compress.compressors.lz4 - org.apache.commons.compress.compressors.lz77support - org.apache.commons.compress.compressors.lzma - org.apache.commons.compress.compressors.lzw - org.apache.commons.compress.compressors.pack200 - org.apache.commons.compress.compressors.snappy - org.apache.commons.compress.compressors.xz - org.apache.commons.compress.compressors.z - org.apache.commons.compress.compressors.zstandard - org.apache.commons.compress.parallel - org.apache.commons.compress.utils org.apache.commons.csv org.apache.commons.io org.apache.commons.io.comparator @@ -334,31 +322,17 @@ org.apache.commons.lang3.tuple org.apache.commons.logging org.apache.commons.logging.impl - org.apache.geronimo.mail.handlers - org.apache.geronimo.mail.util - org.apache.log - org.apache.log.filter - org.apache.log.format - org.apache.log.output - org.apache.log.output.db - org.apache.log.output.io - org.apache.log.output.io.rotate - org.apache.log.output.jms - org.apache.log.output.net - org.apache.log.util + org.apache.commons.text + org.apache.commons.validator + org.apache.commons.validator.routines + org.apache.commons.validator.routines.checkdigit + org.apache.commons.validator.util org.apache.log4j org.apache.log4j.chainsaw org.apache.log4j.config org.apache.log4j.helpers org.apache.log4j.jdbc - org.apache.log4j.jmx - org.apache.log4j.lf5 - org.apache.log4j.lf5.util - org.apache.log4j.lf5.viewer - org.apache.log4j.lf5.viewer.categoryexplorer - org.apache.log4j.lf5.viewer.configure org.apache.log4j.net - org.apache.log4j.nt org.apache.log4j.or org.apache.log4j.or.jms org.apache.log4j.or.sax @@ -367,165 +341,6 @@ org.apache.log4j.spi org.apache.log4j.varia org.apache.log4j.xml - org.apache.poi - org.apache.poi.common.usermodel - org.apache.poi.common.usermodel.fonts - org.apache.poi.ddf - org.apache.poi.extractor - org.apache.poi.extractor.ole2 - org.apache.poi.hdgf - org.apache.poi.hdgf.chunks - org.apache.poi.hdgf.dev - org.apache.poi.hdgf.exceptions - org.apache.poi.hdgf.extractor - org.apache.poi.hdgf.pointers - org.apache.poi.hdgf.streams - org.apache.poi.hemf.extractor - org.apache.poi.hemf.hemfplus.record - org.apache.poi.hemf.record - org.apache.poi.hmef - org.apache.poi.hmef.attribute - org.apache.poi.hmef.dev - org.apache.poi.hmef.extractor - org.apache.poi.hpbf - org.apache.poi.hpbf.dev - org.apache.poi.hpbf.extractor - org.apache.poi.hpbf.model - org.apache.poi.hpbf.model.qcbits - org.apache.poi.hpsf - org.apache.poi.hpsf.extractor - org.apache.poi.hpsf.wellknown - org.apache.poi.hslf.blip - org.apache.poi.hslf.dev - org.apache.poi.hslf.exceptions - org.apache.poi.hslf.extractor - org.apache.poi.hslf.model - org.apache.poi.hslf.model.textproperties - org.apache.poi.hslf.record - org.apache.poi.hslf.usermodel - org.apache.poi.hslf.util - org.apache.poi.hsmf - org.apache.poi.hsmf.datatypes - org.apache.poi.hsmf.dev - org.apache.poi.hsmf.exceptions - org.apache.poi.hsmf.extractor - org.apache.poi.hsmf.parsers - org.apache.poi.hssf - org.apache.poi.hssf.converter - org.apache.poi.hssf.dev - org.apache.poi.hssf.eventmodel - org.apache.poi.hssf.eventusermodel - org.apache.poi.hssf.eventusermodel.dummyrecord - org.apache.poi.hssf.extractor - org.apache.poi.hssf.model - org.apache.poi.hssf.record - org.apache.poi.hssf.record.aggregates - org.apache.poi.hssf.record.cf - org.apache.poi.hssf.record.chart - org.apache.poi.hssf.record.common - org.apache.poi.hssf.record.cont - org.apache.poi.hssf.record.crypto - org.apache.poi.hssf.record.pivottable - org.apache.poi.hssf.usermodel - org.apache.poi.hssf.usermodel.helpers - org.apache.poi.hssf.util - org.apache.poi.hwmf.draw - org.apache.poi.hwmf.record - org.apache.poi.hwmf.usermodel - org.apache.poi.hwpf - org.apache.poi.hwpf.converter - org.apache.poi.hwpf.dev - org.apache.poi.hwpf.extractor - org.apache.poi.hwpf.model - org.apache.poi.hwpf.model.io - org.apache.poi.hwpf.model.types - org.apache.poi.hwpf.sprm - org.apache.poi.hwpf.usermodel - org.apache.poi.ooxml - org.apache.poi.ooxml.extractor - org.apache.poi.ooxml.util - org.apache.poi.openxml4j.exceptions - org.apache.poi.openxml4j.opc - org.apache.poi.openxml4j.opc.internal - org.apache.poi.openxml4j.opc.internal.marshallers - org.apache.poi.openxml4j.opc.internal.unmarshallers - org.apache.poi.openxml4j.util - org.apache.poi.poifs.common - org.apache.poi.poifs.crypt - org.apache.poi.poifs.crypt.agile - org.apache.poi.poifs.crypt.binaryrc4 - org.apache.poi.poifs.crypt.cryptoapi - org.apache.poi.poifs.crypt.dsig - org.apache.poi.poifs.crypt.dsig.facets - org.apache.poi.poifs.crypt.dsig.services - org.apache.poi.poifs.crypt.standard - org.apache.poi.poifs.crypt.temp - org.apache.poi.poifs.crypt.xor - org.apache.poi.poifs.dev - org.apache.poi.poifs.eventfilesystem - org.apache.poi.poifs.filesystem - org.apache.poi.poifs.macros - org.apache.poi.poifs.nio - org.apache.poi.poifs.property - org.apache.poi.poifs.storage - org.apache.poi.sl.draw - org.apache.poi.sl.draw.binding - org.apache.poi.sl.draw.geom - org.apache.poi.sl.extractor - org.apache.poi.sl.image - org.apache.poi.sl.usermodel - org.apache.poi.ss - org.apache.poi.ss.excelant - org.apache.poi.ss.excelant.util - org.apache.poi.ss.extractor - org.apache.poi.ss.format - org.apache.poi.ss.formula - org.apache.poi.ss.formula.atp - org.apache.poi.ss.formula.constant - org.apache.poi.ss.formula.eval - org.apache.poi.ss.formula.eval.forked - org.apache.poi.ss.formula.function - org.apache.poi.ss.formula.functions - org.apache.poi.ss.formula.ptg - org.apache.poi.ss.formula.udf - org.apache.poi.ss.usermodel - org.apache.poi.ss.usermodel.charts - org.apache.poi.ss.usermodel.helpers - org.apache.poi.ss.util - org.apache.poi.ss.util.cellwalk - org.apache.poi.util - org.apache.poi.wp.usermodel - org.apache.poi.xddf.usermodel - org.apache.poi.xddf.usermodel.chart - org.apache.poi.xddf.usermodel.text - org.apache.poi.xdgf.exceptions - org.apache.poi.xdgf.extractor - org.apache.poi.xdgf.geom - org.apache.poi.xdgf.usermodel - org.apache.poi.xdgf.usermodel.section - org.apache.poi.xdgf.usermodel.section.geometry - org.apache.poi.xdgf.usermodel.shape - org.apache.poi.xdgf.usermodel.shape.exceptions - org.apache.poi.xdgf.util - org.apache.poi.xdgf.xml - org.apache.poi.xslf.extractor - org.apache.poi.xslf.model - org.apache.poi.xslf.usermodel - org.apache.poi.xslf.util - org.apache.poi.xssf - org.apache.poi.xssf.binary - org.apache.poi.xssf.eventusermodel - org.apache.poi.xssf.extractor - org.apache.poi.xssf.model - org.apache.poi.xssf.streaming - org.apache.poi.xssf.usermodel - org.apache.poi.xssf.usermodel.charts - org.apache.poi.xssf.usermodel.extensions - org.apache.poi.xssf.usermodel.helpers - org.apache.poi.xssf.util - org.apache.poi.xwpf.extractor - org.apache.poi.xwpf.model - org.apache.poi.xwpf.usermodel org.apache.tools.ant org.apache.tools.ant.dispatch org.apache.tools.ant.filters @@ -586,51 +401,6 @@ org.apache.tools.mail org.apache.tools.tar org.apache.tools.zip - org.apache.xmlbeans - org.apache.xmlbeans.impl.common - org.apache.xmlbeans.impl.config - org.apache.xmlbeans.impl.inst2xsd - org.apache.xmlbeans.impl.inst2xsd.util - org.apache.xmlbeans.impl.jam - org.apache.xmlbeans.impl.jam.annotation - org.apache.xmlbeans.impl.jam.internal - org.apache.xmlbeans.impl.jam.internal.classrefs - org.apache.xmlbeans.impl.jam.internal.elements - org.apache.xmlbeans.impl.jam.internal.javadoc - org.apache.xmlbeans.impl.jam.internal.parser - org.apache.xmlbeans.impl.jam.internal.reflect - org.apache.xmlbeans.impl.jam.mutable - org.apache.xmlbeans.impl.jam.provider - org.apache.xmlbeans.impl.jam.visitor - org.apache.xmlbeans.impl.jam.xml - org.apache.xmlbeans.impl.regex - org.apache.xmlbeans.impl.richParser - org.apache.xmlbeans.impl.schema - org.apache.xmlbeans.impl.soap - org.apache.xmlbeans.impl.store - org.apache.xmlbeans.impl.tool - org.apache.xmlbeans.impl.util - org.apache.xmlbeans.impl.validator - org.apache.xmlbeans.impl.values - org.apache.xmlbeans.impl.xb.ltgfmt - org.apache.xmlbeans.impl.xb.ltgfmt.impl - org.apache.xmlbeans.impl.xb.substwsdl - org.apache.xmlbeans.impl.xb.substwsdl.impl - org.apache.xmlbeans.impl.xb.xmlconfig - org.apache.xmlbeans.impl.xb.xmlconfig.impl - org.apache.xmlbeans.impl.xb.xmlschema - org.apache.xmlbeans.impl.xb.xmlschema.impl - org.apache.xmlbeans.impl.xb.xsdownload - org.apache.xmlbeans.impl.xb.xsdownload.impl - org.apache.xmlbeans.impl.xb.xsdschema - org.apache.xmlbeans.impl.xb.xsdschema.impl - org.apache.xmlbeans.impl.xpathgen - org.apache.xmlbeans.impl.xsd2inst - org.apache.xmlbeans.soap - org.apache.xmlbeans.xml.stream - org.apache.xmlbeans.xml.stream.events - org.apache.xmlbeans.xml.stream.utils - org.apache.xmlcommons org.controlsfx.control org.controlsfx.control.action org.controlsfx.control.cell @@ -646,22 +416,6 @@ org.controlsfx.tools org.controlsfx.validation org.controlsfx.validation.decoration - org.dom4j - org.dom4j.bean - org.dom4j.datatype - org.dom4j.dom - org.dom4j.dtd - org.dom4j.io - org.dom4j.jaxb - org.dom4j.rule - org.dom4j.rule.pattern - org.dom4j.swing - org.dom4j.tree - org.dom4j.util - org.dom4j.xpath - org.dom4j.xpp - org.etsi.uri.x01903.v13 - org.etsi.uri.x01903.v13.impl org.freedesktop.gstreamer org.freedesktop.gstreamer.device org.freedesktop.gstreamer.elements @@ -704,307 +458,479 @@ org.opencv.photo org.opencv.utils org.opencv.video - org.openxmlformats.schemas.drawingml.x2006.chart - org.openxmlformats.schemas.drawingml.x2006.chart.impl - org.openxmlformats.schemas.drawingml.x2006.main - org.openxmlformats.schemas.drawingml.x2006.main.impl - org.openxmlformats.schemas.drawingml.x2006.picture - org.openxmlformats.schemas.drawingml.x2006.picture.impl - org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing - org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl - org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing - org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl - org.openxmlformats.schemas.officeDocument.x2006.customProperties - org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl - org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes - org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl - org.openxmlformats.schemas.officeDocument.x2006.extendedProperties - org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl - org.openxmlformats.schemas.officeDocument.x2006.relationships - org.openxmlformats.schemas.officeDocument.x2006.relationships.impl - org.openxmlformats.schemas.presentationml.x2006.main - org.openxmlformats.schemas.presentationml.x2006.main.impl - org.openxmlformats.schemas.spreadsheetml.x2006.main - org.openxmlformats.schemas.spreadsheetml.x2006.main.impl - org.openxmlformats.schemas.wordprocessingml.x2006.main - org.openxmlformats.schemas.wordprocessingml.x2006.main.impl - org.openxmlformats.schemas.xpackage.x2006.digitalSignature - org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl - org.reflections - org.reflections.adapters - org.reflections.scanners - org.reflections.serializers - org.reflections.util - org.reflections.vfs org.sleuthkit.autopsy.corelibs org.slf4j + org.slf4j.event org.slf4j.helpers - org.slf4j.impl org.slf4j.spi - org.w3.x2000.x09.xmldsig - org.w3.x2000.x09.xmldsig.impl - org.w3c.dom - org.w3c.dom.css - org.w3c.dom.events - org.w3c.dom.html - org.w3c.dom.ranges - org.w3c.dom.stylesheets - org.w3c.dom.traversal - org.w3c.dom.views - org.xml.sax - org.xml.sax.ext - org.xml.sax.helpers - repackage - schemaorg_apache_xmlbeans.system.s8C3F193EE11A2F798ACF65489B9E6078 - schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443 - schemaorg_apache_xmlbeans.system.sXMLCONFIG - schemaorg_apache_xmlbeans.system.sXMLLANG - schemaorg_apache_xmlbeans.system.sXMLSCHEMA - schemaorg_apache_xmlbeans.system.sXMLTOOLS - ext/imageio-thumbsdb-3.2.jar - release/modules/ext/imageio-thumbsdb-3.2.jar + ext/animal-sniffer-annotations-1.21.jar + release/modules/ext/animal-sniffer-annotations-1.21.jar - ext/ant-launcher-1.8.2.jar - release/modules/ext/ant-launcher-1.8.2.jar + ext/annotations-4.1.1.4.jar + release/modules/ext/annotations-4.1.1.4.jar - ext/logkit-1.0.1.jar - release/modules/ext/logkit-1.0.1.jar + ext/ant-1.10.12.jar + release/modules/ext/ant-1.10.12.jar - ext/gst1-java-core-1.4.0.jar - release\modules\ext\gst1-java-core-1.4.0.jar + ext/ant-launcher-1.10.12.jar + release/modules/ext/ant-launcher-1.10.12.jar - ext/imageio-jpeg-3.2.jar - release/modules/ext/imageio-jpeg-3.2.jar - - - ext/compiler-0.9.1.jar - release/modules/ext/compiler-0.9.1.jar - - - ext/LGoodDatePicker-10.3.1.jar - release/modules/ext/LGoodDatePicker-10.3.1.jar - - - ext/imageio-iff-3.2.jar - release/modules/ext/imageio-iff-3.2.jar - - - ext/imageio-icns-3.2.jar - release/modules/ext/imageio-icns-3.2.jar + ext/api-common-2.1.4.jar + release/modules/ext/api-common-2.1.4.jar ext/AppleJavaExtensions-1.4.jar release/modules/ext/AppleJavaExtensions-1.4.jar - ext/sigar-1.6.4.jar - release/modules/ext/sigar-1.6.4.jar + ext/auto-value-annotations-1.9.jar + release/modules/ext/auto-value-annotations-1.9.jar - ext/gson-2.8.5.jar - release/modules/ext/gson-2.8.5.jar + ext/bcpkix-jdk15on-1.70.jar + release/modules/ext/bcpkix-jdk15on-1.70.jar - ext/jfxtras-common-8.0-r4.jar - release/modules/ext/jfxtras-common-8.0-r4.jar + ext/bcprov-jdk15on-1.70.jar + release/modules/ext/bcprov-jdk15on-1.70.jar - ext/jsr305-1.3.9.jar - release/modules/ext/jsr305-1.3.9.jar + ext/bcutil-jdk15on-1.70.jar + release/modules/ext/bcutil-jdk15on-1.70.jar - ext/xml-apis-1.0.b2.jar - release/modules/ext/xml-apis-1.0.b2.jar + ext/checker-qual-3.21.3.jar + release/modules/ext/checker-qual-3.21.3.jar - ext/imgscalr-lib-4.2.jar - release/modules/ext/imgscalr-lib-4.2.jar + ext/common-image-3.8.2.jar + release/modules/ext/common-image-3.8.2.jar - ext/commons-lang3-3.4.jar - release\modules\ext\commons-lang3-3.4.jar + ext/common-io-3.8.2.jar + release/modules/ext/common-io-3.8.2.jar - ext/common-io-3.2.jar - release/modules/ext/common-io-3.2.jar + ext/common-lang-3.8.2.jar + release/modules/ext/common-lang-3.8.2.jar - ext/xmlbeans-3.0.2.jar - release/modules/ext/xmlbeans-3.0.2.jar + ext/commons-beanutils-1.9.4.jar + release/modules/ext/commons-beanutils-1.9.4.jar - ext/imageio-tga-3.2.jar - release/modules/ext/imageio-tga-3.2.jar + ext/commons-codec-1.15.jar + release/modules/ext/commons-codec-1.15.jar - ext/imageio-pnm-3.2.jar - release/modules/ext/imageio-pnm-3.2.jar + ext/commons-collections-3.2.2.jar + release/modules/ext/commons-collections-3.2.2.jar - ext/slf4j-api-1.6.1.jar - release/modules/ext/slf4j-api-1.6.1.jar + ext/commons-collections4-4.4.jar + release/modules/ext/commons-collections4-4.4.jar - ext/poi-scratchpad-4.0.1.jar - release\modules\ext\poi-scratchpad-4.0.1.jar + ext/commons-csv-1.9.0.jar + release/modules/ext/commons-csv-1.9.0.jar - ext/imageio-psd-3.2.jar - release/modules/ext/imageio-psd-3.2.jar + ext/commons-digester-2.1.jar + release/modules/ext/commons-digester-2.1.jar - ext/servlet-api-2.5.jar - release/modules/ext/servlet-api-2.5.jar - - - ext/poi-ooxml-4.0.1.jar - release\modules\ext\poi-ooxml-4.0.1.jar - - - ext/commons-codec-1.11.jar - release/modules/ext/commons-codec-1.11.jar - - - ext/imageio-pcx-3.2.jar - release/modules/ext/imageio-pcx-3.2.jar - - - ext/log4j-core-2.17.2.jar - release/modules/ext/log4j-core-2.17.2.jar - - - ext/avalon-framework-4.1.5.jar - release/modules/ext/avalon-framework-4.1.5.jar - - - ext/imageio-tiff-3.2.jar - release/modules/ext/imageio-tiff-3.2.jar - - - ext/jfxtras-controls-8.0-r4.jar - release/modules/ext/jfxtras-controls-8.0-r4.jar - - - ext/commons-csv-1.4.jar - release/modules/ext/commons-csv-1.4.jar - - - ext/imageio-sgi-3.2.jar - release/modules/ext/imageio-sgi-3.2.jar - - - ext/jfxtras-fxml-8.0-r4.jar - release/modules/ext/jfxtras-fxml-8.0-r4.jar - - - ext/joda-time-2.4.jar - release/modules/ext/joda-time-2.4.jar - - - ext/commons-compress-1.18.jar - release/modules/ext/commons-compress-1.18.jar - - - ext/jna-platform-5.11.0.jar - release\modules\ext\jna-platform-5.11.0.jar - - - ext/opencv-248.jar - release/modules/ext/opencv-248.jar - - - ext/slf4j-simple-1.6.1.jar - release/modules/ext/slf4j-simple-1.6.1.jar - - - ext/guava-19.0.jar - release/modules/ext/guava-19.0.jar - - - ext/commons-io-2.5.jar - release/modules/ext/commons-io-2.5.jar - - - ext/commons-collections4-4.2.jar - release\modules\ext\commons-collections4-4.2.jar - - - ext/imageio-bmp-3.2.jar - release/modules/ext/imageio-bmp-3.2.jar - - - ext/jna-5.11.0.jar - release\modules\ext\jna-5.11.0.jar + ext/commons-io-2.11.0.jar + release/modules/ext/commons-io-2.11.0.jar ext/commons-lang-2.6.jar release/modules/ext/commons-lang-2.6.jar - ext/reflections-0.9.8.jar - release/modules/ext/reflections-0.9.8.jar + ext/commons-lang3-3.12.0.jar + release/modules/ext/commons-lang3-3.12.0.jar - ext/ant-1.8.2.jar - release/modules/ext/ant-1.8.2.jar + ext/commons-logging-1.2.jar + release/modules/ext/commons-logging-1.2.jar - ext/javassist-3.12.1.GA.jar - release/modules/ext/javassist-3.12.1.GA.jar + ext/commons-text-1.9.jar + release/modules/ext/commons-text-1.9.jar - ext/imageio-core-3.2.jar - release/modules/ext/imageio-core-3.2.jar + ext/commons-validator-1.7.jar + release/modules/ext/commons-validator-1.7.jar - ext/poi-4.0.1.jar - release\modules\ext\poi-4.0.1.jar + ext/compiler-0.9.10.jar + release/modules/ext/compiler-0.9.10.jar - ext/poi-excelant-4.0.1.jar - release\modules\ext\poi-excelant-4.0.1.jar - - - ext/commons-logging-1.1.2.jar - release/modules/ext/commons-logging-1.1.2.jar + ext/conscrypt-openjdk-uber-2.5.1.jar + release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar ext/controlsfx-8.40.11.jar release/modules/ext/controlsfx-8.40.11.jar - ext/common-image-3.2.jar - release/modules/ext/common-image-3.2.jar + ext/dd-plist-1.23.jar + release/modules/ext/dd-plist-1.23.jar - ext/poi-ooxml-schemas-4.0.1.jar - release\modules\ext\poi-ooxml-schemas-4.0.1.jar + ext/error_prone_annotations-2.11.0.jar + release/modules/ext/error_prone_annotations-2.11.0.jar - ext/imageio-pict-3.2.jar - release/modules/ext/imageio-pict-3.2.jar + ext/failureaccess-1.0.1.jar + release/modules/ext/failureaccess-1.0.1.jar - ext/common-lang-3.2.jar - release/modules/ext/common-lang-3.2.jar + ext/gax-2.12.2.jar + release/modules/ext/gax-2.12.2.jar - ext/dd-plist-1.20.jar - release/modules/ext/dd-plist-1.20.jar + ext/gax-grpc-2.12.2.jar + release/modules/ext/gax-grpc-2.12.2.jar - ext/dom4j-1.6.1.jar - release/modules/ext/dom4j-1.6.1.jar + ext/gax-httpjson-0.97.2.jar + release/modules/ext/gax-httpjson-0.97.2.jar - ext/imageio-metadata-3.2.jar - release/modules/ext/imageio-metadata-3.2.jar + ext/google-api-client-1.33.2.jar + release/modules/ext/google-api-client-1.33.2.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-auth-library-credentials-1.5.3.jar + release/modules/ext/google-auth-library-credentials-1.5.3.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-cloud-core-2.5.6.jar + release/modules/ext/google-cloud-core-2.5.6.jar + + + ext/google-cloud-core-http-2.5.6.jar + release/modules/ext/google-cloud-core-http-2.5.6.jar + + + ext/google-cloud-translate-2.1.11.jar + release/modules/ext/google-cloud-translate-2.1.11.jar + + + ext/google-http-client-1.41.4.jar + release/modules/ext/google-http-client-1.41.4.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-appengine-1.41.4.jar + release/modules/ext/google-http-client-appengine-1.41.4.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-jackson2-1.41.4.jar + release/modules/ext/google-http-client-jackson2-1.41.4.jar + + + ext/google-oauth-client-1.33.1.jar + release/modules/ext/google-oauth-client-1.33.1.jar + + + ext/grpc-alts-1.44.1.jar + release/modules/ext/grpc-alts-1.44.1.jar + + + ext/grpc-api-1.44.1.jar + release/modules/ext/grpc-api-1.44.1.jar + + + ext/grpc-auth-1.44.1.jar + release/modules/ext/grpc-auth-1.44.1.jar + + + ext/grpc-context-1.44.1.jar + release/modules/ext/grpc-context-1.44.1.jar + + + ext/grpc-core-1.44.1.jar + release/modules/ext/grpc-core-1.44.1.jar + + + ext/grpc-grpclb-1.44.1.jar + release/modules/ext/grpc-grpclb-1.44.1.jar + + + ext/grpc-netty-shaded-1.44.1.jar + release/modules/ext/grpc-netty-shaded-1.44.1.jar + + + ext/grpc-protobuf-1.44.1.jar + release/modules/ext/grpc-protobuf-1.44.1.jar + + + ext/grpc-protobuf-lite-1.44.1.jar + release/modules/ext/grpc-protobuf-lite-1.44.1.jar + + + ext/grpc-services-1.44.1.jar + release/modules/ext/grpc-services-1.44.1.jar + + + ext/grpc-stub-1.44.1.jar + release/modules/ext/grpc-stub-1.44.1.jar + + + ext/grpc-xds-1.44.1.jar + release/modules/ext/grpc-xds-1.44.1.jar + + + ext/gson-2.9.0.jar + release/modules/ext/gson-2.9.0.jar + + + ext/gst1-java-core-1.4.0.jar + release/modules/ext/gst1-java-core-1.4.0.jar + + + ext/guava-31.1-jre.jar + release/modules/ext/guava-31.1-jre.jar + + + ext/httpclient-4.5.13.jar + release/modules/ext/httpclient-4.5.13.jar + + + ext/httpcore-4.4.15.jar + release/modules/ext/httpcore-4.4.15.jar + + + ext/imageio-bmp-3.8.2.jar + release/modules/ext/imageio-bmp-3.8.2.jar + + + ext/imageio-core-3.8.2.jar + release/modules/ext/imageio-core-3.8.2.jar + + + ext/imageio-icns-3.8.2.jar + release/modules/ext/imageio-icns-3.8.2.jar + + + ext/imageio-iff-3.8.2.jar + release/modules/ext/imageio-iff-3.8.2.jar + + + ext/imageio-jpeg-3.8.2.jar + release/modules/ext/imageio-jpeg-3.8.2.jar + + + ext/imageio-metadata-3.8.2.jar + release/modules/ext/imageio-metadata-3.8.2.jar + + + ext/imageio-pcx-3.8.2.jar + release/modules/ext/imageio-pcx-3.8.2.jar + + + ext/imageio-pict-3.8.2.jar + release/modules/ext/imageio-pict-3.8.2.jar + + + ext/imageio-pnm-3.8.2.jar + release/modules/ext/imageio-pnm-3.8.2.jar + + + ext/imageio-psd-3.8.2.jar + release/modules/ext/imageio-psd-3.8.2.jar + + + ext/imageio-sgi-3.8.2.jar + release/modules/ext/imageio-sgi-3.8.2.jar + + + ext/imageio-tga-3.8.2.jar + release/modules/ext/imageio-tga-3.8.2.jar + + + ext/imageio-thumbsdb-3.8.2.jar + release/modules/ext/imageio-thumbsdb-3.8.2.jar + + + ext/imageio-tiff-3.8.2.jar + release/modules/ext/imageio-tiff-3.8.2.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/jackson-annotations-2.13.2.jar + release/modules/ext/jackson-annotations-2.13.2.jar + + + ext/jackson-core-2.13.2.jar + release/modules/ext/jackson-core-2.13.2.jar + + + ext/jackson-databind-2.13.2.jar + release/modules/ext/jackson-databind-2.13.2.jar + + + ext/jackson-dataformat-csv-2.13.2.jar + release/modules/ext/jackson-dataformat-csv-2.13.2.jar + + + ext/javax.annotation-api-1.3.2.jar + release/modules/ext/javax.annotation-api-1.3.2.jar + + + ext/jericho-html-3.4.jar + release/modules/ext/jericho-html-3.4.jar + + + ext/jfxtras-common-8.0-r4.jar + release/modules/ext/jfxtras-common-8.0-r4.jar + + + ext/jfxtras-controls-8.0-r4.jar + release/modules/ext/jfxtras-controls-8.0-r4.jar + + + ext/jfxtras-fxml-8.0-r4.jar + release/modules/ext/jfxtras-fxml-8.0-r4.jar + + + ext/jna-5.11.0.jar + release/modules/ext/jna-5.11.0.jar + + + ext/jna-platform-5.11.0.jar + release/modules/ext/jna-platform-5.11.0.jar + + + ext/joda-time-2.10.14.jar + release/modules/ext/joda-time-2.10.14.jar + + + ext/jsr305-3.0.2.jar + release/modules/ext/jsr305-3.0.2.jar + + + ext/LGoodDatePicker-11.2.1.jar + release/modules/ext/LGoodDatePicker-11.2.1.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.17.2.jar + release/modules/ext/log4j-api-2.17.2.jar + + + ext/log4j-core-2.17.2.jar + release/modules/ext/log4j-core-2.17.2.jar + + + ext/ooxml-schemas-1.4.jar + release/modules/ext/ooxml-schemas-1.4.jar + + + ext/opencensus-api-0.31.0.jar + release/modules/ext/opencensus-api-0.31.0.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/opencv-248.jar + release/modules/ext/opencv-248.jar + + + ext/perfmark-api-0.23.0.jar + release/modules/ext/perfmark-api-0.23.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-v3beta1-0.83.11.jar + release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar + + + ext/proto-google-common-protos-2.7.4.jar + release/modules/ext/proto-google-common-protos-2.7.4.jar + + + ext/proto-google-iam-v1-1.2.6.jar + release/modules/ext/proto-google-iam-v1-1.2.6.jar + + + ext/protobuf-java-3.19.4.jar + release/modules/ext/protobuf-java-3.19.4.jar + + + ext/protobuf-java-util-3.19.4.jar + release/modules/ext/protobuf-java-util-3.19.4.jar + + + ext/re2j-1.5.jar + release/modules/ext/re2j-1.5.jar + + + ext/reload4j-1.2.19.jar + release/modules/ext/reload4j-1.2.19.jar + + + ext/sigar-1.6.4.jar + release/modules/ext/sigar-1.6.4.jar + + + ext/slf4j-api-1.7.36.jar + release/modules/ext/slf4j-api-1.7.36.jar + + + ext/slf4j-reload4j-1.7.36.jar + release/modules/ext/slf4j-reload4j-1.7.36.jar + + + ext/threetenbp-1.5.2.jar + release/modules/ext/threetenbp-1.5.2.jar + + + ext/webp-imageio-sejda-0.1.0.jar + release/modules/ext/webp-imageio-sejda-0.1.0.jar diff --git a/CoreTestLibs/build.xml b/CoreTestLibs/build.xml new file mode 100644 index 0000000000..50fa43ef1a --- /dev/null +++ b/CoreTestLibs/build.xml @@ -0,0 +1,23 @@ + + + + + + Builds, tests, and runs the project org.sleuthkit.autopsy.coretestlibs. + + + + + + + + + + + + + + + + + diff --git a/CoreTestLibs/ivy.xml b/CoreTestLibs/ivy.xml new file mode 100644 index 0000000000..e75402e304 --- /dev/null +++ b/CoreTestLibs/ivy.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/CoreTestLibs/ivysettings.xml b/CoreTestLibs/ivysettings.xml new file mode 100644 index 0000000000..fd792f6844 --- /dev/null +++ b/CoreTestLibs/ivysettings.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/CoreTestLibs/manifest.mf b/CoreTestLibs/manifest.mf new file mode 100644 index 0000000000..16a872ce8e --- /dev/null +++ b/CoreTestLibs/manifest.mf @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +AutoUpdate-Show-In-Client: true +OpenIDE-Module: org.sleuthkit.autopsy.coretestlibs +OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/coretestlibs/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/CoreTestLibs/nbproject/build-impl.xml b/CoreTestLibs/nbproject/build-impl.xml new file mode 100644 index 0000000000..8a342001d9 --- /dev/null +++ b/CoreTestLibs/nbproject/build-impl.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreTestLibs/nbproject/platform.properties b/CoreTestLibs/nbproject/platform.properties new file mode 100644 index 0000000000..b6989617a7 --- /dev/null +++ b/CoreTestLibs/nbproject/platform.properties @@ -0,0 +1,5 @@ +cluster.path=\ + ${nbplatform.active.dir}/harness:\ + ${nbplatform.active.dir}/java:\ + ${nbplatform.active.dir}/platform +nbplatform.active=default diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties new file mode 100644 index 0000000000..2b50b4d9f9 --- /dev/null +++ b/CoreTestLibs/nbproject/project.properties @@ -0,0 +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.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-3.5.7.jar=release/modules/ext/mockito-core-3.5.7.jar +file.reference.objenesis-3.1.jar=release/modules/ext/objenesis-3.1.jar +javac.source=1.8 +javac.compilerargs=-Xlint -Xlint:-serial diff --git a/CoreTestLibs/nbproject/project.xml b/CoreTestLibs/nbproject/project.xml new file mode 100644 index 0000000000..f5e420cced --- /dev/null +++ b/CoreTestLibs/nbproject/project.xml @@ -0,0 +1,72 @@ + + + org.netbeans.modules.apisupport.project + + + org.sleuthkit.autopsy.coretestlibs + + + + junit.extensions + junit.framework + junit.runner + junit.textui + org.hamcrest + org.hamcrest.core + org.hamcrest.internal + org.junit + org.junit.experimental + org.junit.experimental.categories + org.junit.experimental.max + org.junit.experimental.results + org.junit.experimental.runners + org.junit.experimental.theories + org.junit.experimental.theories.internal + org.junit.experimental.theories.suppliers + org.junit.function + org.junit.internal + org.junit.internal.builders + org.junit.internal.management + org.junit.internal.matchers + org.junit.internal.requests + org.junit.internal.runners + org.junit.internal.runners.model + org.junit.internal.runners.rules + org.junit.internal.runners.statements + org.junit.matchers + org.junit.rules + org.junit.runner + org.junit.runner.manipulation + org.junit.runner.notification + org.junit.runners + org.junit.runners.model + org.junit.runners.parameterized + org.junit.validator + + + ext/byte-buddy-1.10.13.jar + release/modules/ext/byte-buddy-1.10.13.jar + + + ext/byte-buddy-agent-1.10.13.jar + release/modules/ext/byte-buddy-agent-1.10.13.jar + + + ext/hamcrest-core-1.3.jar + release/modules/ext/hamcrest-core-1.3.jar + + + ext/junit-4.13.2.jar + release/modules/ext/junit-4.13.2.jar + + + ext/mockito-core-3.5.7.jar + release/modules/ext/mockito-core-3.5.7.jar + + + ext/objenesis-3.1.jar + release/modules/ext/objenesis-3.1.jar + + + + diff --git a/CoreTestLibs/src/mockito-extensions/org.mockito.plugins.MockMaker b/CoreTestLibs/src/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 0000000000..ca6ee9cea8 --- /dev/null +++ b/CoreTestLibs/src/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline \ No newline at end of file diff --git a/CoreTestLibs/src/org/sleuthkit/autopsy/coretestlibs/Bundle.properties b/CoreTestLibs/src/org/sleuthkit/autopsy/coretestlibs/Bundle.properties new file mode 100644 index 0000000000..3fc2d5ec56 --- /dev/null +++ b/CoreTestLibs/src/org/sleuthkit/autopsy/coretestlibs/Bundle.properties @@ -0,0 +1 @@ +OpenIDE-Module-Name=Autopsy-CoreTestLibs diff --git a/Experimental/ivy.xml b/Experimental/ivy.xml index 207cc89e96..24982bee01 100644 --- a/Experimental/ivy.xml +++ b/Experimental/ivy.xml @@ -5,11 +5,6 @@ - - - - - diff --git a/Experimental/ivysettings.xml b/Experimental/ivysettings.xml index 68919d4dd4..4b11b0eb39 100644 --- a/Experimental/ivysettings.xml +++ b/Experimental/ivysettings.xml @@ -7,4 +7,5 @@ + diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties index 0df575faba..200f7cbe1d 100644 --- a/Experimental/nbproject/project.properties +++ b/Experimental/nbproject/project.properties @@ -1,11 +1,4 @@ -file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar -file.reference.jackson-core-2.7.0.jar=release/modules/ext/jackson-core-2.7.0.jar file.reference.jtidy-r938.jar=release/modules/ext/jtidy-r938.jar -file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar -file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar -file.reference.postgresql-9.4-1201-jdbc41.jar=release/modules/ext/postgresql-9.4-1201-jdbc41.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial -javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar -source.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-sources.jar spec.version.base=1.0 diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml index 34734e4954..26eeafb76c 100644 --- a/Experimental/nbproject/project.xml +++ b/Experimental/nbproject/project.xml @@ -174,22 +174,6 @@ ext/jtidy-r938.jar release/modules/ext/jtidy-r938.jar - - ext/LGoodDatePicker-10.3.1.jar - release/modules/ext/LGoodDatePicker-10.3.1.jar - - - ext/mchange-commons-java-0.2.9.jar - release/modules/ext/mchange-commons-java-0.2.9.jar - - - ext/jackson-core-2.7.0.jar - release/modules/ext/jackson-core-2.7.0.jar - - - ext/c3p0-0.9.5.jar - release/modules/ext/c3p0-0.9.5.jar - diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/VolatilityProcessor.java b/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/VolatilityProcessor.java index 61272d1468..0cf51886c2 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/VolatilityProcessor.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/VolatilityProcessor.java @@ -381,7 +381,7 @@ class VolatilityProcessor { Collection attributes = singleton(new BlackboardAttribute(TSK_SET_NAME, VOLATILITY, setName)); // Create artifact if it doesn't already exist. - if (!blackboard.artifactExists(resolvedFile, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ITEM, attributes)) { + if (!blackboard.artifactExists(resolvedFile, BlackboardArtifact.Type.TSK_INTERESTING_ITEM, attributes)) { BlackboardArtifact volArtifact = resolvedFile.newAnalysisResult( BlackboardArtifact.Type.TSK_INTERESTING_ITEM, Score.SCORE_LIKELY_NOTABLE, null, setName, null, diff --git a/ImageGallery/nbproject/project.properties b/ImageGallery/nbproject/project.properties index e400c96aab..273f96d9d9 100644 --- a/ImageGallery/nbproject/project.properties +++ b/ImageGallery/nbproject/project.properties @@ -1,4 +1,4 @@ -file.reference.sqlite-jdbc-3.7.8-SNAPSHOT.jar=release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar +file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial license.file=LICENSE-2.0.txt diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java index e520e2d0ec..e64834a440 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableFile.java @@ -36,7 +36,7 @@ import javafx.scene.image.Image; import javafx.util.Pair; import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.text.WordUtils; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; import org.sleuthkit.autopsy.coreutils.Logger; diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 05cd7612d4..1d1a6e22fe 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -15,43 +15,46 @@ - - + + + - - - - - - - - - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + + + + + + + + + + + + diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml index 8209151a1c..a776ab49c3 100644 --- a/KeywordSearch/ivysettings.xml +++ b/KeywordSearch/ivysettings.xml @@ -6,4 +6,5 @@ + diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index e73b0e4bef..48d0ba30c6 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -1,68 +1,52 @@ -file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar -file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar -file.reference.c3p0-0.9.1.1.jar=release/modules/ext/c3p0-0.9.1.1.jar -file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar -file.reference.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar -file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils-1.9.2.jar -file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar -file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar -file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar -file.reference.commons-io-2.6.jar=release/modules/ext/commons-io-2.6.jar +file.reference.annotations-12.0.jar=release/modules/ext/annotations-12.0.jar +file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar +file.reference.commons-io-2.8.0.jar=release/modules/ext/commons-io-2.8.0.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar -file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar -file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar -file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar -file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar -file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar -file.reference.guava-18.0.jar=release/modules/ext/guava-18.0.jar -file.reference.httpclient-4.5.10.jar=release/modules/ext/httpclient-4.5.10.jar -file.reference.httpcore-4.4.12.jar=release/modules/ext/httpcore-4.4.12.jar -file.reference.httpmime-4.5.10.jar=release/modules/ext/httpmime-4.5.10.jar -file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar -file.reference.icu4j-3.8.jar=release/modules/ext/icu4j-3.8.jar -file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar -file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar -file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar -file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar -file.reference.jericho-html-3.3.jar=release\\modules\\ext\\jericho-html-3.3.jar -file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar -file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar -file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar -file.reference.language-detector-0.6.jar=release\\modules\\ext\\language-detector-0.6.jar -file.reference.libsvm-3.1.jar=release/modules/ext/libsvm-3.1.jar -file.reference.lucene-core-4.0.0.jar=release/modules/ext/lucene-core-4.0.0.jar -file.reference.lucene-queries-4.0.0.jar=release/modules/ext/lucene-queries-4.0.0.jar -file.reference.lucene-sandbox-4.0.0.jar=release/modules/ext/lucene-sandbox-4.0.0.jar -file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar -file.reference.openaifsm-0.0.1.jar=release/modules/ext/openaifsm-0.0.1.jar -file.reference.opennlp-maxent-3.0.3.jar=release/modules/ext/opennlp-maxent-3.0.3.jar -file.reference.poi-4.0.1.jar=release/modules/ext/poi-4.0.1.jar -file.reference.poi-ooxml-4.0.1.jar=release/modules/ext/poi-ooxml-4.0.1.jar -file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas-4.0.1.jar -file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar -file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar -file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar -file.reference.slf4j-api-1.7.25.jar=release/modules/ext/slf4j-api-1.7.25.jar +file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar +file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar +file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar +file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.http2-client-9.4.44.v20210927.jar=release/modules/ext/http2-client-9.4.44.v20210927.jar +file.reference.http2-common-9.4.44.v20210927.jar=release/modules/ext/http2-common-9.4.44.v20210927.jar +file.reference.http2-hpack-9.4.44.v20210927.jar=release/modules/ext/http2-hpack-9.4.44.v20210927.jar +file.reference.http2-http-client-transport-9.4.44.v20210927.jar=release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar +file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar +file.reference.httpcore-4.4.14.jar=release/modules/ext/httpcore-4.4.14.jar +file.reference.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.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar +file.reference.jcl-over-slf4j-1.7.24.jar=release/modules/ext/jcl-over-slf4j-1.7.24.jar +file.reference.jetty-alpn-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-client-9.4.44.v20210927.jar +file.reference.jetty-alpn-java-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-java-client-9.4.44.v20210927.jar +file.reference.jetty-alpn-openjdk8-client-9.4.44.v20210927.jar=release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar +file.reference.jetty-client-9.4.44.v20210927.jar=release/modules/ext/jetty-client-9.4.44.v20210927.jar +file.reference.jetty-http-9.4.44.v20210927.jar=release/modules/ext/jetty-http-9.4.44.v20210927.jar +file.reference.jetty-io-9.4.44.v20210927.jar=release/modules/ext/jetty-io-9.4.44.v20210927.jar +file.reference.jetty-util-9.4.44.v20210927.jar=release/modules/ext/jetty-util-9.4.44.v20210927.jar +file.reference.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar +file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.jar +file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +file.reference.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar +file.reference.logback-core-1.2.10.jar=release/modules/ext/logback-core-1.2.10.jar +file.reference.netty-buffer-4.1.68.Final.jar=release/modules/ext/netty-buffer-4.1.68.Final.jar +file.reference.netty-codec-4.1.68.Final.jar=release/modules/ext/netty-codec-4.1.68.Final.jar +file.reference.netty-common-4.1.68.Final.jar=release/modules/ext/netty-common-4.1.68.Final.jar +file.reference.netty-handler-4.1.68.Final.jar=release/modules/ext/netty-handler-4.1.68.Final.jar +file.reference.netty-resolver-4.1.68.Final.jar=release/modules/ext/netty-resolver-4.1.68.Final.jar +file.reference.netty-tcnative-2.0.48.Final.jar=release/modules/ext/netty-tcnative-2.0.48.Final.jar +file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar +file.reference.netty-transport-4.1.68.Final.jar=release/modules/ext/netty-transport-4.1.68.Final.jar +file.reference.netty-transport-native-epoll-4.1.68.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar +file.reference.netty-transport-native-unix-common-4.1.68.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar +file.reference.snappy-java-1.1.7.6.jar=release/modules/ext/snappy-java-1.1.7.6.jar file.reference.solr-solrj-8.11.1.jar=release/modules/ext/solr-solrj-8.11.1.jar -file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar -file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar -file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar -file.reference.tika-core-1.20.jar=release/modules/ext/tika-core-1.20.jar -file.reference.tika-parsers-1.20.jar=release/modules/ext/tika-parsers-1.20.jar -file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar -file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar -file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar -file.reference.woodstox-core-asl-4.4.1.jar=release/modules/ext/woodstox-core-asl-4.4.1.jar -file.reference.xmlbeans-2.6.0.jar=release/modules/ext/xmlbeans-2.6.0.jar -file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar -file.reference.zookeeper-3.6.2.jar=release/modules/ext/zookeeper-3.6.2.jar -file.reference.annotations-12.0.jar=release\\modules\\ext\\annotations-12.0.jar -file.reference.jsonic-1.2.11.jar=release\\modules\\ext\\jsonic-1.2.11.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 javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt nbm.homepage=http://www.sleuthkit.org/autopsy/ nbm.needs.restart=true -source.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1-sources.jar -source.reference.solr-solrj-8.11.1.jar=release/modules/ext/solr-solrj-8.11.1-sources.jar spec.version.base=6.6 diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 6a3345927e..efdd08e8e3 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -141,6 +141,24 @@ + + + unit + + org.netbeans.libs.junit4 + + + + org.netbeans.modules.nbjunit + + + + + org.sleuthkit.autopsy.coretestlibs + + + + org.apache.commons.logging.impl org.apache.http @@ -217,184 +235,188 @@ org.sleuthkit.autopsy.keywordsearch - ext/findstructapi-0.0.1.jar - release/modules/ext/findstructapi-0.0.1.jar + ext/annotations-12.0.jar + release/modules/ext/annotations-12.0.jar - ext/commons-digester-1.8.1.jar - release\modules\ext\commons-digester-1.8.1.jar + ext/checker-qual-3.12.0.jar + release/modules/ext/checker-qual-3.12.0.jar - ext/jcommander-1.35.jar - release/modules/ext/jcommander-1.35.jar - - - ext/vorbis-java-core-0.8.jar - release/modules/ext/vorbis-java-core-0.8.jar - - - ext/lucene-sandbox-4.0.0.jar - release/modules/ext/lucene-sandbox-4.0.0.jar - - - ext/httpmime-4.5.10.jar - release/modules/ext/httpmime-4.5.10.jar - - - ext/jericho-html-3.3.jar - release\modules\ext\jericho-html-3.3.jar - - - ext/netcdf4-4.5.5.jar - release/modules/ext/netcdf4-4.5.5.jar - - - ext/cdm-4.5.5.jar - release/modules/ext/cdm-4.5.5.jar - - - ext/httpservices-4.5.5.jar - release/modules/ext/httpservices-4.5.5.jar - - - ext/java-libpst-0.8.1.jar - release/modules/ext/java-libpst-0.8.1.jar - - - ext/protobuf-java-2.5.0.jar - release/modules/ext/protobuf-java-2.5.0.jar - - - ext/lucene-queries-4.0.0.jar - release/modules/ext/lucene-queries-4.0.0.jar - - - ext/boilerpipe-1.1.0.jar - release/modules/ext/boilerpipe-1.1.0.jar - - - ext/juniversalchardet-1.0.3.jar - release/modules/ext/juniversalchardet-1.0.3.jar + ext/commons-io-2.8.0.jar + release/modules/ext/commons-io-2.8.0.jar ext/commons-lang-2.6.jar release/modules/ext/commons-lang-2.6.jar - ext/quartz-2.2.0.jar - release/modules/ext/quartz-2.2.0.jar + ext/commons-math3-3.6.1.jar + release/modules/ext/commons-math3-3.6.1.jar - ext/libsvm-3.1.jar - release/modules/ext/libsvm-3.1.jar + ext/error_prone_annotations-2.11.0.jar + release/modules/ext/error_prone_annotations-2.11.0.jar - ext/slf4j-api-1.7.25.jar - release/modules/ext/slf4j-api-1.7.25.jar + ext/failureaccess-1.0.1.jar + release/modules/ext/failureaccess-1.0.1.jar - ext/icu4j-3.8.jar - release/modules/ext/icu4j-3.8.jar + ext/guava-31.1-jre.jar + release/modules/ext/guava-31.1-jre.jar - ext/poi-4.0.1.jar - release/modules/ext/poi-4.0.1.jar + ext/http2-client-9.4.44.v20210927.jar + release/modules/ext/http2-client-9.4.44.v20210927.jar + + + ext/http2-common-9.4.44.v20210927.jar + release/modules/ext/http2-common-9.4.44.v20210927.jar + + + ext/http2-hpack-9.4.44.v20210927.jar + release/modules/ext/http2-hpack-9.4.44.v20210927.jar + + + ext/http2-http-client-transport-9.4.44.v20210927.jar + release/modules/ext/http2-http-client-transport-9.4.44.v20210927.jar + + + ext/httpclient-4.5.13.jar + release/modules/ext/httpclient-4.5.13.jar + + + ext/httpcore-4.4.14.jar + release/modules/ext/httpcore-4.4.14.jar + + + ext/httpmime-4.5.13.jar + release/modules/ext/httpmime-4.5.13.jar + + + ext/icu4j-70.1.jar + release/modules/ext/icu4j-70.1.jar + + + ext/j2objc-annotations-1.3.jar + release/modules/ext/j2objc-annotations-1.3.jar + + + ext/jcl-over-slf4j-1.7.24.jar + release/modules/ext/jcl-over-slf4j-1.7.24.jar + + + ext/jetty-alpn-client-9.4.44.v20210927.jar + release/modules/ext/jetty-alpn-client-9.4.44.v20210927.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-openjdk8-client-9.4.44.v20210927.jar + release/modules/ext/jetty-alpn-openjdk8-client-9.4.44.v20210927.jar + + + ext/jetty-client-9.4.44.v20210927.jar + release/modules/ext/jetty-client-9.4.44.v20210927.jar + + + ext/jetty-http-9.4.44.v20210927.jar + release/modules/ext/jetty-http-9.4.44.v20210927.jar + + + ext/jetty-io-9.4.44.v20210927.jar + release/modules/ext/jetty-io-9.4.44.v20210927.jar + + + ext/jetty-util-9.4.44.v20210927.jar + release/modules/ext/jetty-util-9.4.44.v20210927.jar + + + ext/jsonic-1.2.11.jar + release/modules/ext/jsonic-1.2.11.jar ext/language-detector-0.6.jar - release\modules\ext\language-detector-0.6.jar + release/modules/ext/language-detector-0.6.jar - ext/guava-18.0.jar - release/modules/ext/guava-18.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/joda-time-2.2.jar - release/modules/ext/joda-time-2.2.jar + ext/logback-classic-1.2.10.jar + release/modules/ext/logback-classic-1.2.10.jar - ext/jcip-annotations-1.0.jar - release/modules/ext/jcip-annotations-1.0.jar + ext/logback-core-1.2.10.jar + release/modules/ext/logback-core-1.2.10.jar - ext/commons-validator-1.5.1.jar - release/modules/ext/commons-validator-1.5.1.jar + ext/netty-buffer-4.1.68.Final.jar + release/modules/ext/netty-buffer-4.1.68.Final.jar - ext/commons-logging-1.2.jar - release\modules\ext\commons-logging-1.2.jar + ext/netty-codec-4.1.68.Final.jar + release/modules/ext/netty-codec-4.1.68.Final.jar - ext/bzip2-0.9.1.jar - release/modules/ext/bzip2-0.9.1.jar + ext/netty-common-4.1.68.Final.jar + release/modules/ext/netty-common-4.1.68.Final.jar - ext/cleartk-util-2.0.0.jar - release/modules/ext/cleartk-util-2.0.0.jar + ext/netty-handler-4.1.68.Final.jar + release/modules/ext/netty-handler-4.1.68.Final.jar - ext/grib-4.5.5.jar - release/modules/ext/grib-4.5.5.jar + ext/netty-resolver-4.1.68.Final.jar + release/modules/ext/netty-resolver-4.1.68.Final.jar - ext/httpcore-4.4.12.jar - release/modules/ext/httpcore-4.4.12.jar + ext/netty-tcnative-2.0.48.Final.jar + release/modules/ext/netty-tcnative-2.0.48.Final.jar - ext/jdom-1.0.jar - release/modules/ext/jdom-1.0.jar + ext/netty-tcnative-classes-2.0.48.Final.jar + release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar - ext/commons-beanutils-1.9.2.jar - release/modules/ext/commons-beanutils-1.9.2.jar + ext/netty-transport-4.1.68.Final.jar + release/modules/ext/netty-transport-4.1.68.Final.jar - ext/ehcache-core-2.6.2.jar - release/modules/ext/ehcache-core-2.6.2.jar + ext/netty-transport-native-epoll-4.1.68.Final.jar + release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar - ext/poi-ooxml-schemas-4.0.1.jar - release/modules/ext/poi-ooxml-schemas-4.0.1.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/zookeeper-3.6.2.jar - release/modules/ext/zookeeper-3.6.2.jar - - - ext/commons-collections-3.2.2.jar - release/modules/ext/commons-collections-3.2.2.jar - - - ext/commons-io-2.6.jar - release/modules/ext/commons-io-2.6.jar - - - ext/annotations-12.0.jar - release\modules\ext\annotations-12.0.jar - - - ext/openaifsm-0.0.1.jar - release/modules/ext/openaifsm-0.0.1.jar - - - ext/stax2-api-3.1.4.jar - release/modules/ext/stax2-api-3.1.4.jar - - - ext/httpclient-4.5.10.jar - release/modules/ext/httpclient-4.5.10.jar + ext/snappy-java-1.1.7.6.jar + release/modules/ext/snappy-java-1.1.7.6.jar ext/solr-solrj-8.11.1.jar release/modules/ext/solr-solrj-8.11.1.jar - ext/vorbis-java-tika-0.8.jar - release/modules/ext/vorbis-java-tika-0.8.jar + ext/stax2-api-4.2.1.jar + release/modules/ext/stax2-api-4.2.1.jar - ext/xmpcore-5.1.3.jar - release/modules/ext/xmpcore-5.1.3.jar + ext/woodstox-core-6.2.4.jar + release/modules/ext/woodstox-core-6.2.4.jar + + + ext/zookeeper-3.8.0.jar + release/modules/ext/zookeeper-3.8.0.jar + + + ext/zookeeper-jute-3.8.0.jar + release/modules/ext/zookeeper-jute-3.8.0.jar diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java index 4c18749f31..2fc6faa7f4 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java @@ -32,7 +32,7 @@ import java.util.TreeMap; import java.util.logging.Level; import java.util.stream.Collectors; import javax.annotation.concurrent.GuardedBy; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.solr.client.solrj.SolrQuery; @@ -533,14 +533,14 @@ class HighlightedText implements IndexedText { // Must be done before highlighting tags are added. If we were to // perform HTML escaping after adding the highlighting tags we would // not see highlighted text in the content viewer. - text = StringEscapeUtils.escapeHtml(text); + text = StringEscapeUtils.escapeHtml4(text); TreeRangeSet highlights = TreeRangeSet.create(); //for each keyword find the locations of hits and record them in the RangeSet for (String keyword : keywords) { //we also need to escape the keyword so that it matches the escaped text - final String escapedKeyword = StringEscapeUtils.escapeHtml(keyword); + final String escapedKeyword = StringEscapeUtils.escapeHtml4(keyword); int searchOffset = 0; int hitOffset = StringUtils.indexOfIgnoreCase(text, escapedKeyword, searchOffset); while (hitOffset != -1) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java index bc63f4dddf..c47a7bd23e 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java @@ -2003,7 +2003,15 @@ public class Server { NamedList cluster = (NamedList) statusResponse.getResponse().get("cluster"); @SuppressWarnings("unchecked") - ArrayList liveNodes = (ArrayList) cluster.get("live_nodes"); + List liveNodes = (ArrayList) cluster.get("live_nodes"); + + if (liveNodes != null) { + liveNodes = liveNodes.stream() + .map(serverStr -> serverStr.endsWith("_solr") + ? serverStr.substring(0, serverStr.length() - "_solr".length()) + : serverStr) + .collect(Collectors.toList()); + } return liveNodes; } catch (Exception ex) { // intentional "catch all" as Solr is known to throw all kinds of Runtime exceptions diff --git a/RecentActivity/ivysettings.xml b/RecentActivity/ivysettings.xml index 8209151a1c..a776ab49c3 100644 --- a/RecentActivity/ivysettings.xml +++ b/RecentActivity/ivysettings.xml @@ -6,4 +6,5 @@ + diff --git a/RecentActivity/nbproject/project.properties b/RecentActivity/nbproject/project.properties index aab9fa2a60..b94a108e6e 100644 --- a/RecentActivity/nbproject/project.properties +++ b/RecentActivity/nbproject/project.properties @@ -1,4 +1,5 @@ file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar +file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml index 11dc55cab6..d4bde92950 100644 --- a/RecentActivity/nbproject/project.xml +++ b/RecentActivity/nbproject/project.xml @@ -54,6 +54,15 @@ 9.4.1 + + org.sleuthkit.autopsy.Tika + + + + 1 + 23 + + org.sleuthkit.autopsy.core @@ -78,6 +87,10 @@ ext/Rejistry-1.1-SNAPSHOT.jar release/modules/ext/Rejistry-1.1-SNAPSHOT.jar + + ext/sqlite-jdbc-3.25.2.jar + release/modules/ext/sqlite-jdbc-3.25.2.jar + diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chromium.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chromium.java index c18d40fb00..1d22f930b9 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chromium.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chromium.java @@ -351,13 +351,12 @@ class Chromium extends Extract { continue; } - final JsonParser parser = new JsonParser(); JsonElement jsonElement; JsonObject jElement, jRoot, jBookmark; JsonArray jBookmarkArray; try { - jsonElement = parser.parse(tempReader); + jsonElement = JsonParser.parseReader(tempReader); jElement = jsonElement.getAsJsonObject(); jRoot = jElement.get("roots").getAsJsonObject(); //NON-NLS jBookmark = jRoot.get("bookmark_bar").getAsJsonObject(); //NON-NLS diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java index 726c48322d..79974bf613 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java @@ -61,6 +61,7 @@ import java.util.AbstractMap; import java.util.ArrayList; import java.util.List; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -1098,7 +1099,7 @@ class ExtractRegistry extends Extract { Map userInfo = userInfoMap.remove(sid); if (userInfo != null) { addAccountInstance(accountMgr, osAccount, (DataSource) dataSource); - updateOsAccount(osAccount, userInfo, groupMap.get(sid), regAbstractFile); + updateOsAccount(osAccount, userInfo, groupMap.get(sid), regAbstractFile, ingestJobId); } } @@ -1106,7 +1107,7 @@ class ExtractRegistry extends Extract { for (Map userInfo : userInfoMap.values()) { OsAccount osAccount = accountMgr.newWindowsOsAccount(userInfo.get(SID_KEY), null, null, host, OsAccountRealm.RealmScope.LOCAL); accountMgr.newOsAccountInstance(osAccount, (DataSource) dataSource, OsAccountInstance.OsAccountInstanceType.LAUNCHED); - updateOsAccount(osAccount, userInfo, groupMap.get(userInfo.get(SID_KEY)), regAbstractFile); + updateOsAccount(osAccount, userInfo, groupMap.get(userInfo.get(SID_KEY)), regAbstractFile, ingestJobId); } return true; } catch (FileNotFoundException ex) { @@ -2041,13 +2042,16 @@ class ExtractRegistry extends Extract { * * @param regFile File the account was found in * @param emailAddress The emailAddress + * @param ingestJobId The ingest job id. */ - private void addEmailAccount(AbstractFile regFile, String emailAddress) { + private void addEmailAccount(AbstractFile regFile, String emailAddress, long ingestJobId) { try { currentCase.getSleuthkitCase() .getCommunicationsManager() .createAccountFileInstance(Account.Type.EMAIL, - emailAddress, getRAModuleName(), regFile); + emailAddress, getRAModuleName(), regFile, + Collections.emptyList(), + ingestJobId); } catch (TskCoreException ex) { logger.log(Level.SEVERE, String.format("Error adding email account with value " @@ -2080,13 +2084,13 @@ class ExtractRegistry extends Extract { * @param userInfo userInfo map from SAM file parsing. * @param groupList Group list from the SAM file parsing. * @param regFile Source file. + * @param ingestJobId * * @throws TskDataException * @throws TskCoreException */ - private void updateOsAccount(OsAccount osAccount, Map userInfo, List groupList, AbstractFile regFile) throws TskDataException, TskCoreException, NotUserSIDException { + private void updateOsAccount(OsAccount osAccount, Map userInfo, List groupList, AbstractFile regFile, long ingestJobId) throws TskDataException, TskCoreException, NotUserSIDException { Host host = ((DataSource) dataSource).getHost(); - SimpleDateFormat regRipperTimeFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy 'Z'", US); regRipperTimeFormat.setTimeZone(getTimeZone("GMT")); @@ -2139,7 +2143,7 @@ class ExtractRegistry extends Extract { value = userInfo.get(INTERNET_NAME_KEY); if (value != null && !value.isEmpty()) { - addEmailAccount(regFile, value); + addEmailAccount(regFile, value, ingestJobId); attributes.add(createOsAccountAttribute(ATTRIBUTE_TYPE.TSK_EMAIL, value, osAccount, host, regFile)); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java index 27bc0177ac..347bc537e5 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java @@ -934,13 +934,11 @@ class Firefox extends Extract { continue; } - final JsonParser parser = new JsonParser(); - JsonObject jsonRootObject; JsonArray jAddressesArray; try { - jsonRootObject = parser.parse(tempReader).getAsJsonObject(); + jsonRootObject = JsonParser.parseReader(tempReader).getAsJsonObject(); jAddressesArray = jsonRootObject.getAsJsonArray("addresses"); //NON-NLS } catch (JsonIOException | JsonSyntaxException | IllegalStateException ex) { logger.log(Level.WARNING, "Error parsing Json for Firefox Autofill profiles.", ex); //NON-NLS @@ -955,7 +953,8 @@ class Firefox extends Extract { helper = new WebBrowserArtifactsHelper( Case.getCurrentCaseThrows().getSleuthkitCase(), NbBundle.getMessage(this.getClass(), "Firefox.parentModuleName"), - profileFile + profileFile, + ingestJobId ); } catch (NoCurrentCaseException ex) { logger.log(Level.SEVERE, "No case open, bailing.", ex); //NON-NLS diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml index 141594e95a..745bff10de 100644 --- a/Testing/nbproject/project.xml +++ b/Testing/nbproject/project.xml @@ -50,6 +50,14 @@ 10.24 + + org.sleuthkit.autopsy.coretestlibs + + + + 1.0 + + org.sleuthkit.autopsy.keywordsearch diff --git a/Tika/ivy.xml b/Tika/ivy.xml index b943e9bfe5..096749a5e2 100755 --- a/Tika/ivy.xml +++ b/Tika/ivy.xml @@ -4,6 +4,21 @@ - + + + + + + + + + + + + + + + + diff --git a/Tika/ivysettings.xml b/Tika/ivysettings.xml index 9c3b496314..fd792f6844 100755 --- a/Tika/ivysettings.xml +++ b/Tika/ivysettings.xml @@ -6,4 +6,5 @@ + diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index d6b88685c4..f040facd2f 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -1,116 +1,120 @@ -file.reference.animal-sniffer-annotations-1.18.jar=release\\modules\\ext\\animal-sniffer-annotations-1.18.jar -file.reference.apache-mime4j-core-0.8.3.jar=release\\modules\\ext\\apache-mime4j-core-0.8.3.jar -file.reference.apache-mime4j-dom-0.8.3.jar=release\\modules\\ext\\apache-mime4j-dom-0.8.3.jar -file.reference.asm-7.2.jar=release\\modules\\ext\\asm-7.2.jar -file.reference.bcmail-jdk15on-1.64.jar=release\\modules\\ext\\bcmail-jdk15on-1.64.jar -file.reference.bcpkix-jdk15on-1.64.jar=release\\modules\\ext\\bcpkix-jdk15on-1.64.jar -file.reference.bcprov-jdk15on-1.64.jar=release\\modules\\ext\\bcprov-jdk15on-1.64.jar -file.reference.boilerpipe-1.1.0.jar=release\\modules\\ext\\boilerpipe-1.1.0.jar -file.reference.bzip2-0.9.1.jar=release\\modules\\ext\\bzip2-0.9.1.jar -file.reference.c3p0-0.9.5.4.jar=release\\modules\\ext\\c3p0-0.9.5.4.jar -file.reference.cdm-4.5.5.jar=release\\modules\\ext\\cdm-4.5.5.jar -file.reference.checker-qual-2.8.1.jar=release\\modules\\ext\\checker-qual-2.8.1.jar -file.reference.commons-codec-1.13.jar=release\\modules\\ext\\commons-codec-1.13.jar -file.reference.commons-collections4-4.4.jar=release\\modules\\ext\\commons-collections4-4.4.jar -file.reference.commons-compress-1.19.jar=release\\modules\\ext\\commons-compress-1.19.jar -file.reference.commons-csv-1.7.jar=release\\modules\\ext\\commons-csv-1.7.jar -file.reference.commons-exec-1.3.jar=release\\modules\\ext\\commons-exec-1.3.jar -file.reference.commons-io-2.6.jar=release\\modules\\ext\\commons-io-2.6.jar -file.reference.commons-lang3-3.9.jar=release\\modules\\ext\\commons-lang3-3.9.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.3.4.jar=release\\modules\\ext\\cxf-core-3.3.4.jar -file.reference.cxf-rt-frontend-jaxrs-3.3.4.jar=release\\modules\\ext\\cxf-rt-frontend-jaxrs-3.3.4.jar -file.reference.cxf-rt-rs-client-3.3.4.jar=release\\modules\\ext\\cxf-rt-rs-client-3.3.4.jar -file.reference.cxf-rt-security-3.3.4.jar=release\\modules\\ext\\cxf-rt-security-3.3.4.jar -file.reference.cxf-rt-transports-http-3.3.4.jar=release\\modules\\ext\\cxf-rt-transports-http-3.3.4.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.3.2.jar=release\\modules\\ext\\error_prone_annotations-2.3.2.jar -file.reference.failureaccess-1.0.1.jar=release\\modules\\ext\\failureaccess-1.0.1.jar -file.reference.FastInfoset-1.2.16.jar=release\\modules\\ext\\FastInfoset-1.2.16.jar -file.reference.fontbox-2.0.17.jar=release\\modules\\ext\\fontbox-2.0.17.jar -file.reference.geoapi-3.0.1.jar=release\\modules\\ext\\geoapi-3.0.1.jar -file.reference.grib-4.5.5.jar=release\\modules\\ext\\grib-4.5.5.jar -file.reference.gson-2.8.6.jar=release\\modules\\ext\\gson-2.8.6.jar -file.reference.guava-28.1-jre.jar=release\\modules\\ext\\guava-28.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.10.jar=release\\modules\\ext\\httpclient-4.5.10.jar -file.reference.httpcore-4.4.12.jar=release\\modules\\ext\\httpcore-4.4.12.jar -file.reference.httpmime-4.5.10.jar=release\\modules\\ext\\httpmime-4.5.10.jar -file.reference.httpservices-4.5.5.jar=release\\modules\\ext\\httpservices-4.5.5.jar -file.reference.isoparser-1.1.22.jar=release\\modules\\ext\\isoparser-1.1.22.jar -file.reference.istack-commons-runtime-3.0.8.jar=release\\modules\\ext\\istack-commons-runtime-3.0.8.jar -file.reference.j2objc-annotations-1.3.jar=release\\modules\\ext\\j2objc-annotations-1.3.jar -file.reference.jackcess-3.0.1.jar=release\\modules\\ext\\jackcess-3.0.1.jar -file.reference.jackcess-encrypt-3.0.0.jar=release\\modules\\ext\\jackcess-encrypt-3.0.0.jar -file.reference.jackson-annotations-2.10.1.jar=release\\modules\\ext\\jackson-annotations-2.10.1.jar -file.reference.jackson-core-2.10.1.jar=release\\modules\\ext\\jackson-core-2.10.1.jar -file.reference.jackson-databind-2.10.1.jar=release\\modules\\ext\\jackson-databind-2.10.1.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.1.jar=release\\modules\\ext\\jakarta.activation-1.2.1.jar -file.reference.jakarta.ws.rs-api-2.1.5.jar=release\\modules\\ext\\jakarta.ws.rs-api-2.1.5.jar -file.reference.jakarta.xml.bind-api-2.3.2.jar=release\\modules\\ext\\jakarta.xml.bind-api-2.3.2.jar -file.reference.java-libpst-0.8.1.jar=release\\modules\\ext\\java-libpst-0.8.1.jar -file.reference.javax.annotation-api-1.3.2.jar=release\\modules\\ext\\javax.annotation-api-1.3.2.jar -file.reference.jaxb-runtime-2.3.2.jar=release\\modules\\ext\\jaxb-runtime-2.3.2.jar -file.reference.jbig2-imageio-3.0.2.jar=release\\modules\\ext\\jbig2-imageio-3.0.2.jar -file.reference.jcip-annotations-1.0.jar=release\\modules\\ext\\jcip-annotations-1.0.jar -file.reference.jcl-over-slf4j-1.7.28.jar=release\\modules\\ext\\jcl-over-slf4j-1.7.28.jar -file.reference.jcommander-1.35.jar=release\\modules\\ext\\jcommander-1.35.jar -file.reference.jdom2-2.0.6.jar=release\\modules\\ext\\jdom2-2.0.6.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.jmatio-1.5.jar=release\\modules\\ext\\jmatio-1.5.jar -file.reference.jna-5.5.0.jar=release\\modules\\ext\\jna-5.5.0.jar -file.reference.joda-time-2.2.jar=release\\modules\\ext\\joda-time-2.2.jar -file.reference.json-simple-1.1.1.jar=release\\modules\\ext\\json-simple-1.1.1.jar -file.reference.jsoup-1.12.1.jar=release\\modules\\ext\\jsoup-1.12.1.jar -file.reference.jsr305-3.0.2.jar=release\\modules\\ext\\jsr305-3.0.2.jar -file.reference.jul-to-slf4j-1.7.28.jar=release\\modules\\ext\\jul-to-slf4j-1.7.28.jar -file.reference.juniversalchardet-1.0.3.jar=release\\modules\\ext\\juniversalchardet-1.0.3.jar -file.reference.junrar-4.0.0.jar=release\\modules\\ext\\junrar-4.0.0.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.15.jar=release\\modules\\ext\\mchange-commons-java-0.2.15.jar -file.reference.metadata-extractor-2.11.0.jar=release\\modules\\ext\\metadata-extractor-2.11.0.jar -file.reference.netcdf4-4.5.5.jar=release\\modules\\ext\\netcdf4-4.5.5.jar -file.reference.openjson-1.0.11.jar=release\\modules\\ext\\openjson-1.0.11.jar -file.reference.opennlp-tools-1.9.1.jar=release\\modules\\ext\\opennlp-tools-1.9.1.jar -file.reference.parso-2.0.11.jar=release\\modules\\ext\\parso-2.0.11.jar -file.reference.pdfbox-2.0.17.jar=release\\modules\\ext\\pdfbox-2.0.17.jar -file.reference.pdfbox-tools-2.0.17.jar=release\\modules\\ext\\pdfbox-tools-2.0.17.jar -file.reference.poi-4.1.1.jar=release\\modules\\ext\\poi-4.1.1.jar -file.reference.poi-ooxml-4.1.1.jar=release\\modules\\ext\\poi-ooxml-4.1.1.jar -file.reference.poi-ooxml-schemas-4.1.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.1.1.jar -file.reference.poi-scratchpad-4.1.1.jar=release\\modules\\ext\\poi-scratchpad-4.1.1.jar -file.reference.protobuf-java-3.11.0.jar=release\\modules\\ext\\protobuf-java-3.11.0.jar -file.reference.quartz-2.3.2.jar=release\\modules\\ext\\quartz-2.3.2.jar -file.reference.rome-1.12.2.jar=release\\modules\\ext\\rome-1.12.2.jar -file.reference.rome-utils-1.12.2.jar=release\\modules\\ext\\rome-utils-1.12.2.jar -file.reference.sentiment-analysis-parser-0.1.jar=release\\modules\\ext\\sentiment-analysis-parser-0.1.jar -file.reference.sis-feature-1.0.jar=release\\modules\\ext\\sis-feature-1.0.jar -file.reference.sis-metadata-1.0.jar=release\\modules\\ext\\sis-metadata-1.0.jar -file.reference.sis-netcdf-1.0.jar=release\\modules\\ext\\sis-netcdf-1.0.jar -file.reference.sis-referencing-1.0.jar=release\\modules\\ext\\sis-referencing-1.0.jar -file.reference.sis-storage-1.0.jar=release\\modules\\ext\\sis-storage-1.0.jar -file.reference.sis-utility-1.0.jar=release\\modules\\ext\\sis-utility-1.0.jar -file.reference.slf4j-api-1.7.28.jar=release\\modules\\ext\\slf4j-api-1.7.28.jar -file.reference.stax-ex-1.8.2.jar=release\\modules\\ext\\stax-ex-1.8.2.jar -file.reference.stax2-api-3.1.4.jar=release\\modules\\ext\\stax2-api-3.1.4.jar -file.reference.tagsoup-1.2.1.jar=release\\modules\\ext\\tagsoup-1.2.1.jar -file.reference.tika-core-1.23.jar=release\\modules\\ext\\tika-core-1.23.jar -file.reference.tika-parsers-1.23.jar=release\\modules\\ext\\tika-parsers-1.23.jar -file.reference.txw2-2.3.2.jar=release\\modules\\ext\\txw2-2.3.2.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.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-5.0.3.jar=release\\modules\\ext\\woodstox-core-5.0.3.jar -file.reference.xercesImpl-2.12.0.jar=release\\modules\\ext\\xercesImpl-2.12.0.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.2.4.jar=release\\modules\\ext\\xmlschema-core-2.2.4.jar -file.reference.xmpcore-5.1.3.jar=release\\modules\\ext\\xmpcore-5.1.3.jar -file.reference.xz-1.8.jar=release\\modules\\ext\\xz-1.8.jar +file.reference.apache-mime4j-core-0.8.4.jar=release/modules/ext/apache-mime4j-core-0.8.4.jar +file.reference.apache-mime4j-dom-0.8.4.jar=release/modules/ext/apache-mime4j-dom-0.8.4.jar +file.reference.asm-9.2.jar=release/modules/ext/asm-9.2.jar +file.reference.bcmail-jdk15on-1.70.jar=release/modules/ext/bcmail-jdk15on-1.70.jar +file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar +file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar +file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.jar +file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar +file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar +file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar +file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar +file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar +file.reference.commons-codec-1.15.jar=release/modules/ext/commons-codec-1.15.jar +file.reference.commons-collections4-4.4.jar=release/modules/ext/commons-collections4-4.4.jar +file.reference.commons-compress-1.21.jar=release/modules/ext/commons-compress-1.21.jar +file.reference.commons-csv-1.9.0.jar=release/modules/ext/commons-csv-1.9.0.jar +file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar +file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar +file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar +file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar +file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.jar +file.reference.curvesapi-1.06.jar=release/modules/ext/curvesapi-1.06.jar +file.reference.cxf-core-3.5.0.jar=release/modules/ext/cxf-core-3.5.0.jar +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.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.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar +file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar +file.reference.fontbox-2.0.25.jar=release/modules/ext/fontbox-2.0.25.jar +file.reference.geoapi-3.0.1.jar=release/modules/ext/geoapi-3.0.1.jar +file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar +file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar +file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.HikariCP-java7-2.4.13.jar=release/modules/ext/HikariCP-java7-2.4.13.jar +file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar +file.reference.httpcore-4.4.13.jar=release/modules/ext/httpcore-4.4.13.jar +file.reference.httpmime-4.5.13.jar=release/modules/ext/httpmime-4.5.13.jar +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-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar +file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar +file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar +file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annotations-2.13.2.jar +file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar +file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar +file.reference.jai-imageio-core-1.4.0.jar=release/modules/ext/jai-imageio-core-1.4.0.jar +file.reference.jakarta.activation-1.2.2.jar=release/modules/ext/jakarta.activation-1.2.2.jar +file.reference.jakarta.activation-api-1.2.2.jar=release/modules/ext/jakarta.activation-api-1.2.2.jar +file.reference.jakarta.annotation-api-1.3.5.jar=release/modules/ext/jakarta.annotation-api-1.3.5.jar +file.reference.jakarta.ws.rs-api-2.1.6.jar=release/modules/ext/jakarta.ws.rs-api-2.1.6.jar +file.reference.jakarta.xml.bind-api-2.3.3.jar=release/modules/ext/jakarta.xml.bind-api-2.3.3.jar +file.reference.java-libpst-0.9.3.jar=release/modules/ext/java-libpst-0.9.3.jar +file.reference.jaxb-runtime-2.3.5.jar=release/modules/ext/jaxb-runtime-2.3.5.jar +file.reference.jbig2-imageio-3.0.3.jar=release/modules/ext/jbig2-imageio-3.0.3.jar +file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar +file.reference.jcl-over-slf4j-1.7.36.jar=release/modules/ext/jcl-over-slf4j-1.7.36.jar +file.reference.jcommander-1.82.jar=release/modules/ext/jcommander-1.82.jar +file.reference.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.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar +file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar +file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar +file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar +file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar +file.reference.jul-to-slf4j-1.7.36.jar=release/modules/ext/jul-to-slf4j-1.7.36.jar +file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar +file.reference.junrar-7.4.1.jar=release/modules/ext/junrar-7.4.1.jar +file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +file.reference.mchange-commons-java-0.2.19.jar=release/modules/ext/mchange-commons-java-0.2.19.jar +file.reference.metadata-extractor-2.15.0.1.jar=release/modules/ext/metadata-extractor-2.15.0.1.jar +file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar +file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar +file.reference.openjson-1.0.12.jar=release/modules/ext/openjson-1.0.12.jar +file.reference.opennlp-tools-1.9.4.jar=release/modules/ext/opennlp-tools-1.9.4.jar +file.reference.parso-2.0.14.jar=release/modules/ext/parso-2.0.14.jar +file.reference.pdfbox-2.0.25.jar=release/modules/ext/pdfbox-2.0.25.jar +file.reference.pdfbox-tools-2.0.25.jar=release/modules/ext/pdfbox-tools-2.0.25.jar +file.reference.poi-4.1.2.jar=release/modules/ext/poi-4.1.2.jar +file.reference.poi-ooxml-4.1.2.jar=release/modules/ext/poi-ooxml-4.1.2.jar +file.reference.poi-ooxml-schemas-4.1.2.jar=release/modules/ext/poi-ooxml-schemas-4.1.2.jar +file.reference.poi-scratchpad-4.1.2.jar=release/modules/ext/poi-scratchpad-4.1.2.jar +file.reference.preflight-2.0.25.jar=release/modules/ext/preflight-2.0.25.jar +file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar +file.reference.quartz-2.3.2.jar=release/modules/ext/quartz-2.3.2.jar +file.reference.rome-1.18.0.jar=release/modules/ext/rome-1.18.0.jar +file.reference.rome-utils-1.18.0.jar=release/modules/ext/rome-utils-1.18.0.jar +file.reference.sentiment-analysis-parser-0.1.jar=release/modules/ext/sentiment-analysis-parser-0.1.jar +file.reference.sis-feature-1.1.jar=release/modules/ext/sis-feature-1.1.jar +file.reference.sis-metadata-1.1.jar=release/modules/ext/sis-metadata-1.1.jar +file.reference.sis-netcdf-1.1.jar=release/modules/ext/sis-netcdf-1.1.jar +file.reference.sis-referencing-1.1.jar=release/modules/ext/sis-referencing-1.1.jar +file.reference.sis-storage-1.1.jar=release/modules/ext/sis-storage-1.1.jar +file.reference.sis-utility-1.1.jar=release/modules/ext/sis-utility-1.1.jar +file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar +file.reference.SparseBitSet-1.2.jar=release/modules/ext/SparseBitSet-1.2.jar +file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar +file.reference.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.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 javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml index 7cd7a69bbf..9dc448105e 100755 --- a/Tika/nbproject/project.xml +++ b/Tika/nbproject/project.xml @@ -5,8 +5,181 @@ org.sleuthkit.autopsy.Tika - + + + org.sleuthkit.autopsy.corelibs + + + + 3 + 1.4 + + + + com.microsoft.schemas.office.excel + com.microsoft.schemas.office.excel.impl + com.microsoft.schemas.office.office + com.microsoft.schemas.office.office.impl + com.microsoft.schemas.office.visio.x2012.main + com.microsoft.schemas.office.visio.x2012.main.impl + org.apache.james.mime4j + org.apache.james.mime4j.dom + org.apache.james.mime4j.dom.address + org.apache.james.mime4j.dom.field + org.apache.james.mime4j.message + org.apache.james.mime4j.stream + org.apache.poi + org.apache.poi.common.usermodel + org.apache.poi.common.usermodel.fonts + org.apache.poi.ddf + org.apache.poi.extractor + org.apache.poi.extractor.ole2 + org.apache.poi.hdgf + org.apache.poi.hdgf.chunks + org.apache.poi.hdgf.dev + org.apache.poi.hdgf.exceptions + org.apache.poi.hdgf.extractor + org.apache.poi.hdgf.pointers + org.apache.poi.hdgf.streams + org.apache.poi.hmef + org.apache.poi.hmef.attribute + org.apache.poi.hmef.dev + org.apache.poi.hmef.extractor + org.apache.poi.hpbf + org.apache.poi.hpbf.dev + org.apache.poi.hpbf.extractor + org.apache.poi.hpbf.model + org.apache.poi.hpbf.model.qcbits + org.apache.poi.hpsf + org.apache.poi.hpsf.extractor + org.apache.poi.hpsf.wellknown + org.apache.poi.hslf.blip + org.apache.poi.hslf.dev + org.apache.poi.hslf.exceptions + org.apache.poi.hslf.extractor + org.apache.poi.hslf.model + org.apache.poi.hslf.model.textproperties + org.apache.poi.hslf.record + org.apache.poi.hslf.usermodel + org.apache.poi.hslf.util + org.apache.poi.hsmf + org.apache.poi.hsmf.datatypes + org.apache.poi.hsmf.dev + org.apache.poi.hsmf.exceptions + org.apache.poi.hsmf.extractor + org.apache.poi.hsmf.parsers + org.apache.poi.hssf + org.apache.poi.hssf.converter + org.apache.poi.hssf.eventmodel + org.apache.poi.hssf.eventusermodel + org.apache.poi.hssf.eventusermodel.dummyrecord + org.apache.poi.hssf.extractor + org.apache.poi.hssf.model + org.apache.poi.hssf.record + org.apache.poi.hssf.record.aggregates + org.apache.poi.hssf.record.cf + org.apache.poi.hssf.record.chart + org.apache.poi.hssf.record.common + org.apache.poi.hssf.record.cont + org.apache.poi.hssf.record.crypto + org.apache.poi.hssf.record.pivottable + org.apache.poi.hssf.usermodel + org.apache.poi.hssf.usermodel.helpers + org.apache.poi.hssf.util + org.apache.poi.hwmf.draw + org.apache.poi.hwmf.record + org.apache.poi.hwmf.usermodel + org.apache.poi.hwpf + org.apache.poi.hwpf.converter + org.apache.poi.hwpf.dev + org.apache.poi.hwpf.extractor + org.apache.poi.hwpf.model + org.apache.poi.hwpf.model.io + org.apache.poi.hwpf.model.types + org.apache.poi.hwpf.sprm + org.apache.poi.hwpf.usermodel + org.apache.poi.ooxml + org.apache.poi.ooxml.extractor + org.apache.poi.ooxml.util + org.apache.poi.openxml4j.exceptions + org.apache.poi.openxml4j.opc + org.apache.poi.openxml4j.opc.internal + org.apache.poi.openxml4j.opc.internal.marshallers + org.apache.poi.openxml4j.opc.internal.unmarshallers + org.apache.poi.openxml4j.util + org.apache.poi.poifs.common + org.apache.poi.poifs.crypt + org.apache.poi.poifs.crypt.agile + org.apache.poi.poifs.crypt.binaryrc4 + org.apache.poi.poifs.crypt.cryptoapi + org.apache.poi.poifs.crypt.dsig + org.apache.poi.poifs.crypt.dsig.facets + org.apache.poi.poifs.crypt.dsig.services + org.apache.poi.poifs.crypt.standard + org.apache.poi.poifs.crypt.temp + org.apache.poi.poifs.crypt.xor + org.apache.poi.poifs.dev + org.apache.poi.poifs.eventfilesystem + org.apache.poi.poifs.filesystem + org.apache.poi.poifs.macros + org.apache.poi.poifs.nio + org.apache.poi.poifs.property + org.apache.poi.poifs.storage + org.apache.poi.sl.draw + org.apache.poi.sl.draw.geom + org.apache.poi.sl.extractor + org.apache.poi.sl.image + org.apache.poi.sl.usermodel + org.apache.poi.ss + org.apache.poi.ss.extractor + org.apache.poi.ss.format + org.apache.poi.ss.formula + org.apache.poi.ss.formula.atp + org.apache.poi.ss.formula.constant + org.apache.poi.ss.formula.eval + org.apache.poi.ss.formula.eval.forked + org.apache.poi.ss.formula.function + org.apache.poi.ss.formula.functions + org.apache.poi.ss.formula.ptg + org.apache.poi.ss.formula.udf + org.apache.poi.ss.usermodel + org.apache.poi.ss.usermodel.charts + org.apache.poi.ss.usermodel.helpers + org.apache.poi.ss.util + org.apache.poi.ss.util.cellwalk + org.apache.poi.util + org.apache.poi.wp.usermodel + org.apache.poi.xddf.usermodel + org.apache.poi.xddf.usermodel.chart + org.apache.poi.xddf.usermodel.text + org.apache.poi.xdgf.exceptions + org.apache.poi.xdgf.extractor + org.apache.poi.xdgf.geom + org.apache.poi.xdgf.usermodel + org.apache.poi.xdgf.usermodel.section + org.apache.poi.xdgf.usermodel.section.geometry + org.apache.poi.xdgf.usermodel.shape + org.apache.poi.xdgf.usermodel.shape.exceptions + org.apache.poi.xdgf.util + org.apache.poi.xdgf.xml + org.apache.poi.xslf.extractor + org.apache.poi.xslf.model + org.apache.poi.xslf.usermodel + org.apache.poi.xslf.util + org.apache.poi.xssf + org.apache.poi.xssf.binary + org.apache.poi.xssf.eventusermodel + org.apache.poi.xssf.extractor + org.apache.poi.xssf.model + org.apache.poi.xssf.streaming + org.apache.poi.xssf.usermodel + org.apache.poi.xssf.usermodel.extensions + org.apache.poi.xssf.usermodel.helpers + org.apache.poi.xssf.util + org.apache.poi.xwpf.extractor + org.apache.poi.xwpf.model + org.apache.poi.xwpf.usermodel org.apache.tika org.apache.tika.concurrent org.apache.tika.config @@ -109,462 +282,550 @@ org.apache.tika.sax org.apache.tika.sax.xpath org.apache.tika.utils + org.apache.xmlbeans + org.apache.xmlbeans.impl.common + org.apache.xmlbeans.impl.config + org.apache.xmlbeans.impl.inst2xsd + org.apache.xmlbeans.impl.inst2xsd.util + org.apache.xmlbeans.impl.jam + org.apache.xmlbeans.impl.jam.annotation + org.apache.xmlbeans.impl.jam.internal + org.apache.xmlbeans.impl.jam.internal.classrefs + org.apache.xmlbeans.impl.jam.internal.elements + org.apache.xmlbeans.impl.jam.internal.javadoc + org.apache.xmlbeans.impl.jam.internal.parser + org.apache.xmlbeans.impl.jam.internal.reflect + org.apache.xmlbeans.impl.jam.provider + org.apache.xmlbeans.impl.jam.visitor + org.apache.xmlbeans.impl.jam.xml + org.apache.xmlbeans.impl.regex + org.apache.xmlbeans.impl.repackage + org.apache.xmlbeans.impl.richParser + org.apache.xmlbeans.impl.schema + org.apache.xmlbeans.impl.soap + org.apache.xmlbeans.impl.store + org.apache.xmlbeans.impl.tool + org.apache.xmlbeans.impl.util + org.apache.xmlbeans.impl.validator + org.apache.xmlbeans.impl.values + org.apache.xmlbeans.impl.xb.ltgfmt + org.apache.xmlbeans.impl.xb.ltgfmt.impl + org.apache.xmlbeans.impl.xb.substwsdl + org.apache.xmlbeans.impl.xb.substwsdl.impl + org.apache.xmlbeans.impl.xb.xmlconfig + org.apache.xmlbeans.impl.xb.xmlconfig.impl + org.apache.xmlbeans.impl.xb.xmlschema + org.apache.xmlbeans.impl.xb.xmlschema.impl + org.apache.xmlbeans.impl.xb.xsdownload + org.apache.xmlbeans.impl.xb.xsdownload.impl + org.apache.xmlbeans.impl.xb.xsdschema + org.apache.xmlbeans.impl.xb.xsdschema.impl + org.apache.xmlbeans.impl.xpath.saxon + org.apache.xmlbeans.impl.xpathgen + org.apache.xmlbeans.impl.xquery.saxon + org.apache.xmlbeans.impl.xsd2inst + org.apache.xmlbeans.soap + org.apache.xmlbeans.xml.stream + org.apache.xmlbeans.xml.stream.events + org.apache.xmlbeans.xml.stream.utils + org.apache.xmlcommons + org.openxmlformats.schemas.drawingml.x2006.chart + org.openxmlformats.schemas.drawingml.x2006.chart.impl + org.openxmlformats.schemas.drawingml.x2006.main + org.openxmlformats.schemas.drawingml.x2006.main.impl + org.openxmlformats.schemas.drawingml.x2006.picture + org.openxmlformats.schemas.drawingml.x2006.picture.impl + org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing + org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl + org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing + org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl + org.openxmlformats.schemas.officeDocument.x2006.customProperties + org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl + org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes + org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl + org.openxmlformats.schemas.officeDocument.x2006.extendedProperties + org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl + org.openxmlformats.schemas.officeDocument.x2006.relationships + org.openxmlformats.schemas.officeDocument.x2006.relationships.impl + org.openxmlformats.schemas.presentationml.x2006.main + org.openxmlformats.schemas.presentationml.x2006.main.impl + org.openxmlformats.schemas.spreadsheetml.x2006.main + org.openxmlformats.schemas.spreadsheetml.x2006.main.impl + org.openxmlformats.schemas.wordprocessingml.x2006.main + org.openxmlformats.schemas.wordprocessingml.x2006.main.impl + schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443 - ext/txw2-2.3.2.jar - release\modules\ext\txw2-2.3.2.jar + ext/apache-mime4j-core-0.8.4.jar + release/modules/ext/apache-mime4j-core-0.8.4.jar - ext/asm-7.2.jar - release\modules\ext\asm-7.2.jar + ext/apache-mime4j-dom-0.8.4.jar + release/modules/ext/apache-mime4j-dom-0.8.4.jar - ext/xmlbeans-3.1.0.jar - release\modules\ext\xmlbeans-3.1.0.jar + ext/asm-9.2.jar + release/modules/ext/asm-9.2.jar - ext/gson-2.8.6.jar - release\modules\ext\gson-2.8.6.jar + ext/bcmail-jdk15on-1.70.jar + release/modules/ext/bcmail-jdk15on-1.70.jar - ext/cdm-4.5.5.jar - release\modules\ext\cdm-4.5.5.jar + ext/bcpkix-jdk15on-1.70.jar + release/modules/ext/bcpkix-jdk15on-1.70.jar - ext/j2objc-annotations-1.3.jar - release\modules\ext\j2objc-annotations-1.3.jar + ext/bcprov-jdk15on-1.70.jar + release/modules/ext/bcprov-jdk15on-1.70.jar - ext/sis-referencing-1.0.jar - release\modules\ext\sis-referencing-1.0.jar - - - ext/failureaccess-1.0.1.jar - release\modules\ext\failureaccess-1.0.1.jar - - - ext/jackcess-3.0.1.jar - release\modules\ext\jackcess-3.0.1.jar - - - ext/jul-to-slf4j-1.7.28.jar - release\modules\ext\jul-to-slf4j-1.7.28.jar - - - ext/bcpkix-jdk15on-1.64.jar - release\modules\ext\bcpkix-jdk15on-1.64.jar + ext/bcutil-jdk15on-1.70.jar + release/modules/ext/bcutil-jdk15on-1.70.jar ext/boilerpipe-1.1.0.jar - release\modules\ext\boilerpipe-1.1.0.jar - - - ext/jakarta.ws.rs-api-2.1.5.jar - release\modules\ext\jakarta.ws.rs-api-2.1.5.jar - - - ext/poi-ooxml-schemas-4.1.1.jar - release\modules\ext\poi-ooxml-schemas-4.1.1.jar - - - ext/commons-codec-1.13.jar - release\modules\ext\commons-codec-1.13.jar - - - ext/fontbox-2.0.17.jar - release\modules\ext\fontbox-2.0.17.jar - - - ext/apache-mime4j-core-0.8.3.jar - release\modules\ext\apache-mime4j-core-0.8.3.jar - - - ext/jai-imageio-core-1.4.0.jar - release\modules\ext\jai-imageio-core-1.4.0.jar - - - ext/error_prone_annotations-2.3.2.jar - release\modules\ext\error_prone_annotations-2.3.2.jar - - - ext/json-simple-1.1.1.jar - release\modules\ext\json-simple-1.1.1.jar - - - ext/unit-api-1.0.jar - release\modules\ext\unit-api-1.0.jar - - - ext/FastInfoset-1.2.16.jar - release\modules\ext\FastInfoset-1.2.16.jar - - - ext/metadata-extractor-2.11.0.jar - release\modules\ext\metadata-extractor-2.11.0.jar - - - ext/jmatio-1.5.jar - release\modules\ext\jmatio-1.5.jar - - - ext/parso-2.0.11.jar - release\modules\ext\parso-2.0.11.jar - - - ext/jna-5.5.0.jar - release\modules\ext\jna-5.5.0.jar - - - ext/cxf-rt-frontend-jaxrs-3.3.4.jar - release\modules\ext\cxf-rt-frontend-jaxrs-3.3.4.jar - - - ext/stax2-api-3.1.4.jar - release\modules\ext\stax2-api-3.1.4.jar - - - ext/isoparser-1.1.22.jar - release\modules\ext\isoparser-1.1.22.jar - - - ext/xmlschema-core-2.2.4.jar - release\modules\ext\xmlschema-core-2.2.4.jar - - - ext/xmpcore-5.1.3.jar - release\modules\ext\xmpcore-5.1.3.jar - - - ext/cxf-rt-security-3.3.4.jar - release\modules\ext\cxf-rt-security-3.3.4.jar - - - ext/jcommander-1.35.jar - release\modules\ext\jcommander-1.35.jar - - - ext/pdfbox-2.0.17.jar - release\modules\ext\pdfbox-2.0.17.jar - - - ext/javax.annotation-api-1.3.2.jar - release\modules\ext\javax.annotation-api-1.3.2.jar - - - ext/vorbis-java-core-0.8.jar - release\modules\ext\vorbis-java-core-0.8.jar - - - ext/tika-parsers-1.23.jar - release\modules\ext\tika-parsers-1.23.jar - - - ext/java-libpst-0.8.1.jar - release\modules\ext\java-libpst-0.8.1.jar - - - ext/commons-csv-1.7.jar - release\modules\ext\commons-csv-1.7.jar - - - ext/commons-math3-3.6.1.jar - release\modules\ext\commons-math3-3.6.1.jar - - - ext/jaxb-runtime-2.3.2.jar - release\modules\ext\jaxb-runtime-2.3.2.jar - - - ext/jackson-core-2.10.1.jar - release\modules\ext\jackson-core-2.10.1.jar - - - ext/opennlp-tools-1.9.1.jar - release\modules\ext\opennlp-tools-1.9.1.jar - - - ext/geoapi-3.0.1.jar - release\modules\ext\geoapi-3.0.1.jar - - - ext/jdom2-2.0.6.jar - release\modules\ext\jdom2-2.0.6.jar - - - ext/mchange-commons-java-0.2.15.jar - release\modules\ext\mchange-commons-java-0.2.15.jar - - - ext/apache-mime4j-dom-0.8.3.jar - release\modules\ext\apache-mime4j-dom-0.8.3.jar + release/modules/ext/boilerpipe-1.1.0.jar ext/bzip2-0.9.1.jar - release\modules\ext\bzip2-0.9.1.jar + release/modules/ext/bzip2-0.9.1.jar - ext/grib-4.5.5.jar - release\modules\ext\grib-4.5.5.jar + ext/c3p0-0.9.5.5.jar + release/modules/ext/c3p0-0.9.5.5.jar - ext/httpcore-4.4.12.jar - release\modules\ext\httpcore-4.4.12.jar + ext/cdm-4.5.5.jar + release/modules/ext/cdm-4.5.5.jar - ext/sis-feature-1.0.jar - release\modules\ext\sis-feature-1.0.jar + ext/checker-qual-3.12.0.jar + release/modules/ext/checker-qual-3.12.0.jar - ext/xml-apis-1.4.01.jar - release\modules\ext\xml-apis-1.4.01.jar - - - ext/poi-ooxml-4.1.1.jar - release\modules\ext\poi-ooxml-4.1.1.jar - - - ext/curvesapi-1.06.jar - release\modules\ext\curvesapi-1.06.jar - - - ext/jakarta.xml.bind-api-2.3.2.jar - release\modules\ext\jakarta.xml.bind-api-2.3.2.jar - - - ext/sis-utility-1.0.jar - release\modules\ext\sis-utility-1.0.jar - - - ext/guava-28.1-jre.jar - release\modules\ext\guava-28.1-jre.jar - - - ext/woodstox-core-5.0.3.jar - release\modules\ext\woodstox-core-5.0.3.jar - - - ext/protobuf-java-3.11.0.jar - release\modules\ext\protobuf-java-3.11.0.jar - - - ext/jempbox-1.8.16.jar - release\modules\ext\jempbox-1.8.16.jar - - - ext/jackson-annotations-2.10.1.jar - release\modules\ext\jackson-annotations-2.10.1.jar - - - ext/httpmime-4.5.10.jar - release\modules\ext\httpmime-4.5.10.jar - - - ext/httpservices-4.5.5.jar - release\modules\ext\httpservices-4.5.5.jar - - - ext/stax-ex-1.8.2.jar - release\modules\ext\stax-ex-1.8.2.jar - - - ext/xz-1.8.jar - release\modules\ext\xz-1.8.jar - - - ext/jcl-over-slf4j-1.7.28.jar - release\modules\ext\jcl-over-slf4j-1.7.28.jar - - - ext/tika-core-1.23.jar - release\modules\ext\tika-core-1.23.jar - - - ext/c3p0-0.9.5.4.jar - release\modules\ext\c3p0-0.9.5.4.jar - - - ext/jbig2-imageio-3.0.2.jar - release\modules\ext\jbig2-imageio-3.0.2.jar - - - ext/sis-metadata-1.0.jar - release\modules\ext\sis-metadata-1.0.jar - - - ext/sis-storage-1.0.jar - release\modules\ext\sis-storage-1.0.jar - - - ext/pdfbox-tools-2.0.17.jar - release\modules\ext\pdfbox-tools-2.0.17.jar - - - ext/joda-time-2.2.jar - release\modules\ext\joda-time-2.2.jar - - - ext/openjson-1.0.11.jar - release\modules\ext\openjson-1.0.11.jar - - - ext/tagsoup-1.2.1.jar - release\modules\ext\tagsoup-1.2.1.jar - - - ext/xercesImpl-2.12.0.jar - release\modules\ext\xercesImpl-2.12.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/jsoup-1.12.1.jar - release\modules\ext\jsoup-1.12.1.jar - - - ext/rome-1.12.2.jar - release\modules\ext\rome-1.12.2.jar - - - ext/poi-4.1.1.jar - release\modules\ext\poi-4.1.1.jar - - - ext/udunits-4.5.5.jar - release\modules\ext\udunits-4.5.5.jar - - - ext/bcmail-jdk15on-1.64.jar - release\modules\ext\bcmail-jdk15on-1.64.jar - - - ext/commons-io-2.6.jar - release\modules\ext\commons-io-2.6.jar - - - ext/cxf-rt-rs-client-3.3.4.jar - release\modules\ext\cxf-rt-rs-client-3.3.4.jar - - - ext/sis-netcdf-1.0.jar - release\modules\ext\sis-netcdf-1.0.jar - - - ext/jackcess-encrypt-3.0.0.jar - release\modules\ext\jackcess-encrypt-3.0.0.jar - - - ext/netcdf4-4.5.5.jar - release\modules\ext\netcdf4-4.5.5.jar - - - ext/poi-scratchpad-4.1.1.jar - release\modules\ext\poi-scratchpad-4.1.1.jar - - - ext/cxf-rt-transports-http-3.3.4.jar - release\modules\ext\cxf-rt-transports-http-3.3.4.jar - - - ext/sentiment-analysis-parser-0.1.jar - release\modules\ext\sentiment-analysis-parser-0.1.jar - - - ext/commons-compress-1.19.jar - release\modules\ext\commons-compress-1.19.jar - - - ext/juniversalchardet-1.0.3.jar - release\modules\ext\juniversalchardet-1.0.3.jar - - - ext/HikariCP-java7-2.4.13.jar - release\modules\ext\HikariCP-java7-2.4.13.jar - - - ext/jsr305-3.0.2.jar - release\modules\ext\jsr305-3.0.2.jar - - - ext/jhighlight-1.0.3.jar - release\modules\ext\jhighlight-1.0.3.jar - - - ext/quartz-2.3.2.jar - release\modules\ext\quartz-2.3.2.jar - - - ext/animal-sniffer-annotations-1.18.jar - release\modules\ext\animal-sniffer-annotations-1.18.jar - - - ext/junrar-4.0.0.jar - release\modules\ext\junrar-4.0.0.jar - - - ext/istack-commons-runtime-3.0.8.jar - release\modules\ext\istack-commons-runtime-3.0.8.jar - - - ext/jcip-annotations-1.0.jar - release\modules\ext\jcip-annotations-1.0.jar + ext/commons-codec-1.15.jar + release/modules/ext/commons-codec-1.15.jar ext/commons-collections4-4.4.jar - release\modules\ext\commons-collections4-4.4.jar + release/modules/ext/commons-collections4-4.4.jar - ext/cxf-core-3.3.4.jar - release\modules\ext\cxf-core-3.3.4.jar + ext/commons-compress-1.21.jar + release/modules/ext/commons-compress-1.21.jar - ext/jackson-databind-2.10.1.jar - release\modules\ext\jackson-databind-2.10.1.jar - - - ext/slf4j-api-1.7.28.jar - release\modules\ext\slf4j-api-1.7.28.jar - - - ext/ehcache-core-2.6.2.jar - release\modules\ext\ehcache-core-2.6.2.jar - - - ext/commons-lang3-3.9.jar - release\modules\ext\commons-lang3-3.9.jar - - - ext/dec-0.1.2.jar - release\modules\ext\dec-0.1.2.jar - - - ext/rome-utils-1.12.2.jar - release\modules\ext\rome-utils-1.12.2.jar - - - ext/checker-qual-2.8.1.jar - release\modules\ext\checker-qual-2.8.1.jar - - - ext/bcprov-jdk15on-1.64.jar - release\modules\ext\bcprov-jdk15on-1.64.jar + ext/commons-csv-1.9.0.jar + release/modules/ext/commons-csv-1.9.0.jar ext/commons-exec-1.3.jar - release\modules\ext\commons-exec-1.3.jar + release/modules/ext/commons-exec-1.3.jar - ext/httpclient-4.5.10.jar - release\modules\ext\httpclient-4.5.10.jar + ext/commons-io-2.11.0.jar + release/modules/ext/commons-io-2.11.0.jar - ext/jakarta.activation-1.2.1.jar - release\modules\ext\jakarta.activation-1.2.1.jar + ext/commons-lang3-3.12.0.jar + release/modules/ext/commons-lang3-3.12.0.jar + + + ext/commons-logging-1.2.jar + release/modules/ext/commons-logging-1.2.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/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/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/error_prone_annotations-2.11.0.jar + release/modules/ext/error_prone_annotations-2.11.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/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/guava-31.1-jre.jar + release/modules/ext/guava-31.1-jre.jar + + + ext/HikariCP-java7-2.4.13.jar + release/modules/ext/HikariCP-java7-2.4.13.jar + + + ext/httpclient-4.5.13.jar + release/modules/ext/httpclient-4.5.13.jar + + + ext/httpcore-4.4.13.jar + release/modules/ext/httpcore-4.4.13.jar + + + ext/httpmime-4.5.13.jar + release/modules/ext/httpmime-4.5.13.jar + + + ext/httpservices-4.5.5.jar + release/modules/ext/httpservices-4.5.5.jar + + + ext/isoparser-1.9.41.7.jar + release/modules/ext/isoparser-1.9.41.7.jar + + + ext/istack-commons-runtime-3.0.12.jar + release/modules/ext/istack-commons-runtime-3.0.12.jar + + + ext/j2objc-annotations-1.3.jar + release/modules/ext/j2objc-annotations-1.3.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.13.2.jar + release/modules/ext/jackson-annotations-2.13.2.jar + + + ext/jackson-core-2.13.2.jar + release/modules/ext/jackson-core-2.13.2.jar + + + ext/jackson-databind-2.13.2.jar + release/modules/ext/jackson-databind-2.13.2.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-1.2.2.jar + release/modules/ext/jakarta.activation-api-1.2.2.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/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/jbig2-imageio-3.0.3.jar + release/modules/ext/jbig2-imageio-3.0.3.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/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/jhighlight-1.0.3.jar + release/modules/ext/jhighlight-1.0.3.jar + + + ext/jmatio-1.5.jar + release/modules/ext/jmatio-1.5.jar + + + ext/jna-5.10.0.jar + release/modules/ext/jna-5.10.0.jar + + + ext/joda-time-2.2.jar + release/modules/ext/joda-time-2.2.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/jul-to-slf4j-1.7.36.jar + release/modules/ext/jul-to-slf4j-1.7.36.jar + + + ext/juniversalchardet-1.0.3.jar + release/modules/ext/juniversalchardet-1.0.3.jar + + + ext/junrar-7.4.1.jar + release/modules/ext/junrar-7.4.1.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/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/netcdf4-4.5.5.jar + release/modules/ext/netcdf4-4.5.5.jar + + + ext/ooxml-schemas-1.4.jar + 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/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-tools-2.0.25.jar + release/modules/ext/pdfbox-tools-2.0.25.jar + + + ext/poi-4.1.2.jar + release/modules/ext/poi-4.1.2.jar + + + ext/poi-ooxml-4.1.2.jar + release/modules/ext/poi-ooxml-4.1.2.jar + + + ext/poi-ooxml-schemas-4.1.2.jar + release/modules/ext/poi-ooxml-schemas-4.1.2.jar + + + ext/poi-scratchpad-4.1.2.jar + release/modules/ext/poi-scratchpad-4.1.2.jar + + + ext/preflight-2.0.25.jar + release/modules/ext/preflight-2.0.25.jar + + + ext/protobuf-java-3.19.4.jar + release/modules/ext/protobuf-java-3.19.4.jar + + + ext/quartz-2.3.2.jar + release/modules/ext/quartz-2.3.2.jar + + + ext/rome-1.18.0.jar + release/modules/ext/rome-1.18.0.jar + + + ext/rome-utils-1.18.0.jar + release/modules/ext/rome-utils-1.18.0.jar + + + ext/sentiment-analysis-parser-0.1.jar + release/modules/ext/sentiment-analysis-parser-0.1.jar + + + ext/sis-feature-1.1.jar + release/modules/ext/sis-feature-1.1.jar + + + ext/sis-metadata-1.1.jar + release/modules/ext/sis-metadata-1.1.jar + + + ext/sis-netcdf-1.1.jar + release/modules/ext/sis-netcdf-1.1.jar + + + ext/sis-referencing-1.1.jar + release/modules/ext/sis-referencing-1.1.jar + + + ext/sis-storage-1.1.jar + release/modules/ext/sis-storage-1.1.jar + + + ext/sis-utility-1.1.jar + release/modules/ext/sis-utility-1.1.jar + + + ext/slf4j-api-1.7.36.jar + release/modules/ext/slf4j-api-1.7.36.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/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-parsers-1.28.1.jar + release/modules/ext/tika-parsers-1.28.1.jar + + + ext/txw2-2.3.5.jar + release/modules/ext/txw2-2.3.5.jar + + + ext/udunits-4.5.5.jar + release/modules/ext/udunits-4.5.5.jar + + + ext/unit-api-1.0.jar + release/modules/ext/unit-api-1.0.jar + + + ext/vorbis-java-core-0.8.jar + release/modules/ext/vorbis-java-core-0.8.jar ext/vorbis-java-tika-0.8.jar - release\modules\ext\vorbis-java-tika-0.8.jar + 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/xercesImpl-2.12.2.jar + release/modules/ext/xercesImpl-2.12.2.jar + + + ext/xml-apis-1.4.01.jar + release/modules/ext/xml-apis-1.4.01.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 diff --git a/build.xml b/build.xml index 4a376bfaca..3a65ad091e 100644 --- a/build.xml +++ b/build.xml @@ -79,6 +79,12 @@ + + + + + + - + diff --git a/nbproject/platform.properties b/nbproject/platform.properties index 32e681b3af..27861745ed 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -14,7 +14,8 @@ cluster.path=\ ${nbplatform.active.dir}/harness:\ ${nbplatform.active.dir}/java:\ ${nbplatform.active.dir}/platform:\ - ${nbplatform.active.dir}/cluster + ${nbplatform.active.dir}/cluster:\ + CoreTestLibs/build/cluster disabled.modules=\ org.eclipse.core.contenttype,\ org.eclipse.core.jobs,\ @@ -338,4 +339,4 @@ disabled.modules=\ org.openide.execution.compat8,\ org.openide.options,\ org.openide.util.enumerations,\ - org.openidex.util \ No newline at end of file + org.openidex.util diff --git a/thirdparty/IcePDF 6.2.2/batik-awt-util-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-awt-util-1.6.jar deleted file mode 100755 index b62ac15866..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-awt-util-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-dom-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-dom-1.6.jar deleted file mode 100755 index bf144ab070..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-dom-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-svg-dom-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-svg-dom-1.6.jar deleted file mode 100755 index c8970fbb4d..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-svg-dom-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-svggen-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-svggen-1.6.jar deleted file mode 100755 index 819f2da07a..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-svggen-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-util-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-util-1.6.jar deleted file mode 100755 index 7550b4802e..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-util-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/batik-xml-1.6.jar b/thirdparty/IcePDF 6.2.2/batik-xml-1.6.jar deleted file mode 100755 index 1b915a0503..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/batik-xml-1.6.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.54.jar b/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.54.jar deleted file mode 100755 index 86f7f0be19..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.54.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.54.jar b/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.54.jar deleted file mode 100755 index f31c1c1c45..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.54.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.54.jar b/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.54.jar deleted file mode 100755 index bd95185ae8..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.54.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/icepdf-core-6.2.2.jar b/thirdparty/IcePDF 6.2.2/icepdf-core-6.2.2.jar deleted file mode 100755 index b5555280e1..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/icepdf-core-6.2.2.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/icepdf-viewer-6.2.2.jar b/thirdparty/IcePDF 6.2.2/icepdf-viewer-6.2.2.jar deleted file mode 100755 index d58fcc9de3..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/icepdf-viewer-6.2.2.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/jai_core-1.1.3.jar b/thirdparty/jai/jai_core-1.1.3.jar old mode 100755 new mode 100644 similarity index 100% rename from thirdparty/IcePDF 6.2.2/jai_core-1.1.3.jar rename to thirdparty/jai/jai_core-1.1.3.jar diff --git a/thirdparty/IcePDF 6.2.2/jai_imageio-1.1.jar b/thirdparty/jai/jai_imageio-1.1.jar old mode 100755 new mode 100644 similarity index 100% rename from thirdparty/IcePDF 6.2.2/jai_imageio-1.1.jar rename to thirdparty/jai/jai_imageio-1.1.jar diff --git a/thunderbirdparser/build.xml b/thunderbirdparser/build.xml index 8926bca7a9..0690ae52ec 100644 --- a/thunderbirdparser/build.xml +++ b/thunderbirdparser/build.xml @@ -20,9 +20,6 @@ - - - diff --git a/thunderbirdparser/ivy.xml b/thunderbirdparser/ivy.xml index 9d49e91a50..0efca69cb5 100644 --- a/thunderbirdparser/ivy.xml +++ b/thunderbirdparser/ivy.xml @@ -7,14 +7,9 @@ - - - - - - - - - + + + + diff --git a/thunderbirdparser/ivysettings.xml b/thunderbirdparser/ivysettings.xml index 8209151a1c..a776ab49c3 100644 --- a/thunderbirdparser/ivysettings.xml +++ b/thunderbirdparser/ivysettings.xml @@ -6,4 +6,5 @@ + diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties index f9729f18ae..c88898951c 100644 --- a/thunderbirdparser/nbproject/project.properties +++ b/thunderbirdparser/nbproject/project.properties @@ -1,23 +1,12 @@ -file.reference.apache-mime4j-core-0.8.0-SNAPSHOT.jar=release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar -file.reference.apache-mime4j-dom-0.8.0-SNAPSHOT.jar=release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar -file.reference.apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar -file.reference.commons-lang3-3.8.1.jar=release/modules/ext/commons-lang3-3.8.1.jar -file.reference.apache-mime4j-core-0.8.0.jar=release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar -file.reference.apache-mime4j-dom-0.8.0.jar=release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar -file.reference.apache-mime4j-mbox-iterator-0.8.0.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar -file.reference.commons-validator-1.6.jar=release/modules/ext/commons-validator-1.6.jar -file.reference.guava-19.0.jar=release/modules/ext/guava-19.0.jar -file.reference.ez-vcard-0.10.5.jar=release/modules/ext/ez-vcard-0.10.5.jar +file.reference.apache-mime4j-mbox-iterator-0.8.4.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar +file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar +file.reference.ez-vcard-0.11.3.jar=release/modules/ext/ez-vcard-0.11.3.jar file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar file.reference.vinnie-2.0.2.jar=release/modules/ext/vinnie-2.0.2.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial -javadoc.reference.guava-19.0.jar=release/modules/ext/guava-19.0-javadoc.jar -javadoc.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar license.file=../LICENSE-2.0.txt nbm.homepage=http://www.sleuthkit.org/autopsy/ nbm.needs.restart=true -source.reference.guava-19.0.jar=release/modules/ext/guava-19.0-sources.jar -source.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar spec.version.base=4.0 diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml index e40dd81c4c..6c138cc4df 100644 --- a/thunderbirdparser/nbproject/project.xml +++ b/thunderbirdparser/nbproject/project.xml @@ -57,6 +57,15 @@ 10.24 + + org.sleuthkit.autopsy.corelibs + + + + 3 + 1.4 + + org.sleuthkit.autopsy.keywordsearch @@ -69,45 +78,25 @@ - ext/commons-lang3-3.8.1.jar - release/modules/ext/commons-lang3-3.8.1.jar + 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.0-SNAPSHOT.jar - release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar + ext/commons-lang3-3.12.0.jar + release/modules/ext/commons-lang3-3.12.0.jar - ext/ez-vcard-0.10.5.jar - release/modules/ext/ez-vcard-0.10.5.jar - - - ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar - release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar - - - ext/guava-19.0.jar - release/modules/ext/guava-19.0.jar + ext/ez-vcard-0.11.3.jar + release/modules/ext/ez-vcard-0.11.3.jar ext/java-libpst-0.9.5-SNAPSHOT.jar release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar - - ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar - release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar - ext/vinnie-2.0.2.jar release/modules/ext/vinnie-2.0.2.jar - - ext/commons-validator-1.6.jar - release/modules/ext/commons-validator-1.6.jar - - - ext/commons-io-2.5.jar - release/modules/ext/commons-io-2.5.jar - diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java index 306843f025..ca1c328aca 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/VcardParser.java @@ -232,7 +232,7 @@ final class VcardParser { org.sleuthkit.datamodel.Blackboard tskBlackboard = tskCase.getBlackboard(); try { // Create artifact if it doesn't already exist. - if (!tskBlackboard.artifactExists(abstractFile, BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT, attributes)) { + if (!tskBlackboard.artifactExists(abstractFile, BlackboardArtifact.Type.TSK_CONTACT, attributes)) { artifact = abstractFile.newDataArtifact(new BlackboardArtifact.Type(BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT), attributes); extractPhotos(vcard, abstractFile, artifact);