From 4b24ee4a787619a9ab99b7d799efa49d01819475 Mon Sep 17 00:00:00 2001
From: Adam Korynta <adam@rmanet.com>
Date: Sun, 10 Dec 2023 21:01:20 -0800
Subject: [PATCH 1/2] update github actions to target specific versions

add dependabot weekly task for updating action versions
---
 .github/dependabot.yml                   | 13 +++++++++++++
 .github/workflows/default.yml            | 14 +++++++-------
 .github/workflows/java_compatibility.yml | 10 +++++-----
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d1da4824..9f294389 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,5 +11,18 @@ updates:
         update-types:
           - "minor"
           - "patch"
+    reviewers:
+      - "@opendcs/opendcs-core-devs"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      alldependencies:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
     reviewers:
       - "@opendcs/opendcs-core-devs"
\ No newline at end of file
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index 9782fa33..33de04f9 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -9,24 +9,24 @@ on:
 jobs:
   build:
     name: Build, Test, and Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: 17
           distribution: 'temurin'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.2
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -41,14 +41,14 @@ jobs:
       - name: Bundle tarballs
         run: ./gradlew bundle
       - name: Upload WAR files
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.3
         with:
           name: warfile
           path: ./**/build/libs/*.war
           retention-days: 1
           if-no-files-found: error
       - name: Upload Tarballs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.3
         with:
           name: opendcs-rest-api-artifacts
           path: ./**/build/distributions/*.tar.gz
diff --git a/.github/workflows/java_compatibility.yml b/.github/workflows/java_compatibility.yml
index 5dc45d13..af66470b 100644
--- a/.github/workflows/java_compatibility.yml
+++ b/.github/workflows/java_compatibility.yml
@@ -10,20 +10,20 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '8', '11', '17', '21' ]
       fail-fast: false
-      max-parallel: 3
+      max-parallel: 4
     name: Build on Java ${{ matrix.Java }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

From dd0e47f888038582d195abd9311769a277660fa0 Mon Sep 17 00:00:00 2001
From: Adam Korynta <adam@rmanet.com>
Date: Sun, 10 Dec 2023 21:08:30 -0800
Subject: [PATCH 2/2] update to latest gradle for JDK 21

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 62f495df..1af9e093 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME