Skip to content

Commit cb9602c

Browse files
LowriJenkinsLowriJenkins
authored
Merge pull request #1783 from ISISComputingGroup/Ticket8597
Dependency update
2 parents 2b2096a + eedcaf7 commit cb9602c

File tree

15 files changed

+45
-67
lines changed

15 files changed

+45
-67
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- uses: actions/checkout@v4
88
- uses: actions/setup-python@v5
99
with:
10-
python-version: '3.11'
10+
python-version: '3.12'
1111
- name: OPI checker dependencies
1212
run: python -m pip install -r base/uk.ac.stfc.isis.ibex.opis/requirements.txt
1313
- name: Run OPI checker
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-python@v5
2323
with:
24-
python-version: '3.11'
24+
python-version: '3.12'
2525
- name: Run check_build
2626
working-directory: ./build
2727
run: python check_build.py ../base
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@v4
3333
- uses: actions/setup-python@v5
3434
with:
35-
python-version: '3.11'
35+
python-version: '3.12'
3636
- name: Install dependencies
3737
run: python -m pip install -r ./base/uk.ac.stfc.isis.ibex.scriptgenerator/python_support/requirements.txt
3838
- name: Run scriptgenerator tests

‎base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ Require-Bundle: uk.ac.stfc.isis.ibex.logger,
1515
org.eclipse.ui;bundle-version="3.8.2",
1616
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
1717
org.eclipse.ui.workbench,
18-
wrapped.org.apache.activemq.activemq-all;bundle-version="5.18.6"
18+
wrapped.org.apache.activemq.activemq-all;bundle-version="5.19.0"
1919
Bundle-ClassPath: .
2020
Automatic-Module-Name: uk.ac.stfc.isis.ibex.activemq

‎base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<properties>
1010
<tycho.version>4.0.9</tycho.version>
1111
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
12-
<photon-repo.url>http://download.eclipse.org/releases/2024-09</photon-repo.url>
13-
<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.33</photon-updates-repo.url>
12+
<photon-repo.url>http://download.eclipse.org/releases/2024-12</photon-repo.url>
13+
<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.34</photon-updates-repo.url>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
</properties>
1616

‎base/uk.ac.stfc.isis.ibex.feature.css/feature.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@
104104
id="org.csstudio.autocomplete"
105105
version="0.0.0"/>
106106

107-
<plugin
108-
id="org.hamcrest.core"
109-
version="0.0.0"/>
110-
111107
<plugin
112108
id="org.eclipse.equinox.p2.metadata"
113109
version="0.0.0"/>
@@ -132,10 +128,6 @@
132128
id="org.tukaani.xz"
133129
version="0.0.0"/>
134130

135-
<plugin
136-
id="org.apache.commons.jxpath"
137-
version="0.0.0"/>
138-
139131
<plugin
140132
id="org.csstudio.logging.ui"
141133
version="0.0.0"/>
@@ -720,4 +712,8 @@
720712
id="jakarta.annotation-api"
721713
version="0.0.0"/>
722714

715+
<plugin
716+
id="org.csstudio.opibuilder.widgets.extra"
717+
version="0.0.0"/>
718+
723719
</feature>

‎base/uk.ac.stfc.isis.ibex.opis/check_opi_format.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from check_OPI_format_utils.container import get_items_not_in_grouping_container
1414
from check_OPI_format_utils.font import get_incorrect_fonts
1515
from check_OPI_format_utils.position import get_widgets_outside_of_boundary
16-
from xmlrunner import XMLTestRunner
1716

1817
from check_OPI_format_utils.xy_graph import get_traces_with_different_buffer_sizes, get_trigger_pv
1918
from check_opi_format_tests import TestCheckOpiFormatMethods
@@ -214,7 +213,7 @@ def test_GIVEN_a_label_THEN_it_has_correct_font(self):
214213
def self_valid():
215214
self_test_suite = unittest.TestSuite()
216215
self_test_suite.addTests(loader.loadTestsFromTestCase(TestCheckOpiFormatMethods))
217-
runner = XMLTestRunner(output=os.path.join(logs_dir, "check_opi_format"), stream=sys.stdout)
216+
runner = unittest.TextTestRunner()
218217
return runner.run(self_test_suite).wasSuccessful()
219218

