diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 1898db811c7dde396f6d7bb72610a6fc1fc75e04..8dbd7f8d92f8eed718666342b1fb089af261252a 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -83,7 +83,7 @@ file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sis-metadata-0.8.jar=release\\modules\\ext\\sis-metadata-0.8.jar file.reference.sis-netcdf-0.8.jar=release\\modules\\ext\\sis-netcdf-0.8.jar file.reference.sis-utility-0.8.jar=release\\modules\\ext\\sis-utility-0.8.jar -file.reference.sleuthkit-caseuco-4.9.0.jar=release\\modules\\ext\\sleuthkit-caseuco-4.9.0.jar +file.reference.sleuthkit-caseuco-4.10.0.jar=release/modules/ext/sleuthkit-caseuco-4.10.0.jar file.reference.slf4j-api-1.7.25.jar=release\\modules\\ext\\slf4j-api-1.7.25.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 @@ -91,7 +91,7 @@ file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0 file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar file.reference.cxf-rt-frontend-jaxrs-3.0.16.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-transports-http-3.0.16.jar -file.reference.sleuthkit-4.9.0.jar=release/modules/ext/sleuthkit-4.9.0.jar +file.reference.sleuthkit-4.10.0.jar=release/modules/ext/sleuthkit-4.10.0.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 diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index b751ffbf07b0a3ee32b00fe30133ba7c1fe55c7a..61e6a86b04f8dcfd938d7f923125291a7dd86de9 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -472,8 +472,8 @@ <binary-origin>release/modules/ext/commons-pool2-2.4.2.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/sleuthkit-4.9.0.jar</runtime-relative-path> - <binary-origin>release/modules/ext/sleuthkit-4.9.0.jar</binary-origin> + <runtime-relative-path>ext/sleuthkit-4.10.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/sleuthkit-4.10.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/jxmapviewer2-2.4.jar</runtime-relative-path> @@ -780,8 +780,8 @@ <binary-origin>release/modules/ext/curator-client-2.8.0.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/sleuthkit-caseuco-4.9.0.jar</runtime-relative-path> - <binary-origin>release\modules\ext\sleuthkit-caseuco-4.9.0.jar</binary-origin> + <runtime-relative-path>ext/sleuthkit-caseuco-4.10.0.jar</runtime-relative-path> + <binary-origin>release/modules/ext/sleuthkit-caseuco-4.10.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/fontbox-2.0.13.jar</runtime-relative-path> diff --git a/TSKVersion.xml b/TSKVersion.xml index 38e614169afb8e5fc12e9e1c3d3311ee76f0aac9..7da9869f0492038ce72b7f42a154bf5983c7d4ea 100644 --- a/TSKVersion.xml +++ b/TSKVersion.xml @@ -1,3 +1,3 @@ <project name="TSK_VERSION"> - <property name="TSK_VERSION" value="4.9.0"/> + <property name="TSK_VERSION" value="4.10.0"/> </project> diff --git a/release_scripts/update_sleuthkit_version.pl b/release_scripts/update_sleuthkit_version.pl index 26d8be50731318083605e707f242340fc8e8c193..1d6bdc7e7228d40bfc1124613dab4c0503b1aab9 100755 --- a/release_scripts/update_sleuthkit_version.pl +++ b/release_scripts/update_sleuthkit_version.pl @@ -131,10 +131,14 @@ sub update_core_project_properties { my $found = 0; while (<CONF_IN>) { - if (/^file\.reference\.sleuthkit\-/) { + if (/^file\.reference\.sleuthkit\-4/) { print CONF_OUT "file.reference.sleuthkit-${VER}.jar=release/modules/ext/sleuthkit-${VER}.jar\n"; $found++; } + elsif (/^file\.reference\.sleuthkit\-caseuco-4/) { + print CONF_OUT "file.reference.sleuthkit-caseuco-${VER}.jar=release/modules/ext/sleuthkit-caseuco-${VER}.jar\n"; + $found++; + } else { print CONF_OUT $_; @@ -143,8 +147,8 @@ sub update_core_project_properties { close (CONF_IN); close (CONF_OUT); - if ($found != 1) { - die "$found (instead of 1) occurrences of version found in ${orig}"; + if ($found != 2) { + die "$found (instead of 2) occurrences of version found in core ${orig}"; } unlink ($orig) or die "Error deleting ${orig}"; @@ -167,14 +171,22 @@ sub update_core_project_xml { my $found = 0; while (<CONF_IN>) { - if (/<runtime-relative-path>ext\/sleuthkit-/) { + if (/<runtime-relative-path>ext\/sleuthkit-4/) { print CONF_OUT " <runtime-relative-path>ext/sleuthkit-${VER}.jar</runtime-relative-path>\n"; $found++; } - elsif (/<binary-origin>release\/modules\/ext\/sleuthkit-/) { + elsif (/<binary-origin>release\/modules\/ext\/sleuthkit-4/) { print CONF_OUT " <binary-origin>release/modules/ext/sleuthkit-${VER}.jar</binary-origin>\n"; $found++; } + elsif (/<runtime-relative-path>ext\/sleuthkit-caseuco-4/) { + print CONF_OUT " <runtime-relative-path>ext/sleuthkit-caseuco-${VER}.jar</runtime-relative-path>\n"; + $found++; + } + elsif (/<binary-origin>release\/modules\/ext\/sleuthkit-caseuco-4/) { + print CONF_OUT " <binary-origin>release/modules/ext/sleuthkit-caseuco-${VER}.jar</binary-origin>\n"; + $found++; + } else { print CONF_OUT $_; } @@ -182,8 +194,8 @@ sub update_core_project_xml { close (CONF_IN); close (CONF_OUT); - if ($found != 2) { - die "$found (instead of 2) occurrences of version found in ${orig}"; + if ($found != 4) { + die "$found (instead of 4) occurrences of version found in case ${orig}"; } unlink ($orig) or die "Error deleting ${orig}"; diff --git a/unix_setup.sh b/unix_setup.sh index 06fc655e32362efdfb2fec78c4c2ff4162fb2381..a9d01739f689880e7451f6c30f2eb019e298c651 100644 --- a/unix_setup.sh +++ b/unix_setup.sh @@ -5,7 +5,7 @@ # NOTE: update_sleuthkit_version.pl updates this value and relies # on it keeping the same name and whitespace. Don't change it. -TSK_VERSION=4.9.0 +TSK_VERSION=4.10.0 # In the beginning...