From fee73fc760cc9f83cedb90040dc03f9753a863c4 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Mon, 22 Jun 2026 23:00:31 +0100
Subject: [PATCH 01/11] Target JDK 21

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index f48fc708ac..a0ba3f15f2 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -86,6 +86,8 @@
 				        <arg>-Alog4j.graalvm.groupId=${project.groupId}</arg>
 				        <arg>-Alog4j.graalvm.artifactId=${project.artifactId}</arg>
 				    </compilerArgs>
+				    <deriveReleaseCompilerArgumentFromTargetLevel>false</deriveReleaseCompilerArgumentFromTargetLevel>
+				    <release>21</release>
 				</configuration>
 			</plugin>
 

From 84e295f3f676ac8c15e1cba2100db8df91f3c86b Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Mon, 22 Jun 2026 23:12:20 +0100
Subject: [PATCH 02/11] Target JDK 21

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index a0ba3f15f2..b95c407158 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -86,8 +86,9 @@
 				        <arg>-Alog4j.graalvm.groupId=${project.groupId}</arg>
 				        <arg>-Alog4j.graalvm.artifactId=${project.artifactId}</arg>
 				    </compilerArgs>
-				    <deriveReleaseCompilerArgumentFromTargetLevel>false</deriveReleaseCompilerArgumentFromTargetLevel>
-				    <release>21</release>
+                    <deriveReleaseCompilerArgumentFromTargetLevel>true</deriveReleaseCompilerArgumentFromTargetLevel>
+                    <source>21</source>
+				    <target>21</target>
 				</configuration>
 			</plugin>
 

From 5a1168e56176c3ceb294253e96a28e7920ec33de Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 00:23:58 +0100
Subject: [PATCH 03/11] Target JDK 21

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index b95c407158..08a15f0350 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -89,6 +89,7 @@
                     <deriveReleaseCompilerArgumentFromTargetLevel>true</deriveReleaseCompilerArgumentFromTargetLevel>
                     <source>21</source>
 				    <target>21</target>
+				    <release>21</release>
 				</configuration>
 			</plugin>
 

From bddea4199524e2bac64a3c9a423b959212472919 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 13:10:42 +0100
Subject: [PATCH 04/11] p

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index 08a15f0350..7b52f04acc 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -13,6 +13,7 @@
 		<photon-repo.url>http://download.eclipse.org/releases/2026-03</photon-repo.url>
 		<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.39</photon-updates-repo.url>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>21</maven.compiler.release>
 	</properties>
 
 	<repositories>
@@ -86,10 +87,10 @@
 				        <arg>-Alog4j.graalvm.groupId=${project.groupId}</arg>
 				        <arg>-Alog4j.graalvm.artifactId=${project.artifactId}</arg>
 				    </compilerArgs>
-                    <deriveReleaseCompilerArgumentFromTargetLevel>true</deriveReleaseCompilerArgumentFromTargetLevel>
-                    <source>21</source>
-				    <target>21</target>
-				    <release>21</release>
+                    <!--deriveReleaseCompilerArgumentFromTargetLevel>true</deriveReleaseCompilerArgumentFromTargetLevel-->
+                    <!--source>${maven.compiler.release}</source-->
+				    <!--target>${maven.compiler.release}</target-->
+				    <release>${maven.compiler.release}</release>
 				</configuration>
 			</plugin>
 

From cdfa188795106cc4bb2d48ac1d43b947b6b8bc4c Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 15:52:32 +0100
Subject: [PATCH 05/11] p

---
 .../src/uk/ac/stfc/isis/ibex/logger/IsisLog.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
index 5b6825fc3c..e084780f1f 100644
--- a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
+++ b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
@@ -146,7 +146,7 @@ public static void hookJavaLogger(final java.util.logging.Logger logger) {
 		}
 		
 		logger.setUseParentHandlers(false);
