From 6f560ed5958a3a7baa0b175ab695215018d405cd Mon Sep 17 00:00:00 2001
From: Thomas Sapelza <thomas.sapelza@aboutbits.it>
Date: Fri, 13 Nov 2026 18:22:59 +0100
Subject: [PATCH 1/4] use a JAVA_VERSION variable in the dependency submission
 workflow

Assisted-by: Claude:claude-opus-5-5
---
 .github/workflows/dependency-submission.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 5b169c3..dde6a99 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -18,6 +18,9 @@ on:
       - '.github/workflows/dependency-submission.yml'
   workflow_dispatch:
 
+env:
+  JAVA_VERSION: 25
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -36,5 +39,5 @@ jobs:
           persist-credentials: false
       - uses: aboutbits/github-actions-java/dependency-submission-with-gradle@v4
         with:
-          java-version: 25
+          java-version: ${{ env.JAVA_VERSION }}
           project-type: quarkus

From d47312c8eb2c9cb496f4e42acf9130ca504f342d Mon Sep 17 00:00:00 2001
From: Thomas Sapelza <thomas.sapelza@aboutbits.it>
Date: Fri, 13 Nov 2026 18:26:52 +0100
Subject: [PATCH 2/4] use a JAVA_VERSION variable in all workflows

Assisted-by: Claude:claude-opus-5-5
---
 .github/workflows/release.yml | 3 ++-
 .github/workflows/test.yml    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0740355..9dc53f9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,7 @@ on:
 permissions: {}
 
 env:
+  JAVA_VERSION: 25
   OCI_IMAGE: ghcr.io/${{ github.repository }}
   HELM_CHART_NAME: postgresql-operator
   HELM_CHART_REPOSITORY: ghcr.io/${{ github.repository_owner }}/helm-charts
@@ -46,7 +47,7 @@ jobs:
       - uses: aboutbits/github-actions-base/git-setup@v2
       - uses: aboutbits/github-actions-java/setup-with-gradle@v4
         with:
-          java-version: 25
+          java-version: ${{ env.JAVA_VERSION }}
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
       - name: Increment version
         env:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7eadccb..7976b43 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,6 +6,9 @@ on:
       GRADLE_ENCRYPTION_KEY:
         required: false
 
+env:
+  JAVA_VERSION: 25
+
 permissions:
   contents: read
 
@@ -24,7 +27,7 @@ jobs:
           persist-credentials: false
       - uses: aboutbits/github-actions-java/setup-with-gradle@v4
         with:
-          java-version: 25
+          java-version: ${{ env.JAVA_VERSION }}
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
       - name: Build & Test
         run: >-

From 5b0235d8dcffb28d5a529123b0e04df7a6eb6570 Mon Sep 17 00:00:00 2001
From: Thomas Sapelza <thomas.sapelza@aboutbits.it>
Date: Fri, 13 Nov 2026 18:47:07 +0100
Subject: [PATCH 3/4] note that test.yml sets its own JAVA_VERSION

Assisted-by: Claude:claude-opus-5-5
---
 .github/workflows/release.yml | 1 +
 .github/workflows/test.yml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9dc53f9..4080a30 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,7 @@ on:
 permissions: {}
 
 env:
+  # The test job runs test.yml, which does not get this env and sets its own JAVA_VERSION: keep both equal.
   JAVA_VERSION: 25
   OCI_IMAGE: ghcr.io/${{ github.repository }}
   HELM_CHART_NAME: postgresql-operator
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7976b43..e4f01f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,6 +7,7 @@ on:
         required: false
 
 env:
+  # The workflows that call this one do not pass their env to it and set their own JAVA_VERSION: keep all equal.
   JAVA_VERSION: 25
 
 permissions:

From 84c702381b5c3aa947d7feb0acc2e2c11c37570e Mon Sep 17 00:00:00 2001
From: Thomas Sapelza <thomas.sapelza@aboutbits.it>
Date: Fri, 13 Nov 2026 18:49:57 +0100
Subject: [PATCH 4/4] remove the JAVA_VERSION comment from the calling
 workflows

Assisted-by: Claude:claude-opus-5-5
---
 .github/workflows/release.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4080a30..9dc53f9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,6 @@ on:
 permissions: {}
 
 env:
-  # The test job runs test.yml, which does not get this env and sets its own JAVA_VERSION: keep both equal.
   JAVA_VERSION: 25
   OCI_IMAGE: ghcr.io/${{ github.repository }}
   HELM_CHART_NAME: postgresql-operator