From 69a009a9220a2f80b4b606d44992d2e13771aa87 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 9 Apr 2024 14:44:43 +0100
Subject: [PATCH 1/4] bump action version

---
 .github/workflows/gradle.yml | 6 +++---
 .github/workflows/maven.yml  | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index bae08f26..05b1bd87 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -18,14 +18,14 @@ jobs:
       gradle_version: 7.6 # set to empty to build with most recent version of gradle
       gradle_commands: publishToMavenLocal exec # default is build
     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: 'zulu'
           cache: 'gradle'
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@v3
         with:
           gradle-version: ${{ env.gradle_version }}
       - name: Run commands
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9fbc88af..7a2b85cb 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,9 +19,9 @@ jobs:
     env:
       maven_commands: install # default is install
     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: 'zulu'
@@ -35,9 +35,9 @@ jobs:
     env:
       server: ome.releases
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Repository
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: 'zulu'
@@ -49,4 +49,3 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.CI_DEPLOY_USER }}
           MAVEN_PASSWORD: ${{ secrets.CI_DEPLOY_PASS }}
-

From 73ccbb8dde6c41b991b0aeb8b2f9370307123051 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 9 Apr 2024 14:46:47 +0100
Subject: [PATCH 2/4] add Java 21

---
 .github/workflows/gradle.yml | 2 +-
 .github/workflows/maven.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 05b1bd87..871426b6 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11, 17, 21]
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     env:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7a2b85cb..7c092605 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11, 17, 21]
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     env:

From 153c232e0c788e40ee5e943989ee4e81d16c6c91 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 9 Apr 2024 14:51:05 +0100
Subject: [PATCH 3/4] bump gradle version

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

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 871426b6..0d1574d0 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -15,7 +15,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     env:
-      gradle_version: 7.6 # set to empty to build with most recent version of gradle
+      gradle_version: 8.7 # set to empty to build with most recent version of gradle
       gradle_commands: publishToMavenLocal exec # default is build
     steps:
       - uses: actions/checkout@v4

From 7a022a3d220664c30b0e26ab5212ddaceafebeb9 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 9 Apr 2024 14:55:20 +0100
Subject: [PATCH 4/4] use archiveClassifier

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0ef34406..c0c8f5a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,12 +21,12 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc.destinationDir
 }