Skip to content

Ticket8885 dependency updates #1842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tom-Willemsen wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Ticket8885 dependency updates #1842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
26c3ebd
Eclipse 2025-09; broken due to CSS usage of deprecated GEF interfaces
Tom-Willemsen May 7, 2026
180bd2f
Try split update; eclipse 2026-03, GEF 2024-12
Tom-Willemsen May 7, 2026
5f70fb3
Tycho 4.0.9 -> 5.0.2
Tom-Willemsen May 7, 2026
8695dcd
Mockito 5.20.0 -> 5.23.0, tyrus 2.2.0 -> 2.2.2
Tom-Willemsen May 7, 2026
7123d4b
log4j 2.26.0, commons-codec 1.22.0, joda-time 2.14.2, gson 2.14.0, gu…
Tom-Willemsen May 7, 2026
f48b269
Fix tyrus update
Tom-Willemsen May 7, 2026
504298c
Update JDK 21 -> 25
Tom-Willemsen May 7, 2026
43b5412
Migrate to new RollingFileAppender builder names
Tom-Willemsen May 7, 2026
a54d4f1
Fix tyrus-standalone-client tycho build
Tom-Willemsen May 7, 2026
c195f02
Set BREEs to Java 25
Tom-Willemsen May 7, 2026
33e4f49
Code migration to Java 25
Tom-Willemsen May 7, 2026
1505b28
Fix resource leak
Tom-Willemsen May 7, 2026
372e63e
Update GHA to use Java 25
Tom-Willemsen May 7, 2026
17e9ab6
Correct ui.alerts.tests project setup
Tom-Willemsen May 8, 2026
276c3dc
Fix scriptgenerator build
Tom-Willemsen May 8, 2026
c0ce367
Maven 3.9.15
Tom-Willemsen May 8, 2026
d29001b
Merge remote-tracking branch 'origin/master' into Ticket8885_dep_updates
Tom-Willemsen May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
java-version: '25'
- name: checkstyle
working-directory: ./base/uk.ac.stfc.isis.ibex.client.tycho.parent
run: mvn checkstyle:check
Expand All @@ -68,7 +68,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
java-version: '25'
- uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Utils
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.activemq;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: uk.ac.stfc.isis.ibex.activemq.ActiveMQ
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.activemq,
uk.ac.stfc.isis.ibex.activemq.message
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.alarm.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.alarm.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.alarm;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest;bundle-version="1.1.0",
org.mockito.mockito-core;bundle-version="4.7.0",
Expand Down
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.alarm/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.alarm/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
org.csstudio.alarm.beast.msghist;bundle-version="4.0.1",
wrapped.org.apache.activemq.activemq-all;bundle-version="5.18.6"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alarm
Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
javax.inject;version="1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.alerts.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
net.bytebuddy.byte-buddy-agent;bundle-version="1.12.13",
org.objenesis;bundle-version="3.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alerts.tests
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.alerts/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.epics.switching
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.alerts
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alerts
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.banner/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.banner/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.epics.switching,
uk.ac.stfc.isis.ibex.configserver,
uk.ac.stfc.isis.ibex.epics
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.banner
Automatic-Module-Name: uk.ac.stfc.isis.ibex.banner
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.beamstatus/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.beamstatus/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.model;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.instrument,
uk.ac.stfc.isis.ibex.epics.switching,
org.diirt.vtype;bundle-version="3.1.5"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.beamstatus
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.beamstatus
40 changes: 3 additions & 37 deletions base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<properties>
<lifecycle-mapping-artifactId>lifecycle-mapping</lifecycle-mapping-artifactId>
<tycho.version>4.0.9</tycho.version>
<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/2024-12</photon-repo.url>
<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.34</photon-updates-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>
</properties>

