Merge pull request #7806 from gdicristofaro/javafx-changes

Javafx changes
This commit is contained in:
eugene7646 2023-06-29 16:17:52 -04:00 committed by GitHub
commit 85e0d9945e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 390 additions and 73 deletions

View File

@ -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

View File

@ -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.

View File

@ -126,9 +126,9 @@ public class ImageUtils {
if (OpenCvLoader.openCvIsLoaded()) {
try {
if (System.getProperty("os.arch").equals("amd64") || System.getProperty("os.arch").equals("x86_64")) { //NON-NLS
System.loadLibrary("opencv_ffmpeg248_64"); //NON-NLS
System.loadLibrary("opencv_ffmpeg2413_64"); //NON-NLS
} else {
System.loadLibrary("opencv_ffmpeg248"); //NON-NLS
System.loadLibrary("opencv_ffmpeg2413"); //NON-NLS
}
tempFfmpegLoaded = true;
} catch (UnsatisfiedLinkError e) {

View File

@ -1,11 +1,58 @@
<ivy-module version="2.0">
<!DOCTYPE ivy-module [
<!ENTITY javafx.version "17.0.7">
]>
<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
<info organisation="org.sleuthkit.autopsy" module="corelibs"/>
<configurations >
<!-- module dependencies -->
<conf name="autopsy_core"/>
</configurations>
<dependencies>
<dependencies>
<dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-fxml" rev="&javafx.version;">
<artifact name="javafx-fxml" type="jar" />
<artifact name="javafx-fxml" type="jar" e:classifier="win"/>
<artifact name="javafx-fxml" type="jar" e:classifier="mac"/>
<artifact name="javafx-fxml" type="jar" e:classifier="linux"/>
</dependency>
<dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-graphics" rev="&javafx.version;">
<artifact name="javafx-graphics" type="jar" />
<artifact name="javafx-graphics" type="jar" e:classifier="win"/>
<artifact name="javafx-graphics" type="jar" e:classifier="mac"/>
<artifact name="javafx-graphics" type="jar" e:classifier="linux"/>
</dependency>
<dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-controls" rev="&javafx.version;">
<artifact name="javafx-controls" type="jar" />
<artifact name="javafx-controls" type="jar" e:classifier="win"/>
<artifact name="javafx-controls" type="jar" e:classifier="mac"/>
<artifact name="javafx-controls" type="jar" e:classifier="linux"/>
</dependency>
<dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-base" rev="&javafx.version;">
<artifact name="javafx-base" type="jar" />
<artifact name="javafx-base" type="jar" e:classifier="win"/>
<artifact name="javafx-base" type="jar" e:classifier="mac"/>
<artifact name="javafx-base" type="jar" e:classifier="linux"/>
</dependency>
<dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-swing" rev="&javafx.version;" >
<artifact name="javafx-swing" type="jar" />
<artifact name="javafx-swing" type="jar" e:classifier="win"/>
<artifact name="javafx-swing" type="jar" e:classifier="mac"/>
<artifact name="javafx-swing" type="jar" e:classifier="linux"/>
</dependency>
<dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-web" rev="&javafx.version;" >
<artifact name="javafx-web" type="jar" />
<artifact name="javafx-web" type="jar" e:classifier="win"/>
<artifact name="javafx-web" type="jar" e:classifier="mac"/>
<artifact name="javafx-web" type="jar" e:classifier="linux"/>
</dependency>
<dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-media" rev="&javafx.version;">
<artifact name="javafx-media" type="jar" />
<artifact name="javafx-media" type="jar" e:classifier="win"/>
<artifact name="javafx-media" type="jar" e:classifier="mac"/>
<artifact name="javafx-media" type="jar" e:classifier="linux"/>
</dependency>
<dependency conf="autopsy_core->default" org="org.apache.ant" name="ant-launcher" rev="1.10.12"/>
<dependency conf="autopsy_core->default" org="org.apache.ant" name="ant" rev="1.10.12"/>

View File

@ -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
@ -99,7 +128,7 @@ file.reference.log4j-core-2.17.2.jar=release/modules/ext/log4j-core-2.17.2.jar
file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar
file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar
file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.jar
file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
file.reference.opencv-2413.jar=release/modules/ext/opencv-2413.jar
file.reference.perfmark-api-0.23.0.jar=release/modules/ext/perfmark-api-0.23.0.jar
file.reference.proto-google-cloud-translate-v3-2.1.11.jar=release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar
file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar

View File

@ -199,6 +199,83 @@
<package>com.google.type</package>
<package>com.microsoft.schemas.vml</package>
<package>com.microsoft.schemas.vml.impl</package>
<package>com.sun.javafx</package>
<package>com.sun.javafx.animation</package>
<package>com.sun.javafx.application</package>
<package>com.sun.javafx.beans</package>
<package>com.sun.javafx.beans.event</package>
<package>com.sun.javafx.binding</package>
<package>com.sun.javafx.charts</package>
<package>com.sun.javafx.collections</package>
<package>com.sun.javafx.css</package>
<package>com.sun.javafx.css.parser</package>
<package>com.sun.javafx.cursor</package>
<package>com.sun.javafx.effect</package>
<package>com.sun.javafx.embed</package>
<package>com.sun.javafx.embed.swing</package>
<package>com.sun.javafx.embed.swing.newimpl</package>
<package>com.sun.javafx.event</package>
<package>com.sun.javafx.font</package>
<package>com.sun.javafx.font.coretext</package>
<package>com.sun.javafx.font.directwrite</package>
<package>com.sun.javafx.font.freetype</package>
<package>com.sun.javafx.fxml</package>
<package>com.sun.javafx.fxml.builder</package>
<package>com.sun.javafx.fxml.builder.web</package>
<package>com.sun.javafx.fxml.expression</package>
<package>com.sun.javafx.geom</package>
<package>com.sun.javafx.geom.transform</package>
<package>com.sun.javafx.geometry</package>
<package>com.sun.javafx.iio</package>
<package>com.sun.javafx.iio.bmp</package>
<package>com.sun.javafx.iio.common</package>
<package>com.sun.javafx.iio.gif</package>
<package>com.sun.javafx.iio.ios</package>
<package>com.sun.javafx.iio.jpeg</package>
<package>com.sun.javafx.iio.png</package>
<package>com.sun.javafx.image</package>
<package>com.sun.javafx.image.impl</package>
<package>com.sun.javafx.logging</package>
<package>com.sun.javafx.logging.jfr</package>
<package>com.sun.javafx.media</package>
<package>com.sun.javafx.menu</package>
<package>com.sun.javafx.perf</package>
<package>com.sun.javafx.print</package>
<package>com.sun.javafx.property</package>
<package>com.sun.javafx.property.adapter</package>
<package>com.sun.javafx.reflect</package>
<package>com.sun.javafx.runtime</package>
<package>com.sun.javafx.runtime.async</package>
<package>com.sun.javafx.runtime.eula</package>
<package>com.sun.javafx.scene</package>
<package>com.sun.javafx.scene.canvas</package>
<package>com.sun.javafx.scene.control</package>
<package>com.sun.javafx.scene.control.behavior</package>
<package>com.sun.javafx.scene.control.inputmap</package>
<package>com.sun.javafx.scene.control.skin</package>
<package>com.sun.javafx.scene.control.skin.resources</package>
<package>com.sun.javafx.scene.input</package>
<package>com.sun.javafx.scene.layout</package>
<package>com.sun.javafx.scene.layout.region</package>
<package>com.sun.javafx.scene.media</package>
<package>com.sun.javafx.scene.paint</package>
<package>com.sun.javafx.scene.shape</package>
<package>com.sun.javafx.scene.text</package>
<package>com.sun.javafx.scene.transform</package>
<package>com.sun.javafx.scene.traversal</package>
<package>com.sun.javafx.scene.web</package>
<package>com.sun.javafx.scene.web.behavior</package>
<package>com.sun.javafx.sg.prism</package>
<package>com.sun.javafx.sg.prism.web</package>
<package>com.sun.javafx.stage</package>
<package>com.sun.javafx.text</package>
<package>com.sun.javafx.tk</package>
<package>com.sun.javafx.tk.quantum</package>
<package>com.sun.javafx.util</package>
<package>com.sun.javafx.webkit</package>
<package>com.sun.javafx.webkit.prism</package>
<package>com.sun.javafx.webkit.prism.theme</package>
<package>com.sun.javafx.webkit.theme</package>
<package>com.sun.jna</package>
<package>com.sun.jna.platform</package>
<package>com.sun.jna.platform.dnd</package>
@ -208,6 +285,7 @@
<package>com.sun.jna.platform.wince</package>
<package>com.sun.jna.ptr</package>
<package>com.sun.jna.win32</package>
<package>com.sun.scenario.animation</package>
<package>com.twelvemonkeys.image</package>
<package>com.twelvemonkeys.imageio</package>
<package>com.twelvemonkeys.imageio.color</package>
@ -246,6 +324,44 @@
<package>javax.annotation</package>
<package>javax.annotation.concurrent</package>
<package>javax.annotation.meta</package>
<package>javafx.animation</package>
<package>javafx.application</package>
<package>javafx.beans</package>
<package>javafx.beans.binding</package>
<package>javafx.beans.property</package>
<package>javafx.beans.property.adapter</package>
<package>javafx.beans.value</package>
<package>javafx.collections</package>
<package>javafx.collections.transformation</package>
<package>javafx.concurrent</package>
<package>javafx.css</package>
<package>javafx.css.converter</package>
<package>javafx.embed.swing</package>
<package>javafx.event</package>
<package>javafx.fxml</package>
<package>javafx.geometry</package>
<package>javafx.graphics</package>
<package>javafx.print</package>
<package>javafx.scene</package>
<package>javafx.scene.canvas</package>
<package>javafx.scene.chart</package>
<package>javafx.scene.control</package>
<package>javafx.scene.control.cell</package>
<package>javafx.scene.control.skin</package>
<package>javafx.scene.effect</package>
<package>javafx.scene.image</package>
<package>javafx.scene.input</package>
<package>javafx.scene.layout</package>
<package>javafx.scene.media</package>
<package>javafx.scene.paint</package>
<package>javafx.scene.robot</package>
<package>javafx.scene.shape</package>
<package>javafx.scene.text</package>
<package>javafx.scene.transform</package>
<package>javafx.scene.web</package>
<package>javafx.stage</package>
<package>javafx.util</package>
<package>javafx.util.converter</package>
<package>javax.jms</package>
<package>javax.mail</package>
<package>javax.mail.event</package>
@ -471,7 +587,7 @@
<package>org.slf4j.helpers</package>
<package>org.slf4j.spi</package>
</public-packages>
<class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/animal-sniffer-annotations-1.21.jar</runtime-relative-path>
<binary-origin>release/modules/ext/animal-sniffer-annotations-1.21.jar</binary-origin>
</class-path-extension>
@ -583,6 +699,10 @@
<runtime-relative-path>ext/conscrypt-openjdk-uber-2.5.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/controlsfx-11.1.2-sources.jar</runtime-relative-path>
<binary-origin>release/modules/ext/controlsfx-11.1.2-sources.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/controlsfx-11.1.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/controlsfx-11.1.2.jar</binary-origin>
@ -811,6 +931,118 @@
<runtime-relative-path>ext/jackson-dataformat-csv-2.13.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jackson-dataformat-csv-2.13.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-base-17.0.7-linux.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-base-17.0.7-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-base-17.0.7-mac.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-base-17.0.7-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-base-17.0.7-win.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-base-17.0.7-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-base-17.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-base-17.0.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-controls-17.0.7-linux.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-controls-17.0.7-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-controls-17.0.7-mac.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-controls-17.0.7-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-controls-17.0.7-win.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-controls-17.0.7-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-controls-17.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-controls-17.0.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-fxml-17.0.7-linux.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-fxml-17.0.7-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-fxml-17.0.7-mac.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-fxml-17.0.7-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-fxml-17.0.7-win.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-fxml-17.0.7-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-fxml-17.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-fxml-17.0.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-graphics-17.0.7-linux.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-graphics-17.0.7-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-graphics-17.0.7-mac.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-graphics-17.0.7-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-graphics-17.0.7-win.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-graphics-17.0.7-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-graphics-17.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-graphics-17.0.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-media-17.0.7-linux.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-media-17.0.7-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-media-17.0.7-mac.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-media-17.0.7-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-media-17.0.7-win.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-media-17.0.7-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-media-17.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-media-17.0.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-swing-17.0.7-linux.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-swing-17.0.7-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-swing-17.0.7-mac.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-swing-17.0.7-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-swing-17.0.7-win.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-swing-17.0.7-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-swing-17.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-swing-17.0.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-web-17.0.7-linux.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-web-17.0.7-linux.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-web-17.0.7-mac.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-web-17.0.7-mac.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-web-17.0.7-win.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-web-17.0.7-win.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javafx-web-17.0.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javafx-web-17.0.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javax.annotation-api-1.3.2.jar</binary-origin>
@ -876,8 +1108,8 @@
<binary-origin>release/modules/ext/opencensus-proto-0.2.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
<binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
<runtime-relative-path>ext/opencv-2413.jar</runtime-relative-path>
<binary-origin>release/modules/ext/opencv-2413.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/perfmark-api-0.23.0.jar</runtime-relative-path>

View File

@ -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

View File

@ -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/

View File

@ -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-&lt;release&gt;.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:

View File

@ -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%

View File

@ -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

View File

@ -52,7 +52,7 @@ Follow these steps to configure Solr:
Required Solr Configuration Parameters:
<ul>
<li><b>JAVA_HOME</b> 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"
<li><b>JAVA_HOME</b> path to 64-bit JRE installation. For example \c "JAVA_HOME=C:\Program Files\Java\jdk-17"
<li><b>DEFAULT_CONFDIR</b> 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.
<li><b>SOLR_JAVA_MEM</b> - Solr JVM heap size should be as large as the Solr machines 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.
<li><b>SOLR_DATA_HOME</b> 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.

View File

@ -52,7 +52,7 @@ Suivez ces étapes pour configurer Solr:
Paramètres de configuration requis pour Solr:
<ul>
<li><b>JAVA_HOME</b> 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"
<li><b>JAVA_HOME</b> chemin d'accès à l'installation du JRE 64 bits. Par exemple \c "JAVA_HOME=C:\Program Files\Java\jdk-17"
<li><b>DEFAULT_CONFDIR</b> 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.
<li><b>SOLR_JAVA_MEM</b> - 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.
<li><b>SOLR_DATA_HOME</b> 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.

View File

@ -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"

View File

@ -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
echo "Java 17 instllation: "
update-java-alternatives -l | grep java-1.17

4
thirdparty/opencv/README.txt vendored Normal file
View File

@ -0,0 +1,4 @@
README:
This is OpenCV jar and binaries from version 2.4.13.6 from opencv downloads:
https://opencv.org/releases

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.