upgrade: upgrade to java 21.0.6+7

Signed-off-by: Matt Peterson <[email protected]>
hiero-ledger · Feb 19, 2025 · 342af79 · 342af79
1 parent 1ed23af
commit 342af79
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: "temurin"
-          java-version: "21.0.5"
+          java-version: "21.0.6"
 
       - name: Run Acceptance Tests
         id: acceptance-tests

diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
@@ -28,15 +28,15 @@ jobs:
     with:
       ref: ${{ github.event.inputs.ref || '' }}
       java-distribution: ${{ inputs.java-distribution || 'temurin' }}
-      java-version: ${{ inputs.java-version || '21.0.5' }}
+      java-version: ${{ inputs.java-version || '21.0.6' }}
 
   check-docker:
     name: Docker
     uses: ./.github/workflows/zxc-verify-docker-build-determinism.yaml
     with:
       ref: ${{ github.event.inputs.ref || '' }}
       java-distribution: ${{ inputs.java-distribution || 'temurin' }}
-      java-version: ${{ inputs.java-version || '21.0.5' }}
+      java-version: ${{ inputs.java-version || '21.0.6' }}
 
   compile:
     name: "Gradle Checks"
@@ -64,7 +64,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: "temurin"
-          java-version: "21.0.5"
+          java-version: "21.0.6"
 
       - name: Cache Gradle packages
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0

diff --git a/.github/workflows/release-automation.yaml b/.github/workflows/release-automation.yaml
@@ -80,7 +80,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: "temurin"
-          java-version: "21.0.5"
+          java-version: "21.0.6"
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
@@ -174,7 +174,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: "temurin"
-          java-version: "21.0.5"
+          java-version: "21.0.6"
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0

diff --git a/.github/workflows/release-push-image.yaml b/.github/workflows/release-push-image.yaml
@@ -36,15 +36,15 @@ jobs:
     with:
       ref: ${{ github.event.inputs.ref || '' }}
       java-distribution: ${{ inputs.java-distribution || 'temurin' }}
-      java-version: ${{ inputs.java-version || '21.0.5' }}
+      java-version: ${{ inputs.java-version || '21.0.6' }}
 
   check-docker:
     name: Docker
     uses: ./.github/workflows/zxc-verify-docker-build-determinism.yaml
     with:
       ref: ${{ github.event.inputs.ref || '' }}
       java-distribution: ${{ inputs.java-distribution || 'temurin' }}
-      java-version: ${{ inputs.java-version || '21.0.5' }}
+      java-version: ${{ inputs.java-version || '21.0.6' }}
 
   publish:
     needs: [check-gradle, check-docker]
@@ -65,7 +65,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: "temurin"
-          java-version: "21.0.5"
+          java-version: "21.0.6"
 
       - name: Build
         run: ./gradlew clean build

diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
@@ -46,7 +46,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: "temurin"
-          java-version: "21.0.5"
+          java-version: "21.0.6"
 
       - name: Install grpcurl
         run: |

diff --git a/.github/workflows/zxc-verify-docker-build-determinism.yaml b/.github/workflows/zxc-verify-docker-build-determinism.yaml
@@ -21,7 +21,7 @@ on:
         description: "Java JDK Version:"
         type: string
         required: false
-        default: "21.0.5"
+        default: "21.0.6"
 
   workflow_dispatch:
     inputs:
@@ -39,7 +39,7 @@ on:
         description: "Java JDK Version:"
         type: string
         required: false
-        default: "21.0.5"
+        default: "21.0.6"
 
 defaults:
   run:

diff --git a/.github/workflows/zxc-verify-gradle-build-determinism.yaml b/.github/workflows/zxc-verify-gradle-build-determinism.yaml
@@ -21,7 +21,7 @@ on:
         description: "Java JDK Version:"
         type: string
         required: false
-        default: "21.0.5"
+        default: "21.0.6"
 
   workflow_dispatch:
     inputs:
@@ -39,7 +39,7 @@ on:
         description: "Java JDK Version:"
         type: string
         required: false
-        default: "21.0.5"
+        default: "21.0.6"
 
 defaults:
   run:

diff --git a/gradle/toolchain-versions.properties b/gradle/toolchain-versions.properties
@@ -1 +1 @@
-jdk=21.0.5
+jdk=21.0.6
diff --git a/server/docker/Dockerfile b/server/docker/Dockerfile
@@ -34,16 +34,18 @@ RUN --mount=type=bind,source=./repro-sources-list.sh,target=/usr/local/bin/repro
 ####    Java Setup    ####
 ##########################
 
+# Find versions here: https://github.com/adoptium/temurin21-binaries/releases
+# ESUMs found in the .sha256.txt file for each version
 RUN set -eux; \
         ARCH="$(dpkg --print-architecture)"; \
         case "${ARCH}" in \
            aarch64|arm64) \
-            ESUM='6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c'; \
-            BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz' \
+            ESUM='04fe1273f624187d927f1b466e8cdb630d70786db07bee7599bfa5153060afd3'; \
+            BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.6_7.tar.gz' \
             ;; \
           amd64|i386:x86-64) \
-            ESUM='3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c'; \
-            BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz' \
+            ESUM='a2650fba422283fbed20d936ce5d2a52906a5414ec17b2f7676dddb87201dbae'; \
+            BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz' \
             ;; \
            *) \
             echo "Unsupported arch: ${ARCH}"; \
@@ -121,7 +123,7 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive
 
-ENV JAVA_VERSION="jdk-21.0.5+11"
+ENV JAVA_VERSION="jdk-21.0.6+7"
 ENV JAVA_HOME=/usr/local/java
 ENV PATH=${JAVA_HOME}/bin:${PATH}