diff --git a/Core/build.xml b/Core/build.xml index 140a0916f9..678610846a 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -106,7 +106,7 @@ - + diff --git a/Core/ivy.xml b/Core/ivy.xml index 4d6c14a0db..29feb749f3 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -42,6 +42,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 6645013975..faeb60cee8 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,11 +1,11 @@ file.reference.activemq-all-5.16.4.jar=release/modules/ext/activemq-all-5.16.4.jar file.reference.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar -file.reference.batik-awt-util-1.6.jar=release/modules/ext/batik-awt-util-1.6.jar -file.reference.batik-dom-1.6.jar=release/modules/ext/batik-dom-1.6.jar -file.reference.batik-svg-dom-1.6.jar=release/modules/ext/batik-svg-dom-1.6.jar -file.reference.batik-svggen-1.6.jar=release/modules/ext/batik-svggen-1.6.jar -file.reference.batik-util-1.6.jar=release/modules/ext/batik-util-1.6.jar -file.reference.batik-xml-1.6.jar=release/modules/ext/batik-xml-1.6.jar +file.reference.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 @@ -66,7 +66,6 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi 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.36.jar=release/modules/ext/slf4j-api-1.7.36.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.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 05ac769955..9ba936cc79 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -355,28 +355,28 @@ release/modules/ext/audience-annotations-0.12.0.jar - ext/batik-awt-util-1.6.jar - release/modules/ext/batik-awt-util-1.6.jar + ext/batik-awt-util-1.14.jar + release/modules/ext/batik-awt-util-1.14.jar - ext/batik-dom-1.6.jar - release/modules/ext/batik-dom-1.6.jar + ext/batik-dom-1.14.jar + release/modules/ext/batik-dom-1.14.jar - ext/batik-svg-dom-1.6.jar - release/modules/ext/batik-svg-dom-1.6.jar + ext/batik-svg-dom-1.14.jar + release/modules/ext/batik-svg-dom-1.14.jar - ext/batik-svggen-1.6.jar - release/modules/ext/batik-svggen-1.6.jar + ext/batik-svggen-1.14.jar + release/modules/ext/batik-svggen-1.14.jar - ext/batik-util-1.6.jar - release/modules/ext/batik-util-1.6.jar + ext/batik-util-1.14.jar + release/modules/ext/batik-util-1.14.jar - ext/batik-xml-1.6.jar - release/modules/ext/batik-xml-1.6.jar + ext/batik-xml-1.14.jar + release/modules/ext/batik-xml-1.14.jar ext/bcpkix-jdk15on-1.70.jar @@ -618,10 +618,6 @@ ext/sleuthkit-caseuco-4.11.1.jar release/modules/ext/sleuthkit-caseuco-4.11.1.jar - - ext/slf4j-api-1.7.36.jar - release/modules/ext/slf4j-api-1.7.36.jar - ext/snakeyaml-1.30.jar release/modules/ext/snakeyaml-1.30.jar diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 80bb6bf9af..44c9ad4e07 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -85,8 +85,12 @@ + + + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index b4afd88b51..d0563016e2 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -107,7 +107,10 @@ file.reference.proto-google-iam-v1-1.2.6.jar=release/modules/ext/proto-google-ia 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/slf4j-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.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 file.reference.xmlbeans-3.0.1.jar=release/modules/ext/xmlbeans-3.0.1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index febd3c9416..27dc2b150c 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -488,6 +488,10 @@ org.openxmlformats.schemas.wordprocessingml.x2006.main org.openxmlformats.schemas.wordprocessingml.x2006.main.impl org.sleuthkit.autopsy.corelibs + org.slf4j + org.slf4j.event + org.slf4j.helpers + org.slf4j.spi schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443 @@ -926,10 +930,22 @@ 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 diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 0a37b804b6..94904051ef 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -39,7 +39,6 @@ file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty file.reference.netty-transport-4.1.68.Final.jar=release/modules/ext/netty-transport-4.1.68.Final.jar file.reference.netty-transport-native-epoll-4.1.68.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar file.reference.netty-transport-native-unix-common-4.1.68.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar -file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.snappy-java-1.1.7.6.jar=release/modules/ext/snappy-java-1.1.7.6.jar file.reference.solr-solrj-8.11.1.jar=release/modules/ext/solr-solrj-8.11.1.jar file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 817080efe4..da9fb97c26 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -380,10 +380,6 @@ 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/slf4j-api-1.7.36.jar - release/modules/ext/slf4j-api-1.7.36.jar - ext/snappy-java-1.1.7.6.jar release/modules/ext/snappy-java-1.1.7.6.jar diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index 74ce1385ec..d4d84993f0 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -96,7 +96,6 @@ 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 diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml index 0f4f2024e4..171c840a7f 100755 --- a/Tika/nbproject/project.xml +++ b/Tika/nbproject/project.xml @@ -5,7 +5,17 @@ org.sleuthkit.autopsy.Tika - + + + org.sleuthkit.autopsy.corelibs + + + + 3 + 1.4 + + + org.apache.james.mime4j org.apache.james.mime4j.dom @@ -690,10 +700,6 @@ 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 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.70.jar b/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.70.jar deleted file mode 100644 index 07223f634c..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcpkix-jdk15on-1.70.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.70.jar b/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.70.jar deleted file mode 100644 index 903491e1b0..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-ext-jdk15on-1.70.jar and /dev/null differ diff --git a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.70.jar b/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.70.jar deleted file mode 100644 index 0e4198e5a4..0000000000 Binary files a/thirdparty/IcePDF 6.2.2/bcprov-jdk15on-1.70.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