Expand Down Expand Up @@ -118,40 +118,6 @@
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.eclipse.tycho</groupId>
<artifactId>
tycho-packaging-plugin
</artifactId>
<versionRange>
[0.20.0,)
</versionRange>
<goals>
<goal>validate-version</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.configserver.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Config server tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.configserver.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.configserver;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.10.0",
uk.ac.stfc.isis.ibex.epics,
org.hamcrest,
Expand Down
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.configserver/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.configserver/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
com.google.gson,
uk.ac.stfc.isis.ibex.managermode,
uk.ac.stfc.isis.ibex.validators;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.configserver;
uses:="uk.ac.stfc.isis.ibex.epics.pv,
Expand Down
2 changes: 1 addition & 1 deletion ...bex.configserver/src/uk/ac/stfc/isis/ibex/configserver/editing/EditableConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public EditableConfiguration(

Collection<Configuration> selectedComponents = getComponentDetails(config.getComponents(), components);
editableComponents = new EditableComponents(selectedComponents, components);
editableComponents.addPropertyChangeListener(evt -> updateComponents());
editableComponents.addPropertyChangeListener(_ -> updateComponents());

updateComponents();
setEnableSaveAsButton();
Expand Down
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.dae.tests/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.dae.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.dae.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.dae;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.10.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
Expand Down
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.dae/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.dae/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.preferences;bundle-version="1.0.0",
org.w3c.dom.events;bundle-version="3.0.0",
org.w3c.dom.smil;bundle-version="1.0.1",
org.w3c.dom.svg;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.dae,
uk.ac.stfc.isis.ibex.dae.actions,
Expand Down
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.dashboard/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.dashboard/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.dae,
uk.ac.stfc.isis.ibex.epics.switching
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.dashboard
Automatic-Module-Name: uk.ac.stfc.isis.ibex.dashboard
6 changes: 3 additions & 3 deletions base/uk.ac.stfc.isis.ibex.databases/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=25
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.databases/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.preferences;bundle-version="1.0.0",
com.mysql.cj;bundle-version="8.0.32",
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.databases,
uk.ac.stfc.isis.ibex.databases.preferences
Bundle-ClassPath: .
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.devicescreens.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.devicescreens.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.devicescreens;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
uk.ac.stfc.isis.ibex.epics,
org.hamcrest,
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.devicescreens/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.epics;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.epics.switching;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.dae;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.devicescreens,
uk.ac.stfc.isis.ibex.devicescreens.components,
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</launcher>

<vm>
<windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
<windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25</windows>
</vm>

<plugins>
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.e4.client/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher;bundle-version="1
uk.ac.stfc.isis.ibex.ui.moxas;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.alerts;bundle-version="1.0.0"
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-Vendor: ISIS
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.client

2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.e4.product/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.epics,
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
org.csstudio.security;bundle-version="1.1.1"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.product
Import-Package: uk.ac.stfc.isis.ibex.preferences
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Require-Bundle: jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.eclipse.core.runtime;bundle-version="3.19.0",
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher,
uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher.views
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher
Expand Down
2 changes: 1 addition & 1 deletion ...switcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/PerspectivesVisibleModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public PerspectivesVisibleModel(MApplication app, EPartService partService, EMod
writePerspectiveSettings = switchingWritableFactory.getSwitchableWritable(new CompressedCharWaveformChannel(),
InstrumentUtils.addPrefix(PERSPECTIVE_CONFIG_PV));

ManagerModeModel.getInstance().addPropertyChangeListener(ManagerModeModel.IN_MANAGER_MODE_STR, event -> {
ManagerModeModel.getInstance().addPropertyChangeListener(ManagerModeModel.IN_MANAGER_MODE_STR, _ -> {
setRemoteInManager();
});
setRemoteInManager();
Expand Down
2 changes: 1 addition & 1 deletion ...her/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/AlarmButtonViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public AlarmButtonViewModel(final AlarmCounter alarmCounter, String buttonLabel)
flash = new FlashingButton(this, ALARM_ERROR_COLOR);
flash.setDefaultColour(DEFOCUSSED);

alarmCounter.addPropertyChangeListener("alarmCount", ignored -> {
alarmCounter.addPropertyChangeListener("alarmCount", _ -> {
alarmCount = alarmCounter.getCount();
if (!active) {
alarmSeen = false;
Expand Down
2 changes: 1 addition & 1 deletion .../uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/ScriptServerButtonViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public ScriptServerButtonViewModel(NicosModel model, String buttonLabel) {
flash = new FlashingButton(this, SCRIPT_BUTTON_COLOR);
label = buttonLabel;

model.addPropertyChangeListener("scriptStatus", ignored -> {
model.addPropertyChangeListener("scriptStatus", _ -> {
status = model.getScriptStatus();
setButtonColor();
updateFlashing();
Expand Down
2 changes: 1 addition & 1 deletion ...her/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/views/PerspectiveHidingDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected Control createDialogArea(Composite parent) {

model = new PerspectivesVisibleModel(app, partService, modelService);

model.addPropertyChangeListener("remoteErrors", event -> {
model.addPropertyChangeListener("remoteErrors", _ -> {
setRemoteErrors(model.getRemoteErrors());
});
setRemoteErrors(model.getRemoteErrors());
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.e4.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Require-Bundle: org.eclipse.jface;bundle-version="3.11.1",
org.eclipse.core.runtime;bundle-version="3.11.1",
javax.inject
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: org.eclipse.wb.swt
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.ui
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.epics.switching/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.epics,
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0",
com.google.guava
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.epics.switching
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.epics.switching
Loading
Loading