Skip to content

Commit

Permalink
Update JRE version
Browse files Browse the repository at this point in the history
  • Loading branch information
keizer619 committed Nov 19, 2024
1 parent f370336 commit 555e117
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ rem -------------------------- set BALLERINA_HOME -----------------------------
rem TODO: Validate BALLERINA_HOME
rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
set BALLERINA_HOME=%~sdp0..\..\..\..
if exist "%BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre" goto setJava
if exist "%BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre" goto setJava
goto checkJava

:setJava
set JAVA_HOME="%BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre"
set JAVA_HOME="%BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre"
goto checkJava

:checkJava
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

# ---------------------- Override JAVA_HOME for Installers -------------------
DIR="$(cd "$(dirname "$0")" && pwd)"
JAVA_PATH="$DIR/../../../../../../dependencies/jdk-17.0.7+7-jre"
JAVA_PATH="$DIR/../../../../../../dependencies/jdk-21.0.5+11-jre"
if test -d "$JAVA_PATH"; then
JAVA_HOME=$JAVA_PATH
fi
Expand Down
2 changes: 1 addition & 1 deletion distribution/zip/jballerina/bin/bal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# OS specific support. $var _must_ be set to either true or false.

# Set JAVA_HOME for installers
JAVA_PATH=$BALLERINA_HOME/../../dependencies/jdk-17.0.7+7-jre
JAVA_PATH=$BALLERINA_HOME/../../dependencies/jdk-21.0.5+11-jre
if test -d "$JAVA_PATH"; then
JAVA_HOME=$JAVA_PATH
fi
Expand Down
4 changes: 2 additions & 2 deletions distribution/zip/jballerina/bin/bal.bat
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ rem ----- if JAVA_HOME is not set we're not happy ------------------------------
:checkJava

set BALLERINA_HOME=%~sdp0..
if exist %BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre (
set "JAVA_HOME=%BALLERINA_HOME%\..\..\dependencies\jdk-17.0.7+7-jre"
if exist %BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre (
set "JAVA_HOME=%BALLERINA_HOME%\..\..\dependencies\jdk-21.0.5+11-jre"
)

if "%JAVA_HOME%" == "" goto noJavaHome
Expand Down

0 comments on commit 555e117

Please sign in to comment.