220219
if not self_valid():
@@ -245,14 +244,14 @@ def self_valid():
245244
suite.addTests([CheckStrictOpiFormat(test, root) for test in loader.getTestCaseNames(CheckStrictOpiFormat)])
246245
else:
247246
suite.addTests([CheckOpiFormat(test, root) for test in loader.getTestCaseNames(CheckOpiFormat)])
248-
runner = XMLTestRunner(output=os.path.join(logs_dir, filename), stream=sys.stdout)
247+
runner = unittest.TextTestRunner()
249248
return_values.append(runner.run(suite).wasSuccessful())
250249

251250
# for the opi_info.xml check
252251
print("Testing '{}'".format(os.path.join(root_dir, "opi_info.xml")))
253252
suite = unittest.TestSuite()
254253
suite.addTests(loader.loadTestsFromTestCase(TestOpiInfo))
255-
runner = XMLTestRunner(output=os.path.join(logs_dir, "TestOpiInfo"), stream=sys.stdout)
254+
runner = unittest.TextTestRunner()
256255
return_values.append(runner.run(suite).wasSuccessful())
257256

258257
sys.exit(False in return_values)

‎base/uk.ac.stfc.isis.ibex.opis/check_opi_format_tests.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import unittest
22
from hamcrest import *
33
from lxml import etree
4-
import xmlrunner
54
import sys
65

76
from check_OPI_format_utils.colour_checker import check_specific_isis_colours, check_any_isis_colour, \
@@ -579,4 +578,4 @@ def test_GIVEN_a_colourless_grouping_container_inside_a_tabbed_container_THEN_no
579578

580579

581580
if __name__ == '__main__':
582-
unittest.main(testRunner=xmlrunner.XMLTestRunner(output='test-reports', stream=sys.stdout))
581+
unittest.main()

‎base/uk.ac.stfc.isis.ibex.opis/requirements.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
lxml
22
pyhamcrest
33
pywin32
4-
xmlrunner

‎base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="2.1.0.202303072132"/>
3232
</location>
3333
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
34-
<repository location="https://download.eclipse.org/eclipse/updates/4.33/"/>
35-
<unit id="org.eclipse.platform.ide" version="4.33.0.I20240903-0240"/>
36-
<unit id="org.eclipse.rcp.feature.group" version="4.33.0.v20240903-0618"/>
37-
<unit id="org.eclipse.rcp.source.feature.group" version="4.33.0.v20240903-0618"/>
34+
<repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
35+
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
36+
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
37+
<unit id="org.eclipse.rcp.source.feature.group" version="0.0.0"/>
3838
<unit id="jakarta.annotation-api" version="1.3.5"/>
3939
</location>
4040
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
41-
<repository location="https://download.eclipse.org/releases/2024-09/"/>
41+
<repository location="https://download.eclipse.org/releases/2024-12/"/>
4242
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
4343
<unit id="org.eclipse.gef.cloudio.sdk.feature.group" version="0.0.0"/>
4444
<unit id="org.eclipse.gef.cloudio.user.feature.group" version="0.0.0"/>
@@ -53,7 +53,7 @@
5353
<unit id="org.eclipse.gef.zest.sdk.feature.group" version="0.0.0"/>
5454
</location>
5555
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
56-
<repository location="http://shadow.nd.rl.ac.uk/ICP_P2/css_gui_dependencies_2023_12_20/p2repo"/>
56+
<repository location="http://shadow.nd.rl.ac.uk/ICP_P2/css_gui_dependencies_2025_04_16/p2repo"/>
5757
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
5858
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
5959
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>org.apache.logging.log4j</groupId>
101101
<artifactId>log4j-core</artifactId>
102-
<version>2.24.1</version>
102+
<version>2.24.3</version>
103103
<type>jar</type>
104104
</dependency>
105105
</dependencies>
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>org.apache.logging.log4j</groupId>
111111
<artifactId>log4j-api</artifactId>
112-
<version>2.24.1</version>
112+
<version>2.24.3</version>
113113
<type>jar</type>
114114
</dependency>
115115
</dependencies>
@@ -119,7 +119,7 @@
119119
<dependency>
120120
<groupId>org.apache.activemq</groupId>
121121
<artifactId>activemq-all</artifactId>
122-
<version>5.18.6</version>
122+
<version>5.19.0</version>
123123
<type>jar</type>
124124
</dependency>
125125
</dependencies>
@@ -139,7 +139,7 @@
139139
<dependency>
140140
<groupId>commons-codec</groupId>
141141
<artifactId>commons-codec</artifactId>
142-
<version>1.17.1</version>
142+
<version>1.18.0</version>
143143
<type>jar</type>
144144
</dependency>
145145
</dependencies>
@@ -149,7 +149,7 @@
149149
<dependency>
150150
<groupId>joda-time</groupId>
151151
<artifactId>joda-time</artifactId>
152-
<version>2.13.0</version>
152+
<version>2.13.1</version>
153153
<type>jar</type>
154154
</dependency>
155155
</dependencies>
@@ -169,7 +169,7 @@
169169
<dependency>
170170
<groupId>org.mockito</groupId>
171171
<artifactId>mockito-core</artifactId>
172-
<version>5.14.0</version>
172+
<version>5.16.1</version>
173173
<type>jar</type>
174174
</dependency>
175175
</dependencies>
@@ -179,7 +179,7 @@
179179
<dependency>
180180
<groupId>net.sf.py4j</groupId>
181181
<artifactId>py4j</artifactId>
182-
<version>0.10.9.7</version>
182+
<version>0.10.9.9</version>
183183
<type>jar</type>
184184
</dependency>
185185
</dependencies>
@@ -209,7 +209,7 @@
209209
<dependency>
210210
<groupId>com.google.code.gson</groupId>
211211
<artifactId>gson</artifactId>
212-
<version>2.11.0</version>
212+
<version>2.12.1</version>
213213
<type>jar</type>
214214
</dependency>
215215
</dependencies>
@@ -259,7 +259,7 @@
259259
<dependency>
260260
<groupId>com.google.guava</groupId>
261261
<artifactId>guava</artifactId>
262-
<version>33.3.1-jre</version>
262+
<version>33.4.0-jre</version>
263263
<type>jar</type>
264264
</dependency>
265265
</dependencies>

