Update SBT to version 1.9.9 and buildenv images and JDK versions in CI

.github/workflows/ea-jdk.yml

@@ -5,7 +5,7 @@ env:
 jobs:
   linux-ea:
     runs-on: ubuntu-latest
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v7-openjdk22-ea"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v10-openjdk23-ea"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4

.github/workflows/main.yml

@@ -8,7 +8,7 @@ env:
 jobs:
   checks:
     runs-on: ubuntu-latest
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v7-openjdk21"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v10-openjdk22"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
 
   linux:
     runs-on: ubuntu-latest
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v7-openjdk21"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v10-openjdk22"
     continue-on-error: true
     steps:
       - name: Git checkout
@@ -98,16 +98,11 @@ jobs:
         shell: bash
         run: git config --global --add safe.directory $GITHUB_WORKSPACE
 
-      - name: Fetch JDK 21
-        run: |
-          aria2c -d ${{ runner.temp }} -o openjdk-21_macos-x64_bin.tar.gz https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_macos-x64_bin.tar.gz
-
-      - name: Setup JDK 21
+      - name: Setup JDK 22
         uses: actions/setup-java@v4
         with:
-          java-version: 21
-          distribution: jdkfile
-          jdkFile: ${{ runner.temp }}/openjdk-21_macos-x64_bin.tar.gz
+          java-version: 22
+          distribution: temurin
 
       - name: Environment configuration
         shell: bash
@@ -156,16 +151,11 @@ jobs:
         shell: bash
         run: git config --global --add safe.directory $GITHUB_WORKSPACE
 
-      - name: Fetch JDK 21
-        run: |
-          aria2c -d ${{ runner.temp }} -o openjdk-21_windows-x64_bin.zip https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_windows-x64_bin.zip
-
-      - name: Setup JDK 21
+      - name: Setup Java JDK 22
         uses: actions/setup-java@v4
         with:
-          java-version: 21
-          distribution: jdkfile
-          jdkFile: ${{ runner.temp }}/openjdk-21_windows-x64_bin.zip
+          java-version: 22
+          distribution: temurin
 
       - name: Environment configuration
         shell: bash
@@ -204,7 +194,7 @@ jobs:
   plugins:
     runs-on: ubuntu-latest
     needs: linux
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v7-openjdk11-with-ant-gcc"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v10-openjdk11-with-ant-gcc"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
@@ -244,11 +234,13 @@ jobs:
         image:
           - openjdk11
           - openjdk17
+          - openjdk21
           - openj9-openjdk11
           - openj9-openjdk17
+          - openj9-openjdk21
     runs-on: ubuntu-latest
     continue-on-error: true
-    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v7-${{ matrix.image }}"
+    container: "ghcr.io/renaissance-benchmarks/renaissance-buildenv:v10-${{ matrix.image }}"
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
@@ -294,7 +286,7 @@ jobs:
     needs: windows
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '11', '17', '21' ]
     runs-on: windows-latest
     continue-on-error: true
     steps:
@@ -310,7 +302,7 @@ jobs:
       - name: Setup correct Java version
         uses: actions/setup-java@v4
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: ${{ matrix.java }}
 
       - name: Environment configuration
@@ -351,7 +343,7 @@ jobs:
     needs: macos
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '11', '17', '21' ]
     runs-on: macos-latest
     continue-on-error: true
     steps:
@@ -367,7 +359,7 @@ jobs:
       - name: Setup correct Java version
         uses: actions/setup-java@v4
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: ${{ matrix.java }}
 
       - name: Environment configuration

plugins/jmx-memory/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.9

plugins/jmx-timers/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.9

plugins/ubench-agent/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.9

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.9

tools/ci/common.sh

@@ -52,7 +52,7 @@ cp_reflink() {
 
 get_jvm_workaround_args() {
     case "$RENAISSANCE_JVM_MAJOR_VERSION" in
-        16|17|18|19|20|21|22-ea)
+        16|17|18|19|20|21|22|23-ea)
             echo "--add-opens=java.base/java.lang=ALL-UNNAMED"
             echo "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
             echo "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED"