-		logger.setFilter(_ -> true);
+		logger.setFilter(record -> true);
 		logger.setLevel(java.util.logging.Level.INFO);
 		
 		logger.addHandler(new java.util.logging.Handler() {

From df56a059377e5ff88a75fc0583e925acf2134604 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 16:10:02 +0100
Subject: [PATCH 06/11] Revert "p"

This reverts commit cdfa188795106cc4bb2d48ac1d43b947b6b8bc4c.
---
 .../src/uk/ac/stfc/isis/ibex/logger/IsisLog.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
index e084780f1f..5b6825fc3c 100644
--- a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
+++ b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
@@ -146,7 +146,7 @@ public static void hookJavaLogger(final java.util.logging.Logger logger) {
 		}
 		
 		logger.setUseParentHandlers(false);
-		logger.setFilter(record -> true);
+		logger.setFilter(_ -> true);
 		logger.setLevel(java.util.logging.Level.INFO);
 		
 		logger.addHandler(new java.util.logging.Handler() {

From 02fab69200e3faee2cb3ce56ae2572694e142c6e Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 16:11:35 +0100
Subject: [PATCH 07/11] p

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index 7b52f04acc..da62ba583d 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -13,7 +13,7 @@
 		<photon-repo.url>http://download.eclipse.org/releases/2026-03</photon-repo.url>
 		<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.39</photon-updates-repo.url>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.release>22</maven.compiler.release>
 	</properties>
 
 	<repositories>

From 381a4e43883a95ac9f58f5de54e6d4d31023c524 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 16:16:55 +0100
Subject: [PATCH 08/11] p

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index da62ba583d..f6366751fe 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -13,7 +13,7 @@
 		<photon-repo.url>http://download.eclipse.org/releases/2026-03</photon-repo.url>
 		<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.39</photon-updates-repo.url>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>22</maven.compiler.release>
+        <maven.compiler.release>24</maven.compiler.release>
 	</properties>
 
 	<repositories>

From f325637343bdb1077d3031b09f669b528bf6c1e4 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 16:22:00 +0100
Subject: [PATCH 09/11] p

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index f6366751fe..34ed75bfc9 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -7,13 +7,13 @@
 	<packaging>pom</packaging>
 
 	<properties>
-  <lifecycle-mapping-artifactId>lifecycle-mapping</lifecycle-mapping-artifactId>
+		<lifecycle-mapping-artifactId>lifecycle-mapping</lifecycle-mapping-artifactId>
 		<tycho.version>5.0.2</tycho.version>
 		<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
 		<photon-repo.url>http://download.eclipse.org/releases/2026-03</photon-repo.url>
 		<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.39</photon-updates-repo.url>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>24</maven.compiler.release>
+		<maven.compiler.release>25</maven.compiler.release>
 	</properties>
 
 	<repositories>

From 6e9977dbfb364476bf51e1c6528e8cbf83e2c17b Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 16:59:30 +0100
Subject: [PATCH 10/11] p

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index 34ed75bfc9..e86c2f386d 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -87,7 +87,7 @@
 				        <arg>-Alog4j.graalvm.groupId=${project.groupId}</arg>
 				        <arg>-Alog4j.graalvm.artifactId=${project.artifactId}</arg>
 				    </compilerArgs>
-                    <!--deriveReleaseCompilerArgumentFromTargetLevel>true</deriveReleaseCompilerArgumentFromTargetLevel-->
+                    <deriveReleaseCompilerArgumentFromTargetLevel>false</deriveReleaseCompilerArgumentFromTargetLevel>
                     <!--source>${maven.compiler.release}</source-->
 				    <!--target>${maven.compiler.release}</target-->
 				    <release>${maven.compiler.release}</release>

From 74be2183df4021476f7842505703d8f52cbaebf4 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Jun 2026 17:14:20 +0100
Subject: [PATCH 11/11] p

---
 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index e86c2f386d..9ab9b615b7 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -13,7 +13,7 @@
 		<photon-repo.url>http://download.eclipse.org/releases/2026-03</photon-repo.url>
 		<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.39</photon-updates-repo.url>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.release>25</maven.compiler.release>
+		<maven.compiler.release>24</maven.compiler.release>
 	</properties>
 
 	<repositories>