‎base/uk.ac.stfc.isis.ibex.ui.configserver.tests/src/uk/ac/stfc/isis/ibex/ui/configserver/tests/CheckboxLabelProviderTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static org.mockito.Mockito.*;
2727

2828
import java.util.List;
29+
import java.util.stream.Stream;
2930

3031
import org.eclipse.core.databinding.observable.Realm;
3132
import org.eclipse.core.databinding.observable.map.WritableMap;
@@ -211,16 +212,16 @@ public void GIVEN_table_WHEN_checkboxes_updated_then_table_sorted_THEN_checkbox_
211212
public void GIVEN_checkbox_with_selection_adapters_WHEN_clear_checkbox_selection_listeners_THEN_selection_adapters_removed() {
212213
Button mockCheckBox = mock(Button.class);
213214

214-
TypedListener[] checkBoxListeners = new TypedListener[2];
215-
checkBoxListeners[0] = new TypedListener(modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[0]));
216-
checkBoxListeners[1] = new TypedListener(modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[1]));
215+
var checkBoxListeners = new CheckboxSelectionAdapter[2];
216+
checkBoxListeners[0] = modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[0]);
217+
checkBoxListeners[1] = modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[1]);
217218

218-
when(mockCheckBox.getListeners(SWT.Selection)).thenReturn(checkBoxListeners);
219+
when(mockCheckBox.getTypedListeners(SWT.Selection, CheckboxSelectionAdapter.class)).thenReturn(Stream.of(checkBoxListeners));
219220

220221
CheckboxLabelProvider.clearCheckBoxSelectListeners(mockCheckBox);
221222

222-
verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[0].getEventListener());
223-
verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[1].getEventListener());
223+
verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[0]);
224+
verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[1]);
224225
}
225226

226227
@Test

‎base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibWebsocketEndpoint.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ public void cursorPositionChanged(final MatplotlibCursorPosition position) {
254254
final Map<String, Object> event = Map.of(
255255
"x", position.x(),
256256
"y", position.y(),
257-
"button", 0,
257+
"button", 0,
258+
"buttons", 0,
258259
"guiEvent", new HashMap<>(),
259260
"modifiers", new ArrayList<>()
260261
);
@@ -285,7 +286,8 @@ public void notifyButtonPress(final MatplotlibCursorPosition position, Matplotli
285286
final Map<String, Object> event = Map.of(
286287
"x", position.x(),
287288
"y", position.y(),
288-
"button", 0,
289+
"button", 0,
290+
"buttons", 0,
289291
"guiEvent", new HashMap<>(),
290292
"modifiers", new ArrayList<>()
291293
);

0 commit comments

Comments
 (0)