diff --git a/.travis.yml b/.travis.yml index dfe0a70a66..28218be2c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,16 +52,16 @@ before_script: 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-java11-full; + sudo apt-get install bellsoft-java17-full; export PATH=/usr/bin:$PATH; - export JAVA_HOME=/usr/lib/jvm/bellsoft-java11-full-amd64; + export JAVA_HOME=/usr/lib/jvm/bellsoft-java17-full-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 cask install liberica-jdk11-full; - export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-11-full.jdk/Contents/Home; + brew install --cask liberica-jdk17-full; + export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-17-full.jdk/Contents/Home; fi - java -version diff --git a/appveyor.yml b/appveyor.yml index f6cd5374bb..d691bcd385 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,14 +11,14 @@ platform: x64 environment: global: TSK_HOME: "C:\\sleuthkit" - JDK_HOME: C:\Program Files\BellSoft\LibericaJDK-11-Full - JAVA_HOME: C:\Program Files\BellSoft\LibericaJDK-11-Full + JDK_HOME: C:\Program Files\BellSoft\LibericaJDK-17-Full + JAVA_HOME: C:\Program Files\BellSoft\LibericaJDK-17-Full PYTHON: "C:\\Python36-x64" install: - ps: choco install nuget.commandline - ps: choco install ant --ignore-dependencies - - ps: choco install liberica11jdkfull --force + - 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/linux_macos_install_scripts/install_prereqs_macos.sh b/linux_macos_install_scripts/install_prereqs_macos.sh index 61615f3032..127b21a22e 100644 --- a/linux_macos_install_scripts/install_prereqs_macos.sh +++ b/linux_macos_install_scripts/install_prereqs_macos.sh @@ -9,14 +9,14 @@ then exit 1 fi -echo "Installing liberica java 8..." +echo "Installing liberica java 17..." brew tap bell-sw/liberica && \ -brew install --cask liberica-jdk8-full +brew install --cask liberica-jdk17-full if [[ $? -ne 0 ]] then echo "Unable to install liberica java" >> /dev/stderr exit 1 fi -java_path=$(/usr/libexec/java_home -v 1.8) -echo "Java 1.8 path: $java_path" \ No newline at end of file +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 5c03de40af..498dd546a1 100644 --- a/linux_macos_install_scripts/install_prereqs_ubuntu.sh +++ b/linux_macos_install_scripts/install_prereqs_ubuntu.sh @@ -24,18 +24,18 @@ if [[ $? -ne 0 ]]; then exit 1 fi -echo "Installing bellsoft Java 8..." +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-java8-full && + sudo apt -y install bellsoft-java17-full && popd if [[ $? -ne 0 ]]; then - echo "Failed to install bellsoft java 8" >>/dev/stderr + echo "Failed to install bellsoft java 17" >>/dev/stderr exit 1 fi echo "Autopsy prerequisites installed." -echo "Java path at /usr/lib/jvm/bellsoft-java8-full-amd64: " -ls /usr/lib/jvm/bellsoft-java8-full-amd64 \ No newline at end of file +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