Merge pull request #248 from gama-platform/enforce-jdk-21

gama-platform · Jul 10, 2024 · 8824018 · 8824018
2 parents 33a3274 + 4563595
commit 8824018
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/gama.product/extraresources/headless/osx/gama-headless.sh b/gama.product/extraresources/headless/osx/gama-headless.sh
@@ -7,8 +7,8 @@ if [ -d "$( dirname "${BASH_SOURCE[0]}" )/../jdk" ]; then
 else
   javaVersion=$(java -version 2>&1 | head -n 1 | cut -d "\"" -f 2)
   # Check if good Java version before everything
-  if [[ ${javaVersion:2} == 17 ]]; then
-    echo "You should use Java 17 to run GAMA"
+  if [[ ${javaVersion:2} == 21 ]]; then
+    echo "You should use Java 21 to run GAMA"
     echo "Found you using version : $javaVersion"
     exit 1
   fi

diff --git a/gama.product/extraresources/headless/unix/gama-headless.sh b/gama.product/extraresources/headless/unix/gama-headless.sh
@@ -8,8 +8,8 @@ if [ -d "${headless_path}/../jdk" ]; then
 else
   javaVersion=$(java -version 2>&1 | head -n 1 | cut -d "\"" -f 2)
   # Check if good Java version before everything
-  if [[ ${javaVersion:2} == 17 ]]; then
-    echo "You should use Java 17 to run GAMA"
+  if [[ ${javaVersion:2} == 21 ]]; then
+    echo "You should use Java 21 to run GAMA"
     echo "Found you using version : $javaVersion"
     exit 1
   fi

diff --git a/gama.product/gama.product b/gama.product/gama.product
@@ -37,6 +37,7 @@
 -XX:+OptimizeStringConcat
 -Dosgi.locking=none
 -Dosgi.checkConfiguration=false
+-Dosgi.requiredJavaVersion=21
 -Declipse.log.level=ERROR
 -Dorg.eclipse.ecf.provider.filetransfer.retrieve.retryAttempts=10
 -Dorg.eclipse.ecf.provider.filetransfer.retrieve.closeTimeout=6000