From daa472f8d662310e21c74d331a264ddd3216e168 Mon Sep 17 00:00:00 2001
From: Ashley <73482956+ascopes@users.noreply.github.com>
Date: Sat, 30 Mar 2024 08:36:25 +0900
Subject: [PATCH 1/2] Update build.yml to fix typo

---
 .github/workflows/build.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f9ff89c..0882e50c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,20 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      # Install protoc onto the PATH so that we can test PATH resolution.
+      - name: Install dependencies
+        shell: bash
+        run: |-
+          set -eux
+          if command -v apt; then
+            sudo apt -q update
+            sudo apt -qy install protobuf-compiler
+            protoc --version
+          esac
+
+          java -version
+          javac -version
+
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:

From 44e6b981bc80e3f2ab95593f9cafb3329e93b375 Mon Sep 17 00:00:00 2001
From: ascopes <73482956+ascopes@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:22:38 +0000
Subject: [PATCH 2/2] Build on Java 22

---
 .github/workflows/build.yml    | 16 +---------------
 .github/workflows/deploy.yml   |  2 +-
 .github/workflows/security.yml |  2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0882e50c..726e414e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,26 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         os-name: [ubuntu-latest, macos-latest, windows-latest]
-        java-version: [11, 21]
+        java-version: [11, 22]
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Install protoc onto the PATH so that we can test PATH resolution.
-      - name: Install dependencies
-        shell: bash
-        run: |-
-          set -eux
-          if command -v apt; then
-            sudo apt -q update
-            sudo apt -qy install protobuf-compiler
-            protoc --version
-          esac
-
-          java -version
-          javac -version
-
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a910562f..b90be213 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -148,7 +148,7 @@ jobs:
     environment:
       name: github-pages
       url: https://ascopes.github.io/protobuf-maven-plugin
-      
+
     steps:
       - name: Deploy site
         if: ${{ ! inputs.dry-run && ! inputs.skip-site-publication }}
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index dedb494c..ac14afa3 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 21
+          java-version: 22
 
       - name: Submit Dependency Snapshot
         # Pinned until https://github.com/advanced-security/maven-dependency-submission-action/issues/65 is addressed