From b31463cc7250b19b58c8a3e80d081e107c32134b Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Fri, 10 Oct 2025 11:01:44 +0100 Subject: [PATCH 01/12] Update Dependency: GSON 2.13.2 --- base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index f9b1ad2dd0..09d5a90a14 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -209,7 +209,7 @@ com.google.code.gson gson - 2.12.1 + 2.13.2 jar From 1f6c4502bc53236d34e0b8a94731709e5beafc12 Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Fri, 10 Oct 2025 12:33:11 +0100 Subject: [PATCH 02/12] Update Dependency: Guava 22.5 --- base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index 09d5a90a14..3690318e09 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -259,7 +259,7 @@ com.google.guava guava - 33.4.0-jre + 33.5.0-jre jar From faf71412b42e337f20ccf5c75a36062235e4b04a Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Fri, 10 Oct 2025 14:28:48 +0100 Subject: [PATCH 03/12] Update Dependency: Commons-codec 1.19 --- base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index 3690318e09..ea32b65323 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -139,7 +139,7 @@ commons-codec commons-codec - 1.18.0 + 1.19.0 jar From 22bcf4e261076268244e8ddb9406918ba6071410 Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Mon, 13 Oct 2025 08:47:25 +0100 Subject: [PATCH 04/12] Update Dependency: jakarta mail api 2.2.0-M1 --- base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index ea32b65323..37446d5ba7 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -219,7 +219,7 @@ jakarta.mail jakarta.mail-api - 2.1.3 + 2.2.0-M1 jar From c475540ea167836cbed31564c125f876bc8b5d2e Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Mon, 13 Oct 2025 09:32:35 +0100 Subject: [PATCH 05/12] Update Dependency: joda-time 2.14.0 --- base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index 37446d5ba7..67fe26a522 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -149,7 +149,7 @@ joda-time joda-time - 2.13.1 + 2.14.0 jar From 8f3410e9973a57a13d02f52a63c64a6feb65576f Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Mon, 13 Oct 2025 13:36:59 +0100 Subject: [PATCH 06/12] Update Dependency: log4j - 2.25.2 --- base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml | 7 ++++++- base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF | 4 ++-- .../targetplatform.target | 4 ++-- 3 files changed, 10 insertions(+), 5 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 e1975c3d59..bb18e5ef31 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 @@ -80,7 +80,12 @@ true true false - -warn:-warningToken + + -warn:-warningToken + + -Alog4j.graalvm.groupId=${project.groupId} + -Alog4j.graalvm.artifactId=${project.artifactId} + diff --git a/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF index 2f39344830..b5070c3919 100644 --- a/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF +++ b/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-Activator: uk.ac.stfc.isis.ibex.logger.IsisLog Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, com.google.guava, - org.apache.logging.log4j.api;bundle-version="2.24.1";visibility:=reexport, - org.apache.logging.log4j.core;bundle-version="2.24.1";visibility:=reexport + org.apache.logging.log4j.api;bundle-version="2.25.2";visibility:=reexport, + org.apache.logging.log4j.core;bundle-version="2.25.2";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: uk.ac.stfc.isis.ibex.logger diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index 67fe26a522..67207eed7d 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -99,7 +99,7 @@ org.apache.logging.log4j log4j-core - 2.24.3 + 2.25.2 jar @@ -109,7 +109,7 @@ org.apache.logging.log4j log4j-api - 2.24.3 + 2.25.2 jar From d8b3e0e15e15ba62302bf52ef6539664b3f38660 Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Mon, 13 Oct 2025 14:15:54 +0100 Subject: [PATCH 07/12] Update Dependency: jaxb - 4.0.6 --- .../uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index 67207eed7d..bb862c6321 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -229,7 +229,7 @@ org.glassfish.jaxb jaxb-runtime - 3.0.2 + 4.0.6 jar @@ -239,7 +239,7 @@ org.glassfish.jaxb jaxb-core - 3.0.2 + 4.0.6 jar From d64913c2fbfa7bed0ea09c079ab41811d84be7bb Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Mon, 13 Oct 2025 14:59:39 +0100 Subject: [PATCH 08/12] Update Dependency: mockito-core 5.20.0 --- base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index bb862c6321..ec0ff8dc91 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -169,7 +169,7 @@ org.mockito mockito-core - 5.16.1 + 5.20.0 jar From 538be824fcf02b53a75a1daf367c689ef23aef94 Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Tue, 14 Oct 2025 14:00:22 +0100 Subject: [PATCH 09/12] Update Dependency: nebula releases 3.1.1 --- .../targetplatform.target | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index ec0ff8dc91..629fa34421 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -26,10 +26,6 @@ - - - - @@ -94,6 +90,10 @@ + + + + From a5214d629efe6d28fc7d4e8580853f2d19b1c1ab Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Wed, 29 Oct 2025 10:45:01 +0000 Subject: [PATCH 10/12] Replace use TyperListener as it is deprecated in future eclipse versions --- .../tests/CheckboxLabelProviderTest.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/src/uk/ac/stfc/isis/ibex/ui/configserver/tests/CheckboxLabelProviderTest.java b/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/src/uk/ac/stfc/isis/ibex/ui/configserver/tests/CheckboxLabelProviderTest.java index 2bee9b8a0b..37f2e212e4 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/src/uk/ac/stfc/isis/ibex/ui/configserver/tests/CheckboxLabelProviderTest.java +++ b/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/src/uk/ac/stfc/isis/ibex/ui/configserver/tests/CheckboxLabelProviderTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; +import java.util.EventListener; import java.util.List; import java.util.stream.Stream; @@ -34,8 +35,8 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.TypedListener; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -47,7 +48,24 @@ * */ public class CheckboxLabelProviderTest { - + + public class mockSelectionListener implements Listener { + private EventListener eventListener; + @Override + public void handleEvent(Event event) { + return; + + } + + public mockSelectionListener (EventListener listener) { + this.eventListener = listener; + } + + public EventListener getEventListener() { + return this.eventListener; + } + + } private CheckboxLabelProvider modifiedCheckboxLabelProvider; private final String[] testModels = {"block", "ioc", "synoptic"}; @@ -228,9 +246,9 @@ public void GIVEN_checkbox_with_selection_adapters_WHEN_clear_checkbox_selection public void GIVEN_checkbox_with_non_selection_listeners_WHEN_clear_checkbox_selection_listeners_THEN_no_listener_removed() { Button mockCheckBox = mock(Button.class); - TypedListener[] checkBoxListeners = new TypedListener[2]; - checkBoxListeners[0] = new TypedListener(mock(SelectionListener.class)); - checkBoxListeners[1] = new TypedListener(mock(SelectionListener.class)); + Listener[] checkBoxListeners = new mockSelectionListener[2]; + checkBoxListeners[0] = new mockSelectionListener(mock(SelectionListener.class)); + checkBoxListeners[1] = new mockSelectionListener(mock(SelectionListener.class)); when(mockCheckBox.getListeners(SWT.Selection)).thenReturn(checkBoxListeners); From ba7512bfaf5954bd8364e15f3b7c0da38fc420d3 Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Tue, 4 Nov 2025 11:30:19 +0000 Subject: [PATCH 11/12] increase java 21 version --- build/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.bat b/build/build.bat index c2ae06b7c6..a9da7f68d7 100644 --- a/build/build.bat +++ b/build/build.bat @@ -2,7 +2,7 @@ setlocal cd /d %~dp0 REM We bundle our own JRE with the client, this is where it is -set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-21.0.6+7" +set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-21.0.9+10" set "LOCAL_JRE_LOCATION=%~dp0jdk" set "TARGET_DIR=%3" From f7d72df58875b682def6610b0a00ef063a84db81 Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Fri, 14 Nov 2025 16:08:57 +0000 Subject: [PATCH 12/12] Update Pydev --- .../targetplatform.target | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target index 629fa34421..04d4fbd13d 100644 --- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target +++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target @@ -85,11 +85,6 @@ - - - - - @@ -274,6 +269,11 @@ + + + + + linux