From 9a38c059364136187dc097e9448e78e8bd2a379b Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 1 May 2024 11:03:51 +0100
Subject: [PATCH 1/3] Test on Java 21

---
 .github/workflows/ci.yml       | 6 +++---
 .github/workflows/javadocs.yml | 8 ++++----
 pom.xml                        | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f574f83..6a965d54 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,14 +16,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '16', '17', '19' ]
+        java: [ '8', '11', '16', '17', '19', '21' ]
         runs-on: [ubuntu-latest, macos-latest, windows-latest ]
 
     name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.Java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.Java }}
         distribution: 'temurin'
diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
index a5a2fb2b..4d6397a2 100644
--- a/.github/workflows/javadocs.yml
+++ b/.github/workflows/javadocs.yml
@@ -9,16 +9,16 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         java-package: jdk
 
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
 
@@ -28,7 +28,7 @@ jobs:
         pip install ghp-import
 
     - name: Checkout org.neuroml.model.injectingplugin
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/org.neuroml.model.injectingplugin
         ref: development
diff --git a/pom.xml b/pom.xml
index 5efc0714..e45b1b9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

From a6d020b8109701e00d0bf8de9a87d1944f91371d Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 1 May 2024 11:05:29 +0100
Subject: [PATCH 2/3] Exclude some on mac

---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a965d54..3b0c6575 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,11 @@ jobs:
       matrix:
         java: [ '8', '11', '16', '17', '19', '21' ]
         runs-on: [ubuntu-latest, macos-latest, windows-latest ]
+        exclude:
+          - runs-on: macos-latest
+            java: "8"
+          - runs-on: macos-latest
+            java: "16"
 
     name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:

From 078406c6372e257998df24d4dad79a8da51e233e Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 1 May 2024 11:09:40 +0100
Subject: [PATCH 3/3] Add distribution

---
 .github/workflows/javadocs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
index 4d6397a2..972e4ca5 100644
--- a/.github/workflows/javadocs.yml
+++ b/.github/workflows/javadocs.yml
@@ -16,6 +16,7 @@ jobs:
       with:
         java-version: 17
         java-package: jdk
+        distribution: 'temurin'
 
     - name: Set up Python 3.9
       uses: actions/setup-python@v5