Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Updated java version check to fix dependency error #672

Closed
wants to merge 2 commits into from
Closed

Updated java version check to fix dependency error #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0bd15
Updated java version check to fix dependency error
JonahCalvo Jun 18, 2021
7508382
Changed required version number to correspond with new regex
JonahCalvo Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions release/archives/linux/data-prepper-tar-install-x64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi

PIPELINES_FILE_LOCATION=$1
CONFIG_FILE_LOCATION=$2
MIN_REQ_JAVA_VERSION=1.8
MIN_REQ_JAVA_VERSION=8
MIN_REQ_OPENJDK_VERSION=8
DATA_PREPPER_HOME=$(dirname $(realpath $0))
EXECUTABLE_JAR=$(ls -1 $DATA_PREPPER_HOME/bin/*.jar 2>/dev/null)
Expand All @@ -47,7 +47,7 @@ fi
if [[ "$_java" ]]
then
java_type=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $1}')
java_version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed 's/\(.*\..*\)\..*/\1/g')
java_version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed '/^1\./s///' | cut -d'.' -f1)
echo "Found $java_type of $java_version"
if [[ $java_type == *"openjdk"* ]]
then
Expand Down
4 changes: 2 additions & 2 deletions release/archives/macos/data-prepper-tar-install-x64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fi

PIPELINES_FILE_LOCATION=$1
CONFIG_FILE_LOCATION=$2
MIN_REQ_JAVA_VERSION=1.8
MIN_REQ_JAVA_VERSION=8
MIN_REQ_OPENJDK_VERSION=8
DATA_PREPPER_HOME=$(cd "$(dirname "$0")"; pwd)
EXECUTABLE_JAR=$(ls -1 $DATA_PREPPER_HOME/bin/*.jar 2>/dev/null)
Expand All @@ -47,7 +47,7 @@ fi
if [[ "$_java" ]]
then
java_type=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $1}')
java_version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed 's/\(.*\..*\)\..*/\1/g')
java_version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed '/^1\./s///' | cut -d'.' -f1)
echo "Found $java_type of $java_version"
if [[ $java_type == *"openjdk"* ]]
then
Expand Down