From f861d0dd5c2f6bedb92176044edc7dbf585b6898 Mon Sep 17 00:00:00 2001
From: Duane May <duane.may@broadcom.com>
Date: Wed, 3 Jun 2026 12:28:42 -0400
Subject: [PATCH] Bump minimum Java to 25 (LTS), across workflows and build
 configurations

---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/docker-image.yml    | 2 +-
 .github/workflows/gradle.yml          | 2 +-
 .github/workflows/sonarcloud.yml      | 2 +-
 README.md                             | 2 +-
 build.gradle                          | 4 ++--
 uaa/build.gradle                      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fb419511ed2..8cb72d28fa7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -45,7 +45,7 @@ jobs:
       uses: actions/setup-java@v5
       with:
         distribution: 'liberica'
-        java-version: '21'
+        java-version: '25'
         cache: 'gradle'
       if: ${{ matrix.language == 'java' }}
       
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 4cab2f7ec38..1b5c92ebc1e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'liberica'
-          java-version: '21'
+          java-version: '25'
           cache: 'gradle'
       - name: Login to Docker Hub
         uses: docker/login-action@v4
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 048e842f635..834e19b43f6 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '21', '25' ]
+        java: [ '25' ]
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 09b466cab64..e5f4986791a 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: 'liberica'
-          java-version: '21'
+          java-version: '25'
           cache: 'gradle'
       - name: Analyze with SonarCloud
         env:
diff --git a/README.md b/README.md
index 1fca511f3a4..b0970626ebe 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Security OAuth that can do the heavy lifting if your client is Java.
 ## Quick Start
 
 Requirements:
-* Java 21 or 25
+* Java 25
 
 If this works, you are in business:
 
diff --git a/build.gradle b/build.gradle
index bd3827c7009..130a953f426 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,8 +58,8 @@ subprojects {
 
     apply(plugin: "java")
     java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
     }
 
     configurations.configureEach {
diff --git a/uaa/build.gradle b/uaa/build.gradle
index c25c1aeeeee..c7880ba424a 100644
--- a/uaa/build.gradle
+++ b/uaa/build.gradle
@@ -197,7 +197,7 @@ tasks.named('bootBuildImage') {
     // use JRE since JDK gets too big
     environment.putAll([
             'BP_SPRING_CLOUD_BINDINGS_DISABLED': 'true',
-            'BP_JVM_VERSION'                   : '21',
+            'BP_JVM_VERSION'                   : '25',
             'BP_JVM_TYPE'                      : System.getenv('BP_JVM_TYPE') ?: project.findProperty('BP_JVM_TYPE') ?: 'JRE',
             'BP_JVM_PLATFORM'                  : 'liberica'
     ])