Merge pull request #43612 from keizer619/master

Update JRE version
ballerina-platform · Nov 20, 2024 · 2b694eb · 2b694eb
2 parents f370336 + 555e117
commit 2b694eb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/distribution/zip/jballerina-tools/resources/language-server-launcher.bat b/distribution/zip/jballerina-tools/resources/language-server-launcher.bat
@@ -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

diff --git a/distribution/zip/jballerina-tools/resources/language-server-launcher.sh b/distribution/zip/jballerina-tools/resources/language-server-launcher.sh
@@ -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

diff --git a/distribution/zip/jballerina/bin/bal b/distribution/zip/jballerina/bin/bal
@@ -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

diff --git a/distribution/zip/jballerina/bin/bal.bat b/distribution/zip/jballerina/bin/bal.bat
@@ -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