From 35e9c04b404ecda3e3c741e894ea55ed3f6c76f6 Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 1 May 2024 11:12:29 +0100
Subject: [PATCH 1/3] Test on java 21

---
 .github/workflows/ci.yml       | 11 ++++++++---
 .github/workflows/javadocs.yml | 11 ++++++-----
 pom.xml                        |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53c66677..0c40c61d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,14 +16,19 @@ 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]
+        exclude:
+          - runs-on: macos-latest
+            java: "8"
+          - runs-on: macos-latest
+            java: "16"
 
     name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.Java }}
-      uses: actions/setup-java@v3
+      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 df4fda2e..226a1cde 100644
--- a/.github/workflows/javadocs.yml
+++ b/.github/workflows/javadocs.yml
@@ -9,16 +9,17 @@ 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
+        distribution: 'temurin'
 
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
 
@@ -28,14 +29,14 @@ jobs:
         pip install ghp-import
 
     - name: Checkout NeuroML2
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: NeuroML/NeuroML2
         ref: development
         path: NeuroML2
 
     - 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 66d5f1b8..6d88b38f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,8 +158,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

From 6e7a41a2f0c350376d2b7801b5ea5354bcb5e604 Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 1 May 2024 11:20:22 +0100
Subject: [PATCH 2/3] Install HDF5 on macos-latest (v14)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c40c61d..72fe3570 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,6 +33,11 @@ jobs:
         java-version: ${{ matrix.Java }}
         distribution: 'temurin'
 
+    - name: Install HDF5 on macos-latest (v14)
+      if: ${{ matrix.runs-on == 'macos-latest' }}
+      run: |
+        brew install hdf5
+
     - name: Install and test (non Win)
       env:
         main_repo_branch: ${GITHUB_REF_NAME}

From e9d6a4c7d80a5949fa9d810188f3cf2df1b20362 Mon Sep 17 00:00:00 2001
From: pgleeson <p.gleeson@gmail.com>
Date: Wed, 1 May 2024 11:25:34 +0100
Subject: [PATCH 3/3] Just tets on macos-12

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72fe3570..c9957d9f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ '8', '11', '16', '17', '19', '21' ]
-        runs-on: [ubuntu-latest, macos-latest, windows-latest]
+        runs-on: [ubuntu-latest, macos-12, windows-latest]
         exclude:
           - runs-on: macos-latest
             java: "8"