From ca92106195d5992eceef4f1486b9971b53e3bea4 Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Wed, 11 Jun 2025 14:54:14 -0600
Subject: [PATCH] Use Java 17 for toolchain build

---
 .github/actions/init-integ-test/action.yml              | 8 +++++++-
 .github/workflows/integ-test-restore-java-toolchain.yml | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/actions/init-integ-test/action.yml b/.github/actions/init-integ-test/action.yml
index 6d51ff91..4beb7cb5 100644
--- a/.github/actions/init-integ-test/action.yml
+++ b/.github/actions/init-integ-test/action.yml
@@ -1,5 +1,11 @@
 name: 'Initialize integ-test'
 
+inputs:
+  java-version:
+    description: 'Java version to use'
+    required: false
+    default: '11'
+
 runs:
   using: "composite"
   steps: 
@@ -7,7 +13,7 @@ runs:
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: ${{ inputs.java-version }}
 
     - name: Configure environment
       shell: bash
diff --git a/.github/workflows/integ-test-restore-java-toolchain.yml b/.github/workflows/integ-test-restore-java-toolchain.yml
index 11f91ab9..b6a2c81a 100644
--- a/.github/workflows/integ-test-restore-java-toolchain.yml
+++ b/.github/workflows/integ-test-restore-java-toolchain.yml
@@ -33,6 +33,8 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
+      with:
+        java-version: '17'
 
     - name: Setup Gradle
       uses: ./setup-gradle
@@ -56,6 +58,8 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Initialize integ-test
       uses: ./.github/actions/init-integ-test
+      with:
+        java-version: '17'
 
     - name: Setup Gradle
       uses: ./setup-gradle