From aed7a8a4aeafb907391cb9a13930475350e9ef44 Mon Sep 17 00:00:00 2001
From: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
Date: Mon, 11 Dec 2023 21:06:54 +0100
Subject: [PATCH] Build for Java 8 with JDK 17

---
 .github/workflows/ci.yml                | 12 ++++++------
 .github/workflows/pullrequests.yml      | 12 ++++++------
 .github/workflows/release.yml           | 12 ++++++------
 ci/build-and-deploy-to-maven-central.sh |  3 +--
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05b389dac..01cfa5509 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,13 +12,13 @@ jobs:
     if: github.repository == 'pgjdbc/r2dbc-postgresql'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 8
-          distribution: temurin
-          cache: maven
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
       - name: Build with Maven
         env:
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
diff --git a/.github/workflows/pullrequests.yml b/.github/workflows/pullrequests.yml
index d48e10976..aba1ed0af 100644
--- a/.github/workflows/pullrequests.yml
+++ b/.github/workflows/pullrequests.yml
@@ -9,12 +9,12 @@ jobs:
   pr-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 8
-          distribution: temurin
-          cache: maven
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
       - name: Build with Maven
         run: ./mvnw -B verify -D skipITs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2545e1d50..fc49cd238 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,14 +12,14 @@ jobs:
     if: github.repository == 'pgjdbc/r2dbc-postgresql'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 8
-          distribution: temurin
+          java-version: '17'
+          distribution: 'temurin'
       - name: Initialize Maven Version
-        run: ./mvnw -q org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version
+        run: ./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout
       - name: GPG Check
         run: gpg -k
       - name: Release with Maven
diff --git a/ci/build-and-deploy-to-maven-central.sh b/ci/build-and-deploy-to-maven-central.sh
index 095c3d9ea..0886285e6 100755
--- a/ci/build-and-deploy-to-maven-central.sh
+++ b/ci/build-and-deploy-to-maven-central.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version -o | grep -v INFO)
+VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
 
 if [[ $VERSION =~ [^.*-SNAPSHOT$] ]] ; then
 
@@ -36,4 +36,3 @@ else
   echo "Not a release: $VERSION"
   exit 1
 fi
-