diff --git a/.travis.yml b/.travis.yml index 28218be2c9..569c9b9312 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,27 +15,50 @@ addons: apt: update: true packages: + - openjdk-17-jdk + - openjdk-17-jre + - build-essential + - autoconf + - libtool + - automake + - git + - zip + - wget + - ant + - libde265-dev + - libheif-dev + - libpq-dev - testdisk - libafflib-dev - libewf-dev - - libpq-dev - - autopoint - - libsqlite3-dev - - ant - - ant-optional - - libcppunit-dev - - wget + - libvhdi-dev + - libvmdk-dev + - libgstreamer1.0-0 + - gstreamer1.0-plugins-base + - gstreamer1.0-plugins-good + - gstreamer1.0-plugins-bad + - gstreamer1.0-plugins-ugly + - gstreamer1.0-libav + - gstreamer1.0-tools + - gstreamer1.0-x + - gstreamer1.0-alsa + - gstreamer1.0-gl + - gstreamer1.0-gtk3 + - gstreamer1.0-qt5 + - gstreamer1.0-pulseaudio homebrew: update: true packages: - - ant - - wget - - libpq - - libewf - - gettext - - cppunit + - openjdk@17 + - ant + - automake + - libtool - afflib + - libewf + - postgresql@15 - testdisk + - libheif + - gstreamer python: - 2.7 @@ -49,19 +72,11 @@ install: before_script: - if [ $TRAVIS_OS_NAME = linux ]; then - wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -; - echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" | sudo tee /etc/apt/sources.list.d/bellsoft.list; - sudo apt-get update; - sudo apt-get install bellsoft-java17-full; export PATH=/usr/bin:$PATH; - export JAVA_HOME=/usr/lib/jvm/bellsoft-java17-full-amd64; + export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64; fi - if [ $TRAVIS_OS_NAME = osx ]; then - brew uninstall java --force --ignore-dependencies; - brew cask uninstall java --force; - brew tap bell-sw/liberica; - brew install --cask liberica-jdk17-full; - export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-17-full.jdk/Contents/Home; + export JAVA_HOME=$(/usr/libexec/java_home -v 17); fi - java -version diff --git a/BUILDING.txt b/BUILDING.txt index 8da32f6a76..ae1ab15d04 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -11,9 +11,9 @@ correct C libraries. STEPS: 1) Get Java Setup -1a) Download and install 64-bit JDK version 17 with JavaFX. +1a) Download and install 64-bit JDK version 17. -Autopsy has been used and tested with liberica java which can be downloaded from here: https://bell-sw.com/pages/downloads/. +Autopsy has been used and tested with java 17 which can be downloaded from here: https://www.oracle.com/java/technologies/downloads/#java17. 1b) Ensure that JDK_HOME is set to the root JDK directory. diff --git a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ALeappAnalyzerIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ALeappAnalyzerIngestModule.java index d9f673ac36..1332ff40cd 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ALeappAnalyzerIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ALeappAnalyzerIngestModule.java @@ -289,12 +289,13 @@ public class ALeappAnalyzerIngestModule implements DataSourceIngestModule { private ProcessBuilder buildaLeappCommand(Path moduleOutputPath, String sourceFilePath, String aLeappFileSystemType) { ProcessBuilder processBuilder = buildProcessWithRunAsInvoker( - "\"" + aLeappExecutable + "\"", //NON-NLS + aLeappExecutable.getAbsolutePath(), //NON-NLS "-t", aLeappFileSystemType, //NON-NLS "-i", sourceFilePath, //NON-NLS "-o", moduleOutputPath.toString(), "-w" ); + processBuilder.directory(moduleOutputPath.toFile()); processBuilder.redirectError(moduleOutputPath.resolve("aLeapp_err.txt").toFile()); //NON-NLS processBuilder.redirectOutput(moduleOutputPath.resolve("aLeapp_out.txt").toFile()); //NON-NLS return processBuilder; @@ -303,9 +304,11 @@ public class ALeappAnalyzerIngestModule implements DataSourceIngestModule { private ProcessBuilder buildaLeappListCommand(Path moduleOutputPath) { ProcessBuilder processBuilder = buildProcessWithRunAsInvoker( - "\"" + aLeappExecutable + "\"", //NON-NLS + aLeappExecutable.getAbsolutePath(), //NON-NLS "-p" ); + // leapp process creates a text file in addition to outputting to stdout. + processBuilder.directory(moduleOutputPath.toFile()); processBuilder.redirectError(moduleOutputPath.resolve("aLeapp_paths_error.txt").toFile()); //NON-NLS processBuilder.redirectOutput(moduleOutputPath.resolve("aLeapp_paths.txt").toFile()); //NON-NLS return processBuilder; diff --git a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ILeappAnalyzerIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ILeappAnalyzerIngestModule.java index 4d8328ce3d..f522d2fdd1 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ILeappAnalyzerIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/ILeappAnalyzerIngestModule.java @@ -289,11 +289,12 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule { private ProcessBuilder buildiLeappCommand(Path moduleOutputPath, String sourceFilePath, String iLeappFileSystemType) { ProcessBuilder processBuilder = buildProcessWithRunAsInvoker( - "\"" + iLeappExecutable + "\"", //NON-NLS + iLeappExecutable.getAbsolutePath(), //NON-NLS "-t", iLeappFileSystemType, //NON-NLS "-i", sourceFilePath, //NON-NLS "-o", moduleOutputPath.toString() ); + processBuilder.directory(moduleOutputPath.toFile()); processBuilder.redirectError(moduleOutputPath.resolve("iLeapp_err.txt").toFile()); //NON-NLS processBuilder.redirectOutput(moduleOutputPath.resolve("iLeapp_out.txt").toFile()); //NON-NLS return processBuilder; @@ -309,9 +310,11 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule { private ProcessBuilder buildiLeappListCommand(Path moduleOutputPath) { ProcessBuilder processBuilder = buildProcessWithRunAsInvoker( - "\"" + iLeappExecutable + "\"", //NON-NLS + iLeappExecutable.getAbsolutePath(), //NON-NLS "-p" ); + // leapp process also outputs a file to the working directory in addition to stdout. + processBuilder.directory(moduleOutputPath.toFile()); processBuilder.redirectError(moduleOutputPath.resolve("iLeapp_paths_error.txt").toFile()); //NON-NLS processBuilder.redirectOutput(moduleOutputPath.resolve("iLeapp_paths.txt").toFile()); //NON-NLS return processBuilder; diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 017c3fbf7a..f7f326b6e3 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -1,11 +1,58 @@ - + +]> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 9c523404e6..a1da171ac2 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -26,6 +26,7 @@ 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-11.1.2-sources.jar=release/modules/ext/controlsfx-11.1.2-sources.jar file.reference.controlsfx-11.1.2.jar=release/modules/ext/controlsfx-11.1.2.jar file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar @@ -83,6 +84,34 @@ file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annota 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.javafx-base-17.0.7-linux.jar=release/modules/ext/javafx-base-17.0.7-linux.jar +file.reference.javafx-base-17.0.7-mac.jar=release/modules/ext/javafx-base-17.0.7-mac.jar +file.reference.javafx-base-17.0.7-win.jar=release/modules/ext/javafx-base-17.0.7-win.jar +file.reference.javafx-base-17.0.7.jar=release/modules/ext/javafx-base-17.0.7.jar +file.reference.javafx-controls-17.0.7-linux.jar=release/modules/ext/javafx-controls-17.0.7-linux.jar +file.reference.javafx-controls-17.0.7-mac.jar=release/modules/ext/javafx-controls-17.0.7-mac.jar +file.reference.javafx-controls-17.0.7-win.jar=release/modules/ext/javafx-controls-17.0.7-win.jar +file.reference.javafx-controls-17.0.7.jar=release/modules/ext/javafx-controls-17.0.7.jar +file.reference.javafx-fxml-17.0.7-linux.jar=release/modules/ext/javafx-fxml-17.0.7-linux.jar +file.reference.javafx-fxml-17.0.7-mac.jar=release/modules/ext/javafx-fxml-17.0.7-mac.jar +file.reference.javafx-fxml-17.0.7-win.jar=release/modules/ext/javafx-fxml-17.0.7-win.jar +file.reference.javafx-fxml-17.0.7.jar=release/modules/ext/javafx-fxml-17.0.7.jar +file.reference.javafx-graphics-17.0.7-linux.jar=release/modules/ext/javafx-graphics-17.0.7-linux.jar +file.reference.javafx-graphics-17.0.7-mac.jar=release/modules/ext/javafx-graphics-17.0.7-mac.jar +file.reference.javafx-graphics-17.0.7-win.jar=release/modules/ext/javafx-graphics-17.0.7-win.jar +file.reference.javafx-graphics-17.0.7.jar=release/modules/ext/javafx-graphics-17.0.7.jar +file.reference.javafx-media-17.0.7-linux.jar=release/modules/ext/javafx-media-17.0.7-linux.jar +file.reference.javafx-media-17.0.7-mac.jar=release/modules/ext/javafx-media-17.0.7-mac.jar +file.reference.javafx-media-17.0.7-win.jar=release/modules/ext/javafx-media-17.0.7-win.jar +file.reference.javafx-media-17.0.7.jar=release/modules/ext/javafx-media-17.0.7.jar +file.reference.javafx-swing-17.0.7-linux.jar=release/modules/ext/javafx-swing-17.0.7-linux.jar +file.reference.javafx-swing-17.0.7-mac.jar=release/modules/ext/javafx-swing-17.0.7-mac.jar +file.reference.javafx-swing-17.0.7-win.jar=release/modules/ext/javafx-swing-17.0.7-win.jar +file.reference.javafx-swing-17.0.7.jar=release/modules/ext/javafx-swing-17.0.7.jar +file.reference.javafx-web-17.0.7-linux.jar=release/modules/ext/javafx-web-17.0.7-linux.jar +file.reference.javafx-web-17.0.7-mac.jar=release/modules/ext/javafx-web-17.0.7-mac.jar +file.reference.javafx-web-17.0.7-win.jar=release/modules/ext/javafx-web-17.0.7-win.jar +file.reference.javafx-web-17.0.7.jar=release/modules/ext/javafx-web-17.0.7.jar file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar file.reference.jfxtras-common-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 31bf216336..fad6e96722 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -197,6 +197,85 @@ com.google.rpc.context com.google.thirdparty.publicsuffix com.google.type + com.microsoft.schemas.vml + com.microsoft.schemas.vml.impl + com.sun.javafx + com.sun.javafx.animation + com.sun.javafx.application + com.sun.javafx.beans + com.sun.javafx.beans.event + com.sun.javafx.binding + com.sun.javafx.charts + com.sun.javafx.collections + com.sun.javafx.css + com.sun.javafx.css.parser + com.sun.javafx.cursor + com.sun.javafx.effect + com.sun.javafx.embed + com.sun.javafx.embed.swing + com.sun.javafx.embed.swing.newimpl + com.sun.javafx.event + com.sun.javafx.font + com.sun.javafx.font.coretext + com.sun.javafx.font.directwrite + com.sun.javafx.font.freetype + com.sun.javafx.fxml + com.sun.javafx.fxml.builder + com.sun.javafx.fxml.builder.web + com.sun.javafx.fxml.expression + com.sun.javafx.geom + com.sun.javafx.geom.transform + com.sun.javafx.geometry + com.sun.javafx.iio + com.sun.javafx.iio.bmp + com.sun.javafx.iio.common + com.sun.javafx.iio.gif + com.sun.javafx.iio.ios + com.sun.javafx.iio.jpeg + com.sun.javafx.iio.png + com.sun.javafx.image + com.sun.javafx.image.impl + com.sun.javafx.logging + com.sun.javafx.logging.jfr + com.sun.javafx.media + com.sun.javafx.menu + com.sun.javafx.perf + com.sun.javafx.print + com.sun.javafx.property + com.sun.javafx.property.adapter + com.sun.javafx.reflect + com.sun.javafx.runtime + com.sun.javafx.runtime.async + com.sun.javafx.runtime.eula + com.sun.javafx.scene + com.sun.javafx.scene.canvas + com.sun.javafx.scene.control + com.sun.javafx.scene.control.behavior + com.sun.javafx.scene.control.inputmap + com.sun.javafx.scene.control.skin + com.sun.javafx.scene.control.skin.resources + com.sun.javafx.scene.input + com.sun.javafx.scene.layout + com.sun.javafx.scene.layout.region + com.sun.javafx.scene.media + com.sun.javafx.scene.paint + com.sun.javafx.scene.shape + com.sun.javafx.scene.text + com.sun.javafx.scene.transform + com.sun.javafx.scene.traversal + com.sun.javafx.scene.web + com.sun.javafx.scene.web.behavior + com.sun.javafx.sg.prism + com.sun.javafx.sg.prism.web + com.sun.javafx.stage + com.sun.javafx.text + com.sun.javafx.tk + com.sun.javafx.tk.quantum + com.sun.javafx.util + com.sun.javafx.webkit + com.sun.javafx.webkit.prism + com.sun.javafx.webkit.prism.theme + com.sun.javafx.webkit.theme com.sun.jna com.sun.jna.platform com.sun.jna.platform.dnd @@ -206,6 +285,7 @@ com.sun.jna.platform.wince com.sun.jna.ptr com.sun.jna.win32 + com.sun.scenario.animation com.twelvemonkeys.image com.twelvemonkeys.imageio com.twelvemonkeys.imageio.color @@ -244,6 +324,44 @@ javax.annotation javax.annotation.concurrent javax.annotation.meta + javafx.animation + javafx.application + javafx.beans + javafx.beans.binding + javafx.beans.property + javafx.beans.property.adapter + javafx.beans.value + javafx.collections + javafx.collections.transformation + javafx.concurrent + javafx.css + javafx.css.converter + javafx.embed.swing + javafx.event + javafx.fxml + javafx.geometry + javafx.graphics + javafx.print + javafx.scene + javafx.scene.canvas + javafx.scene.chart + javafx.scene.control + javafx.scene.control.cell + javafx.scene.control.skin + javafx.scene.effect + javafx.scene.image + javafx.scene.input + javafx.scene.layout + javafx.scene.media + javafx.scene.paint + javafx.scene.robot + javafx.scene.shape + javafx.scene.text + javafx.scene.transform + javafx.scene.web + javafx.stage + javafx.util + javafx.util.converter javax.jms javax.mail javax.mail.event @@ -476,7 +594,7 @@ org.slf4j.helpers org.slf4j.spi - + ext/animal-sniffer-annotations-1.21.jar release/modules/ext/animal-sniffer-annotations-1.21.jar @@ -588,6 +706,10 @@ ext/conscrypt-openjdk-uber-2.5.1.jar release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar + + ext/controlsfx-11.1.2-sources.jar + release/modules/ext/controlsfx-11.1.2-sources.jar + ext/controlsfx-11.1.2.jar release/modules/ext/controlsfx-11.1.2.jar @@ -816,6 +938,118 @@ ext/jackson-dataformat-csv-2.13.2.jar release/modules/ext/jackson-dataformat-csv-2.13.2.jar + + ext/javafx-base-17.0.7-linux.jar + release/modules/ext/javafx-base-17.0.7-linux.jar + + + ext/javafx-base-17.0.7-mac.jar + release/modules/ext/javafx-base-17.0.7-mac.jar + + + ext/javafx-base-17.0.7-win.jar + release/modules/ext/javafx-base-17.0.7-win.jar + + + ext/javafx-base-17.0.7.jar + release/modules/ext/javafx-base-17.0.7.jar + + + ext/javafx-controls-17.0.7-linux.jar + release/modules/ext/javafx-controls-17.0.7-linux.jar + + + ext/javafx-controls-17.0.7-mac.jar + release/modules/ext/javafx-controls-17.0.7-mac.jar + + + ext/javafx-controls-17.0.7-win.jar + release/modules/ext/javafx-controls-17.0.7-win.jar + + + ext/javafx-controls-17.0.7.jar + release/modules/ext/javafx-controls-17.0.7.jar + + + ext/javafx-fxml-17.0.7-linux.jar + release/modules/ext/javafx-fxml-17.0.7-linux.jar + + + ext/javafx-fxml-17.0.7-mac.jar + release/modules/ext/javafx-fxml-17.0.7-mac.jar + + + ext/javafx-fxml-17.0.7-win.jar + release/modules/ext/javafx-fxml-17.0.7-win.jar + + + ext/javafx-fxml-17.0.7.jar + release/modules/ext/javafx-fxml-17.0.7.jar + + + ext/javafx-graphics-17.0.7-linux.jar + release/modules/ext/javafx-graphics-17.0.7-linux.jar + + + ext/javafx-graphics-17.0.7-mac.jar + release/modules/ext/javafx-graphics-17.0.7-mac.jar + + + ext/javafx-graphics-17.0.7-win.jar + release/modules/ext/javafx-graphics-17.0.7-win.jar + + + ext/javafx-graphics-17.0.7.jar + release/modules/ext/javafx-graphics-17.0.7.jar + + + ext/javafx-media-17.0.7-linux.jar + release/modules/ext/javafx-media-17.0.7-linux.jar + + + ext/javafx-media-17.0.7-mac.jar + release/modules/ext/javafx-media-17.0.7-mac.jar + + + ext/javafx-media-17.0.7-win.jar + release/modules/ext/javafx-media-17.0.7-win.jar + + + ext/javafx-media-17.0.7.jar + release/modules/ext/javafx-media-17.0.7.jar + + + ext/javafx-swing-17.0.7-linux.jar + release/modules/ext/javafx-swing-17.0.7-linux.jar + + + ext/javafx-swing-17.0.7-mac.jar + release/modules/ext/javafx-swing-17.0.7-mac.jar + + + ext/javafx-swing-17.0.7-win.jar + release/modules/ext/javafx-swing-17.0.7-win.jar + + + ext/javafx-swing-17.0.7.jar + release/modules/ext/javafx-swing-17.0.7.jar + + + ext/javafx-web-17.0.7-linux.jar + release/modules/ext/javafx-web-17.0.7-linux.jar + + + ext/javafx-web-17.0.7-mac.jar + release/modules/ext/javafx-web-17.0.7-mac.jar + + + ext/javafx-web-17.0.7-win.jar + release/modules/ext/javafx-web-17.0.7-win.jar + + + ext/javafx-web-17.0.7.jar + release/modules/ext/javafx-web-17.0.7.jar + ext/javax.annotation-api-1.3.2.jar release/modules/ext/javax.annotation-api-1.3.2.jar diff --git a/KeywordSearch/solr/bin/autopsy-solr.cmd b/KeywordSearch/solr/bin/autopsy-solr.cmd index 9e1ec90d88..4e7bbd047d 100755 --- a/KeywordSearch/solr/bin/autopsy-solr.cmd +++ b/KeywordSearch/solr/bin/autopsy-solr.cmd @@ -1,4 +1,4 @@ -@REM set JAVA_HOME=C:\Program Files\BellSoft\LibericaJDK-17-Full +@REM set JAVA_HOME=C:\Program Files\Java\jdk-17 @REM set SOLR_SERVER_DIR=C:\Bitnami\solr-8.2.0-2/apache-solr/server set SOLR_PORT=8983 set STOP_PORT=8079 diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties index 565804dea4..12e6ab211f 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties @@ -85,6 +85,8 @@ KeywordSearchFilterNode.getFileActions.searchSameMd5=Search for files with the s KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=View in New Window KeywordSearchIngestModule.init.noKwInLstMsg=No keywords in keyword list. KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest). +KeywordSearchIngestModule.init.SolrIndexingDisabled=Solr indexing is disabled. +KeywordSearchIngestModule.init.indexingDisabled=Text indexing is disabled. See user manual section "Limitations of Ad Hoc Keyword Search" for details. KeywordSearchIngestModule.doInBackGround.displayName=Periodic Keyword Search KeywordSearchIngestModule.doInBackGround.finalizeMsg=Finalizing KeywordSearchIngestModule.doInBackGround.pendingMsg=(Pending) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED index 2ff50a4048..0bf48a5370 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED @@ -137,6 +137,8 @@ KeywordSearchFilterNode.getFileActions.searchSameMd5=Search for files with the s KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=View in New Window KeywordSearchIngestModule.init.noKwInLstMsg=No keywords in keyword list. KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest). +KeywordSearchIngestModule.init.SolrIndexingDisabled=Solr indexing is disabled. +KeywordSearchIngestModule.init.indexingDisabled=Text indexing is disabled. See user manual section "Limitations of Ad Hoc Keyword Search" for details. KeywordSearchIngestModule.doInBackGround.displayName=Periodic Keyword Search KeywordSearchIngestModule.doInBackGround.finalizeMsg=Finalizing KeywordSearchIngestModule.doInBackGround.pendingMsg=(Pending) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index cd6f255def..b3a0a1b3b3 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -318,9 +318,15 @@ public final class KeywordSearchIngestModule implements FileIngestModule { break; } } - if (!hasKeywordsForSearch) { - services.postMessage(IngestMessage.createWarningMessage(KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.noKwInLstMsg"), - NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.onlyIdxKwSkipMsg"))); + + if (!settings.isIndexToSolrEnabled()) { + services.postMessage(IngestMessage.createWarningMessage(KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.SolrIndexingDisabled"), + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.indexingDisabled"))); + } else { + if (!hasKeywordsForSearch) { + services.postMessage(IngestMessage.createWarningMessage(KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.noKwInLstMsg"), + NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.onlyIdxKwSkipMsg"))); + } } } } diff --git a/README.txt b/README.txt index 063d6bc7a7..9aabcd6fc3 100644 --- a/README.txt +++ b/README.txt @@ -43,8 +43,8 @@ This section lists the software components and libraries that are used by Autopsy. These tools are bundled with the Windows installer, unless specified otherwise. JRE (Java Runtime Environment) 17 -- Web page: https://bell-sw.com/pages/downloads/ -- License: https://bell-sw.com/liberica_eula/ +- Web page: https://www.oracle.com/java/technologies/downloads/#java17 +- License: https://www.oracle.com/a/tech/docs/jdk17-lium.pdf Netbeans 15 RCP platform and .jar files bundled with the platform - Web page: https://netbeans.apache.org/ diff --git a/Running_Linux_OSX.md b/Running_Linux_OSX.md index d6946d6c6e..c35ca091e0 100644 --- a/Running_Linux_OSX.md +++ b/Running_Linux_OSX.md @@ -9,11 +9,11 @@ When installing on Debian-based Linux or macOS systems, there are three general # Installing The Sleuth Kit - **Linux**: Download the .deb file for the release you want to install from the [release section](https://github.com/sleuthkit/sleuthkit/releases). Install The Sleuth Kit package from the repositories with the following command: `sudo apt update && sudo apt install /path/to/sleuthkit-version.deb`. -- **macOS**: Ensure that for this session, your `JAVA_HOME` variable is set to the java 17 installation by running `export JAVA_HOME=$(/usr/libexec/java_home -v 17)/bin/java`. Then, install The Sleuth Kit from source by running [`linux_macos_install_scripts/install_tsk_from_src.sh`](./linux_macos_install_scripts/install_tsk_from_src.sh), which will download, build, and install The Sleuth Kit. It can be run as follows: `install_tsk_from_src.sh -p ~/src/sleuthkit -b sleuthkit-4.11.1`. Make sure that your path to download source ends with "sleuthkit" as the last directory, and the release is the corresponding tag in the [repository](https://github.com/sleuthkit/sleuthkit). +- **macOS**: Ensure that for this session, your `JAVA_HOME` variable is set to the java 17 installation by running `export JAVA_HOME=$(/usr/libexec/java_home -v 17)`. Then, install The Sleuth Kit from source by running [`linux_macos_install_scripts/install_tsk_from_src.sh`](./linux_macos_install_scripts/install_tsk_from_src.sh), which will download, build, and install The Sleuth Kit. It can be run as follows: `install_tsk_from_src.sh -p ~/src/sleuthkit -b sleuthkit-4.11.1`. Make sure that your path to download source ends with "sleuthkit" as the last directory, and the release is the corresponding tag in the [repository](https://github.com/sleuthkit/sleuthkit). # Installing Autopsy - Download the Autopsy zip file from [repository releases](https://github.com/sleuthkit/autopsy/releases). The file will be marked as "autopsy-<release>.zip" (i.e. "autopsy-4.19.2.zip"). -- Run [`install_application.sh`](./linux_macos_install_scripts/install_application.sh) with the following parameters: `install_application.sh [-z zip_path] [-i install_directory] [-j java_home]`. An example would be `install_application.sh -z ~/Downloads/autopsy-4.19.2.zip -i ~/autopsy -j /usr/lib/jvm/bellsoft-java17-full-amd64`. The path to the Java 17 home is the last output from the [prequisites installation scripts](#installing-prerequisites), but typically, the path will be `/usr/lib/jvm/bellsoft-java17-full-amd64` on Debian-based Linux or the output of running `/usr/libexec/java_home -v 17` on macOS. +- Run [`install_application.sh`](./linux_macos_install_scripts/install_application.sh) with the following parameters: `install_application.sh [-z zip_path] [-i install_directory] [-j java_home]`. An example would be `install_application.sh -z ~/Downloads/autopsy-4.19.2.zip -i ~/autopsy -j /usr/lib/jvm/java-1.17.0-openjdk-amd64`. The path to the Java 17 home is the last output from the [prequisites installation scripts](#installing-prerequisites), but typically, the path will be in the result of running `update-java-alternatives -l | grep java-1.17` on Debian-based Linux or the output of running `/usr/libexec/java_home -v 17` on macOS. # Setup macOS JNA paths If you are on macOS, run [linux_macos_install_scripts/add_macos_jna.sh](./linux_macos_install_scripts/add_macos_jna.sh) to properly setup the jna path to get things like gstreamer working. An example would be `add_macos_jna.sh -i ~/autopsy`. @@ -26,9 +26,9 @@ If you are on macOS, run [linux_macos_install_scripts/add_macos_jna.sh](./linux_ the wrong version of Java is being used to run Autopsy. Check the version of Java reported in the `messages.log` file in the log directory. The log directory can be found by opening Autopsy, and, with no cases open, go to 'Help' > 'Open Log Folder'. `messages.log` should contain lines that looks like: ``` - Java; VM; Vendor = 17.0.7; OpenJDK 64-Bit Server VM 17.0.7+7-LTS; BellSoft - Runtime = OpenJDK Runtime Environment 17.0.7+7-LTS - Java Home = /usr/lib/jvm/bellsoft-java17-full-amd64 + Java; VM; Vendor = 17.0.7; OpenJDK 64-Bit Server VM 17.0.7+7-Ubuntu-0ubuntu122.04.2; Private Build + Runtime = OpenJDK Runtime Environment 17.0.7+7-Ubuntu-0ubuntu122.04.2 + Java Home = /usr/lib/jvm/java-17-openjdk-amd64 ``` If your `messages.log` file indicates that Java 17 is not being used: diff --git a/appveyor.yml b/appveyor.yml index d691bcd385..58c97ed5c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,14 +11,13 @@ platform: x64 environment: global: TSK_HOME: "C:\\sleuthkit" - JDK_HOME: C:\Program Files\BellSoft\LibericaJDK-17-Full - JAVA_HOME: C:\Program Files\BellSoft\LibericaJDK-17-Full + JDK_HOME: C:\Program Files\Java\jdk17 + JAVA_HOME: C:\Program Files\Java\jdk17 PYTHON: "C:\\Python36-x64" install: - ps: choco install nuget.commandline - ps: choco install ant --ignore-dependencies - - ps: choco install liberica17jdkfull --force - git clone https://github.com/sleuthkit/sleuthkit - ps: $env:Path="$($env:JAVA_HOME)\bin;$($env:Path);C:\ProgramData\chocolatey\lib\ant" - set PATH=C:\Python36-x64\';%PATH% diff --git a/build-windows-installer.xml b/build-windows-installer.xml index f6d328443c..92e5871d4b 100644 --- a/build-windows-installer.xml +++ b/build-windows-installer.xml @@ -27,19 +27,6 @@ --> - - - - - - - - - - - - - @@ -100,14 +87,27 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -140,7 +140,7 @@ - + @@ -178,7 +178,7 @@ - + diff --git a/build.xml b/build.xml index 6da31fec50..fde76f6981 100644 --- a/build.xml +++ b/build.xml @@ -148,7 +148,7 @@ - + diff --git a/developers/envvarsetup.py b/developers/envvarsetup.py index b0709ff004..bb9b8dcea7 100755 --- a/developers/envvarsetup.py +++ b/developers/envvarsetup.py @@ -34,7 +34,7 @@ open_jdk_64_home is the 64 bit jdk and is the assumed default source_base_path is the directory containing all necessary repos (i.e. autopsy, sleuthkit, etc.) open_jdk_32_home and postgres_32_home are only necessary if building binaries ''' -open_jdk_64_home = "C:\\Program Files\\BellSoft\\LibericaJDK-17-Full" +open_jdk_64_home = "C:\\Program Files\\Java\\jdk-17" postgres_home = "C:\\Program Files\\PostgreSQL\\9.5" ant_home = "C:\\Program Files\\NetBeans-17\\netbeans\\extide\\ant" open_jdk_home = open_jdk_64_home diff --git a/docs/doxygen-dev/Doxyfile b/docs/doxygen-dev/Doxyfile index 1bb93877f4..66497c563c 100755 --- a/docs/doxygen-dev/Doxyfile +++ b/docs/doxygen-dev/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "Autopsy Developer Documentation" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.19.3 +PROJECT_NUMBER = 4.20.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -1025,7 +1025,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = 4.19.3 +HTML_OUTPUT = 4.20.0 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). diff --git a/docs/doxygen-user/Doxyfile b/docs/doxygen-user/Doxyfile index f7740fa8f0..e836298f10 100644 --- a/docs/doxygen-user/Doxyfile +++ b/docs/doxygen-user/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "Autopsy User Documentation" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.19.3 +PROJECT_NUMBER = 4.20.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -1025,7 +1025,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = 4.19.3 +HTML_OUTPUT = 4.20.0 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). diff --git a/docs/doxygen-user/data_sources.dox b/docs/doxygen-user/data_sources.dox index 81336e74ab..0dd49b9868 100644 --- a/docs/doxygen-user/data_sources.dox +++ b/docs/doxygen-user/data_sources.dox @@ -103,7 +103,8 @@ To add a local drive: You can add files or folders that are on your local computer (or on a shared drive) without putting them into a disk image. This is useful if you have only a collection of files that you want to analyze. Some things to note when doing this: -- Autopsy ignores the time stamps on files that it adds this way because they could be the timestamps when they were copied onto your examination device. +- Autopsy by default ignores the time stamps on files that it adds this way because they could be the timestamps when they were copied onto your examination device. +- You do have the option to have time stamps added on files by checking the timestamps you want, these time stamps are taken from the examination device. Directories will not have time stamps. - If you have a USB-attached device that you are analyzing and you choose to add the device's contents using this method, then note that it will not look at unallocated space or deleted files. Autopsy will only be able to see the allocated files. You should add the device as a "Logical Drive" to analyze the unallocated space. - You can modify the name of the Logical File Set from the default LogicalFileSet# by clicking the "Change" button as shown in the screenshot below: @@ -114,6 +115,8 @@ To add logical files: -# Leave the top combo box on "Local files and folders" -# Press the "Add" button and navigate to a folder or file to add. Choosing a folder will cause all of its contents (including sub-folders) to be added. -# Continue to press "Add" until all files and folders have been selected. +-# If you want any of the files to be added with time stamps from the file system then check the box associated with the timestamp you would like associaed with the file. +-# If a file or directory was mistakenly added then highlight it and press the "Delete" button to remove the item from the list of files/folders All of the files that you added in the panel will be grouped together into a single data source, called "LogicalFileSet" in the main UI. diff --git a/docs/doxygen-user/images/change_logical_file_set_display_name.PNG b/docs/doxygen-user/images/change_logical_file_set_display_name.PNG index dfaa158c0f..d6b3871377 100644 Binary files a/docs/doxygen-user/images/change_logical_file_set_display_name.PNG and b/docs/doxygen-user/images/change_logical_file_set_display_name.PNG differ diff --git a/docs/doxygen-user/multi-user/installSolr.dox b/docs/doxygen-user/multi-user/installSolr.dox index 587eeca9cd..876a1f33e7 100644 --- a/docs/doxygen-user/multi-user/installSolr.dox +++ b/docs/doxygen-user/multi-user/installSolr.dox @@ -52,7 +52,7 @@ Follow these steps to configure Solr: Required Solr Configuration Parameters:
    -
  • JAVA_HOME – path to 64-bit JRE installation. For example \c "JAVA_HOME= C:\Program Files\BellSoft\LibericaJDK-17-Full" or \c "JAVA_HOME=C:\Program Files\BellSoft\LibericaJDK-17-Full" +
  • JAVA_HOME – path to 64-bit JRE installation. For example \c "JAVA_HOME=C:\Program Files\Java\jdk-17"
  • DEFAULT_CONFDIR – path to Autopsy configuration directory. If the Solr archive was extracted into \c "C:\solr-8.6.3" directory, then this path will be \c "C:\ solr-8.6.3\server\solr\configsets\AutopsyConfig\conf". Do not include quotes around the path.
  • SOLR_JAVA_MEM - Solr JVM heap size should be as large as the Solr machine’s resources allow, at least half of the total RAM available on the machine. A rule of thumb would be use "set SOLR_JAVA_MEM=-Xms2G -Xmx40G" for a machine with 64GB of RAM, "set SOLR_JAVA_MEM=-Xms2G -Xmx20G" for a machine with 32GB of RAM, and "set SOLR_JAVA_MEM=-Xms2G -Xmx8G" for a machine with 16GB of RAM. Please see the \ref install_solr_heap_usage "troubleshooting section" for more info regarding Solr heap usage and troubleshooting information.
  • SOLR_DATA_HOME – location where Solr indexes will be stored. If this is not configured, the indexes will be stored in the \c "C:\solr-8.6.3\server\solr" directory. NOTE: for Autopsy cases consisting of large number of data sources, Solr indexes can get very large (hundreds of GBs, or TBs) so they should probably be stored on a larger network share. diff --git a/docs/doxygen-user_fr/Doxyfile b/docs/doxygen-user_fr/Doxyfile index 177c9cdb6e..4538fd297c 100644 --- a/docs/doxygen-user_fr/Doxyfile +++ b/docs/doxygen-user_fr/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "Documentation utilisateur Autopsy" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.19.1 +PROJECT_NUMBER = 4.20.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -1025,7 +1025,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = 4.19.1 +HTML_OUTPUT = 4.20.0 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). diff --git a/docs/doxygen-user_fr/multi-user/installSolr.dox b/docs/doxygen-user_fr/multi-user/installSolr.dox index b22d831c96..140a6db0e6 100644 --- a/docs/doxygen-user_fr/multi-user/installSolr.dox +++ b/docs/doxygen-user_fr/multi-user/installSolr.dox @@ -52,7 +52,7 @@ Suivez ces étapes pour configurer Solr: Paramètres de configuration requis pour Solr:
      -
    • JAVA_HOME – chemin d'accès à l'installation du JRE 64 bits. Par exemple \c "JAVA_HOME=C:\Program Files\Java\jre1.8.0_151" ou \c "JAVA_HOME=C:\Program Files\BellSoft\LibericaJDK-17-Full" +
    • JAVA_HOME – chemin d'accès à l'installation du JRE 64 bits. Par exemple \c "JAVA_HOME=C:\Program Files\Java\jdk-17"
    • DEFAULT_CONFDIR – chemin vers le répertoire de configuration d'Autopsy. Si l'archive Solr a été extraite dans le répertoire \c "C:\solr-8.6.3", alors ce chemin sera \c "C:\ solr-8.6.3\server\solr\configsets\AutopsyConfig\conf". N'incluez pas de guillemets autour du chemin.
    • SOLR_JAVA_MEM - La taille du tas JVM Solr doit être aussi grande que les ressources de la machine Solr le permettent, au moins la moitié de la RAM totale disponible sur la machine. Une règle empirique serait d'utiliser "set SOLR_JAVA_MEM=-Xms2G -Xmx40G" pour une machine avec 64 Go de RAM, "set SOLR_JAVA_MEM=-Xms2G -Xmx20G" pour une machine avec 32 Go de RAM, et "set SOLR_JAVA_MEM=-Xms2G -Xmx8G" pour une machine avec 16 Go de RAM. Veuillez consulter la \ref install_solr_heap_usage "rubrique dépannage" pour plus d'informations sur l'utilisation du tas Solr et sur les informations de dépannage.
    • SOLR_DATA_HOME – emplacement où les index Solr seront stockés. Si ce n'est pas configuré, les index seront stockés dans le répertoire \c "C:\solr-8.6.3\server\solr". REMARQUE: pour les cas d'Autopsy composés d'un grand nombre de sources de données, les index Solr peuvent devenir très volumineux (des centaines de Go ou de To), ils devront donc probablement être stockés sur un partage réseau plus important. diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index 5eead8e4cf..4859eab17f 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "Autopsy" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.19.3 +PROJECT_NUMBER = 4.20.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears a the top of each page and should give viewer a @@ -1066,7 +1066,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = api-docs/4.19.3/ +HTML_OUTPUT = api-docs/4.20.0/ # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). diff --git a/installer_autopsy/etc/autopsy.conf b/installer_autopsy/etc/autopsy.conf index ab7b2fe00c..a92a08d04b 100755 --- a/installer_autopsy/etc/autopsy.conf +++ b/installer_autopsy/etc/autopsy.conf @@ -59,7 +59,7 @@ default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev" # options used by the launcher by default, can be overridden by explicit # command line switches -default_options="--branding autopsy -J-Xms24m -J-XX:+UseStringDeduplication -J-Dprism.order=sw -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED" +default_options="--branding autopsy -J-Xms24m -J-XX:+UseStringDeduplication -J-Dprism.order=sw -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED" # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea # default location of JDK/JRE, can be overridden by using --jdkhome switch diff --git a/linux_macos_install_scripts/install_prereqs_macos.sh b/linux_macos_install_scripts/install_prereqs_macos.sh index 8a35cd819f..79dea276c2 100644 --- a/linux_macos_install_scripts/install_prereqs_macos.sh +++ b/linux_macos_install_scripts/install_prereqs_macos.sh @@ -1,15 +1,6 @@ #!/bin/bash -echo "Installing liberica java 17..." -brew tap bell-sw/liberica && \ -brew install --cask liberica-jdk17-full -if [[ $? -ne 0 ]] -then - echo "Unable to install liberica java" >> /dev/stderr - exit 1 -fi - -echo "Installing remaining dependencies..." -brew install ant automake libtool afflib libewf postgresql@15 testdisk libheif gstreamer +echo "Installing dependencies..." +brew install openjdk@17 ant automake libtool afflib libewf postgresql@15 testdisk libheif gstreamer if [[ $? -ne 0 ]] then @@ -17,5 +8,15 @@ then exit 1 fi +sudo ln -sfn $HOMEBREW_PREFIX/opt/openjdk@17/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-17.jdk && \ +echo "export PATH=\"$HOMEBREW_PREFIX/opt/openjdk@17/bin:$PATH\"" >> ~/.zshrc && \ +source ~/.zshrc + +if [[ $? -ne 0 ]] +then + echo "Unable to properly set up java env" >> /dev/stderr + exit 1 +fi + java_path=$(/usr/libexec/java_home -v 17) echo "Java 17 path: $java_path" \ No newline at end of file diff --git a/linux_macos_install_scripts/install_prereqs_ubuntu.sh b/linux_macos_install_scripts/install_prereqs_ubuntu.sh index 498dd546a1..f5897e23d1 100644 --- a/linux_macos_install_scripts/install_prereqs_ubuntu.sh +++ b/linux_macos_install_scripts/install_prereqs_ubuntu.sh @@ -11,7 +11,9 @@ fi echo "Installing all apt dependencies..." sudo apt update && \ - sudo apt -y install build-essential autoconf libtool automake git zip wget ant \ + sudo apt -y install \ + openjdk-17-jdk openjdk-17-jre \ + build-essential autoconf libtool automake git zip wget ant \ libde265-dev libheif-dev \ libpq-dev \ testdisk libafflib-dev libewf-dev libvhdi-dev libvmdk-dev \ @@ -24,18 +26,6 @@ if [[ $? -ne 0 ]]; then exit 1 fi -echo "Installing bellsoft Java 17..." -pushd /usr/src/ && - wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add - && - echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" | sudo tee /etc/apt/sources.list.d/bellsoft.list && - sudo apt update && - sudo apt -y install bellsoft-java17-full && - popd -if [[ $? -ne 0 ]]; then - echo "Failed to install bellsoft java 17" >>/dev/stderr - exit 1 -fi - echo "Autopsy prerequisites installed." -echo "Java path at /usr/lib/jvm/bellsoft-java17-full-amd64: " -ls /usr/lib/jvm/bellsoft-java17-full-amd64 \ No newline at end of file +echo "Java 17 instllation: " +update-java-alternatives -l | grep java-1.17 diff --git a/nbproject/project.properties b/nbproject/project.properties index 86e5d275ca..e8d17eb3c8 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -19,7 +19,7 @@ update_versions=false #Note: can be higher on 64 bit systems, should be in sync with build.xml # for Japanese version add: -J-Duser.language=ja # NOTE: Modules need to be exported to other components for visibility (and use). See https://stackoverflow.com/questions/53695304/autocompletionbinding-cannot-access-class-com-sun-javafx-event-eventhandlermanag -run.args.extra=-J-Xms24m -J-Xmx4G -J-XX:+UseStringDeduplication -J-Dprism.order=sw -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED +run.args.extra=-J-Xms24m -J-Xmx4G -J-XX:+UseStringDeduplication -J-Dprism.order=sw -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED -J--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED auxiliary.org-netbeans-modules-apisupport-installer.license-type=apache.v2 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false diff --git a/thirdparty/opencv/README.txt b/thirdparty/opencv/README.txt new file mode 100644 index 0000000000..94e4551dba --- /dev/null +++ b/thirdparty/opencv/README.txt @@ -0,0 +1,4 @@ +README: + +This is OpenCV jar and binaries from version 2.4.13.6 from opencv downloads: +https://opencv.org/releases \ No newline at end of file diff --git a/thirdparty/opencv/ext/opencv-248.jar b/thirdparty/opencv/ext/opencv-248.jar deleted file mode 100755 index f09b29077d..0000000000 Binary files a/thirdparty/opencv/ext/opencv-248.jar and /dev/null differ diff --git a/thirdparty/opencv/lib/amd64/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/amd64/opencv_ffmpeg248_64.dll deleted file mode 100755 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/amd64/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/amd64/opencv_java248.dll b/thirdparty/opencv/lib/amd64/opencv_java248.dll deleted file mode 100755 index ab989a6b11..0000000000 Binary files a/thirdparty/opencv/lib/amd64/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_ffmpeg2413.dll b/thirdparty/opencv/lib/i386/opencv_ffmpeg2413.dll deleted file mode 100644 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_ffmpeg2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_ffmpeg248.dll b/thirdparty/opencv/lib/i386/opencv_ffmpeg248.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_ffmpeg248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_java2413.dll b/thirdparty/opencv/lib/i386/opencv_java2413.dll deleted file mode 100644 index c25b6209f8..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i386/opencv_java248.dll b/thirdparty/opencv/lib/i386/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/i386/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_ffmpeg2413_64.dll b/thirdparty/opencv/lib/i586/opencv_ffmpeg2413_64.dll deleted file mode 100644 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_ffmpeg2413_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/i586/opencv_ffmpeg248_64.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_java2413.dll b/thirdparty/opencv/lib/i586/opencv_java2413.dll deleted file mode 100644 index e1aeca4ba5..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i586/opencv_java248.dll b/thirdparty/opencv/lib/i586/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/i586/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_ffmpeg2413_64.dll b/thirdparty/opencv/lib/i686/opencv_ffmpeg2413_64.dll deleted file mode 100644 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_ffmpeg2413_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/i686/opencv_ffmpeg248_64.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_java2413.dll b/thirdparty/opencv/lib/i686/opencv_java2413.dll deleted file mode 100644 index e1aeca4ba5..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/i686/opencv_java248.dll b/thirdparty/opencv/lib/i686/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/i686/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_ffmpeg2413.dll b/thirdparty/opencv/lib/x86/opencv_ffmpeg2413.dll deleted file mode 100644 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_ffmpeg2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_ffmpeg248.dll b/thirdparty/opencv/lib/x86/opencv_ffmpeg248.dll deleted file mode 100755 index b1e70df6a3..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_ffmpeg248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_java2413.dll b/thirdparty/opencv/lib/x86/opencv_java2413.dll deleted file mode 100644 index c25b6209f8..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_java2413.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86/opencv_java248.dll b/thirdparty/opencv/lib/x86/opencv_java248.dll deleted file mode 100755 index f1c1bc9a43..0000000000 Binary files a/thirdparty/opencv/lib/x86/opencv_java248.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86_64/opencv_ffmpeg248_64.dll b/thirdparty/opencv/lib/x86_64/opencv_ffmpeg248_64.dll deleted file mode 100755 index 37236e5424..0000000000 Binary files a/thirdparty/opencv/lib/x86_64/opencv_ffmpeg248_64.dll and /dev/null differ diff --git a/thirdparty/opencv/lib/x86_64/opencv_java248.dll b/thirdparty/opencv/lib/x86_64/opencv_java248.dll deleted file mode 100755 index ab989a6b11..0000000000 Binary files a/thirdparty/opencv/lib/x86_64/opencv_java248.dll and /dev/null differ