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 f9b1ad2dd0..04d4fbd13d 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 @@
-
-
-
-
@@ -90,16 +86,15 @@
-
-
-
+
+
org.apache.logging.log4j
log4j-core
- 2.24.3
+ 2.25.2
jar
@@ -109,7 +104,7 @@
org.apache.logging.log4j
log4j-api
- 2.24.3
+ 2.25.2
jar
@@ -139,7 +134,7 @@
commons-codec
commons-codec
- 1.18.0
+ 1.19.0
jar
@@ -149,7 +144,7 @@
joda-time
joda-time
- 2.13.1
+ 2.14.0
jar
@@ -169,7 +164,7 @@
org.mockito
mockito-core
- 5.16.1
+ 5.20.0
jar
@@ -209,7 +204,7 @@
com.google.code.gson
gson
- 2.12.1
+ 2.13.2
jar
@@ -219,7 +214,7 @@
jakarta.mail
jakarta.mail-api
- 2.1.3
+ 2.2.0-M1
jar
@@ -229,7 +224,7 @@
org.glassfish.jaxb
jaxb-runtime
- 3.0.2
+ 4.0.6
jar
@@ -239,7 +234,7 @@
org.glassfish.jaxb
jaxb-core
- 3.0.2
+ 4.0.6
jar
@@ -259,7 +254,7 @@
com.google.guava
guava
- 33.4.0-jre
+ 33.5.0-jre
jar
@@ -274,6 +269,11 @@
+
+
+
+
+
linux
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);
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"
diff --git a/build/copy_in_maven.bat b/build/copy_in_maven.bat
index 418372db6d..1f15ab4cf2 100644
--- a/build/copy_in_maven.bat
+++ b/build/copy_in_maven.bat
@@ -1,5 +1,5 @@
@echo COPY_IN_MAVEN: Mirroring from local ISIS share
-robocopy "\\isis.cclrc.ac.uk\inst$\kits$\CompGroup\ICP\Binaries\maven-3.9.9" "%~dp0maven" /MT /NP /NFL /NDL /MIR /R:2 /LOG:"%~dp0ICP_Binaries_maven.log"
+robocopy "\\isis.cclrc.ac.uk\inst$\kits$\CompGroup\ICP\Binaries\maven-3.9.11" "%~dp0maven" /MT /NP /NFL /NDL /MIR /R:2 /LOG:"%~dp0ICP_Binaries_maven.log"
set errcode=%ERRORLEVEL%
if %errcode% GEQ 4 (
type "%~dp0ICP_Binaries_maven.log"