tools/sbt/bin/sbt

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set +e
-declare builtin_sbt_version="1.9.6"
+declare builtin_sbt_version="1.9.9"
 declare -a residual_args
 declare -a java_args
 declare -a scalac_args
@@ -14,7 +14,7 @@ declare -a shutdownall
 declare -a original_args
 declare java_cmd=java
 declare java_version
-declare init_sbt_version=1.9.6
+declare init_sbt_version=1.9.9
 declare sbt_default_mem=1024
 declare -r default_sbt_opts=""
 declare -r default_java_opts="-Dfile.encoding=UTF-8"
@@ -24,7 +24,7 @@ declare build_props_sbt_version=
 declare use_sbtn=
 declare no_server=
 declare sbtn_command="$SBTN_CMD"
-declare sbtn_version="1.9.0"
+declare sbtn_version="1.9.7"
 
 ###  ------------------------------- ###
 ###  Helper methods for BASH scripts ###
@@ -515,6 +515,7 @@ run() {
     execRunner "$java_cmd" \
       "${java_args[@]}" \
       "${sbt_options[@]}" \
+      "${java_tool_options[@]}" \
       -jar "$sbt_jar" \
       "${sbt_commands[@]}" \
       "${residual_args[@]}"
@@ -785,6 +786,7 @@ original_args=("$@")
 
 java_args=($JAVA_OPTS)
 sbt_options0=(${SBT_OPTS:-$default_sbt_opts})
+java_tool_options=($JAVA_TOOL_OPTIONS)
 if [[ "$SBT_NATIVE_CLIENT" == "true" ]]; then
   use_sbtn=1
 fi

tools/sbt/bin/sbt.bat

@@ -18,7 +18,7 @@ set _JAVACMD=
 set _SBT_OPTS=
 set _JAVA_OPTS=
 
-set init_sbt_version=1.9.6
+set init_sbt_version=1.9.9
 set sbt_default_mem=1024
 set default_sbt_opts=
 set default_java_opts=-Dfile.encoding=UTF-8
@@ -682,14 +682,15 @@ if defined sbt_args_verbose (
   echo "!_JAVACMD!"
   if defined _JAVA_OPTS ( call :echolist !_JAVA_OPTS! )
   if defined _SBT_OPTS ( call :echolist !_SBT_OPTS! )
+  if defined JAVA_TOOL_OPTIONS ( call :echolist %JAVA_TOOL_OPTIONS% )
   echo -cp
   echo "!sbt_jar!"
   echo xsbt.boot.Boot
   if not "%~1" == "" ( call :echolist %* )
   echo.
 )
 
-"!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! -cp "!sbt_jar!" xsbt.boot.Boot %*
+"!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! %JAVA_TOOL_OPTIONS% -cp "!sbt_jar!" xsbt.boot.Boot %*
 
 goto :eof
 
@@ -828,21 +829,21 @@ exit /B 0
 
   set _has_memory_args=
 
-  if defined _JAVA_OPTS for /F %%g in ("!_JAVA_OPTS!") do (
+  if defined _JAVA_OPTS for %%g in (%_JAVA_OPTS%) do (
     set "p=%%g"
     if "!p:~0,4!" == "-Xmx" set _has_memory_args=1
     if "!p:~0,4!" == "-Xms" set _has_memory_args=1
     if "!p:~0,4!" == "-Xss" set _has_memory_args=1
   )
 
-  if defined JAVA_TOOL_OPTIONS for /F %%g in ("%JAVA_TOOL_OPTIONS%") do (
+  if defined JAVA_TOOL_OPTIONS for %%g in (%JAVA_TOOL_OPTIONS%) do (
     set "p=%%g"
     if "!p:~0,4!" == "-Xmx" set _has_memory_args=1
     if "!p:~0,4!" == "-Xms" set _has_memory_args=1
     if "!p:~0,4!" == "-Xss" set _has_memory_args=1
   )
 
-  if defined _SBT_OPTS for /F %%g in ("!_SBT_OPTS!") do (
+  if defined _SBT_OPTS for %%g in (%_SBT_OPTS%) do (
     set "p=%%g"
     if "!p:~0,4!" == "-Xmx" set _has_memory_args=1
     if "!p:~0,4!" == "-Xms" set _has_memory_args=1