From 0f5091d1ca0079336d57f24c0f58d9ae8dabfcbe Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Wed, 21 May 2025 11:49:44 +0200
Subject: [PATCH] Fix Java 24 setup in GitHub action build

This commit switches to using Java 24 as the mai JVM in the GitHub
action and also configures the foojay resolver for Java toolchain
resolution by Gradle.

See gh-1206
---
 .github/actions/build-and-publish/action.yml | 2 +-
 settings.gradle                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/actions/build-and-publish/action.yml b/.github/actions/build-and-publish/action.yml
index cd2204e1..45657d8a 100644
--- a/.github/actions/build-and-publish/action.yml
+++ b/.github/actions/build-and-publish/action.yml
@@ -3,7 +3,7 @@ description: 'Builds the project, optionally publishing it to a local deployment
 inputs:
   java-version:
     required: false
-    default: '17'
+    default: '24'
     description: 'The Java version to compile and test with'
   java-distribution:
     required: false
diff --git a/settings.gradle b/settings.gradle
index a86f18d8..881d8516 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,7 @@ pluginManagement {
 }
 
 plugins {
+	id "org.gradle.toolchains.foojay-resolver-convention" version "1.0.0"
 	id "io.spring.develocity.conventions" version "0.0.22"
 }