bump jdk and gradle.

.github/workflows/gradle-check.yml

@@ -17,23 +17,29 @@ jobs:
       - uses: actions/checkout@v4
       - uses: gradle/actions/wrapper-validation@v3
 
-      - uses: actions/setup-java@v4
+      - uses: oracle-actions/setup-java@v1
+        if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
         with:
-          distribution: 'zulu'
-          java-version: 21
-          java-package: jre
-          cache: 'gradle'
-      - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
+          website: jdk.java.net
+          release: ${{ vars.GRADLE_JAVA_VERSION }}
+
+      - run: |
+          printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
+          java --version
+        if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
 
-      - uses: actions/setup-java@v4
+      - uses: oracle-actions/setup-java@v1
         with:
-          distribution: 'zulu'
-          java-version: 22
-          check-latest: true
-      - run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
-      - run: java --version
+          website: jdk.java.net
+          release: ${{ vars.JAVA_VERSION }}
+
+      - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
+        if: ${{ vars.GRADLE_JAVA_VERSION == vars.JAVA_VERSION }}
 
       - name: Gradle Check
-        run: ./gradlew -PtargetJava=22 check --stacktrace --no-daemon
+        run: |
+          printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
+          java --version
+          ./gradlew --stacktrace --no-daemon -PtargetJava=${{ vars.JAVA_VERSION }} check
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -17,28 +17,29 @@ jobs:
       - uses: actions/checkout@v4
       - uses: gradle/actions/wrapper-validation@v3
 
-      - uses: actions/setup-java@v4
+      - uses: oracle-actions/setup-java@v1
+        if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
         with:
-          distribution: 'zulu'
-          java-version: 21
-          java-package: jre
-          cache: 'gradle'
-      - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
+          website: jdk.java.net
+          release: ${{ vars.GRADLE_JAVA_VERSION }}
+
+      - run: |
+          printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
+          java --version
+        if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
 
-      - uses: actions/setup-java@v4
+      - uses: oracle-actions/setup-java@v1
         with:
-          distribution: 'zulu'
-          java-version: 22
-          check-latest: true
-      - run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
-      - run: java --version
-
-      - name: Gradle Check
-        run: ./gradlew check -PtargetJava=22 --stacktrace
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          website: jdk.java.net
+          release: ${{ vars.JAVA_VERSION }}
+
+      - run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
+        if: ${{ vars.GRADLE_JAVA_VERSION == vars.JAVA_VERSION }}
 
       - name: Github Packages
-        run: ./gradlew -PtargetJava=22 :pagerduty-event-json-iterator-adapter:publish :pagerduty-event-client:publish
+        run: |
+          printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
+          java --version
+          ./gradlew --stacktrace --no-daemon -PtargetJava=${{ vars.JAVA_VERSION }} check :pagerduty-event-json-iterator-adapter:publish :pagerduty-event-client:publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -28,7 +28,7 @@ buildscript {
   }
 }
 
-final JLV = JavaLanguageVersion.of(project.findProperty('targetJava') as Integer ?: 22)
+final JLV = JavaLanguageVersion.of(project.findProperty('targetJava') as Integer ?: 23)
 
 subprojects {
   apply plugin: 'java-library'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -145,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

systems.comodal.pagerduty_event_client/src/main/java/systems/comodal/pagerduty/event/service/PagerDutyServiceVal.java

@@ -14,6 +14,7 @@
 
 import static java.lang.String.format;
 import static java.lang.System.Logger.Level.ERROR;
+import static java.util.Objects.requireNonNullElse;
 import static java.util.concurrent.CompletableFuture.delayedExecutor;
 
 record PagerDutyServiceVal(PagerDutyEventClient client,
@@ -188,7 +189,7 @@ private CompletableFuture<PagerDutyEventResponse> triggerEvent(final PagerDutyEv
       } else if (throwable.getCause() instanceof final RuntimeException runtimeException) {
         throw runtimeException;
       } else {
-        throw new RuntimeException(throwable.getCause() == null ? throwable : throwable.getCause());
+        throw new RuntimeException(requireNonNullElse(throwable.getCause(), throwable));
       }
     };
     if (retryDelay > 0) {