Skip to content

Dependency update #1783

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

Merged
LowriJenkins merged 11 commits into from
May 12, 2025
Merged

Dependency update #1783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2dcafe0
mpl backend update
Tom-Willemsen Mar 17, 2025
2c9a49c
Dependency update: eclipse 2024-12
Tom-Willemsen Mar 18, 2025
32e810e
Dependency updates: target platform/mvn
Tom-Willemsen Mar 18, 2025
a3945e0
Dependency update: cs-studio
Tom-Willemsen Mar 18, 2025
ea47687
Merge remote-tracking branch 'origin/master' into Ticket8597
Tom-Willemsen Apr 16, 2025
03594a4
Update JDK
Tom-Willemsen Apr 16, 2025
45e55af
Update maven
Tom-Willemsen Apr 16, 2025
17d3df6
Update to 3.12
Tom-Willemsen Apr 16, 2025
e9fa872
use even newer css (built on gha)
Tom-Willemsen Apr 16, 2025
a474c10
Delete xmlrunner
Tom-Willemsen May 8, 2025
eedcaf7
Update pinned activemq version
LowriJenkins May 9, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
Copy link
Member Author

@Tom-Willemsen Tom-Willemsen Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will fail CI until corresponding genie_python dependency update PR is merged & a pypi release made.

Copy link
Contributor

@LowriJenkins LowriJenkins May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is still failing after genie python dependency update merged and release made

Copy link
Member Author

@Tom-Willemsen Tom-Willemsen May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gave it a stern talking to in a474c10

- name: OPI checker dependencies
run: python -m pip install -r base/uk.ac.stfc.isis.ibex.opis/requirements.txt
- name: Run OPI checker
Expand All @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Run check_build
working-directory: ./build
run: python check_build.py ../base
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Install dependencies
run: python -m pip install -r ./base/uk.ac.stfc.isis.ibex.scriptgenerator/python_support/requirements.txt
- name: Run scriptgenerator tests
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 @@ -15,6 +15,6 @@ Require-Bundle: uk.ac.stfc.isis.ibex.logger,
org.eclipse.ui;bundle-version="3.8.2",
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
org.eclipse.ui.workbench,
wrapped.org.apache.activemq.activemq-all;bundle-version="5.18.6"
wrapped.org.apache.activemq.activemq-all;bundle-version="5.19.0"
Bundle-ClassPath: .
Automatic-Module-Name: uk.ac.stfc.isis.ibex.activemq
4 changes: 2 additions & 2 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 @@ -9,8 +9,8 @@
<properties>
<tycho.version>4.0.9</tycho.version>
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
<photon-repo.url>http://download.eclipse.org/releases/2024-09</photon-repo.url>
<photon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.33</photon-updates-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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
12 changes: 4 additions & 8 deletions base/uk.ac.stfc.isis.ibex.feature.css/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@
id="org.csstudio.autocomplete"
version="0.0.0"/>

<plugin
id="org.hamcrest.core"
version="0.0.0"/>

<plugin
id="org.eclipse.equinox.p2.metadata"
version="0.0.0"/>
Expand All @@ -132,10 +128,6 @@
id="org.tukaani.xz"
version="0.0.0"/>

<plugin
id="org.apache.commons.jxpath"
version="0.0.0"/>

<plugin
id="org.csstudio.logging.ui"
version="0.0.0"/>
Expand Down Expand Up @@ -720,4 +712,8 @@
id="jakarta.annotation-api"
version="0.0.0"/>

<plugin
id="org.csstudio.opibuilder.widgets.extra"
version="0.0.0"/>

</feature>
7 changes: 3 additions & 4 deletions base/uk.ac.stfc.isis.ibex.opis/check_opi_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from check_OPI_format_utils.container import get_items_not_in_grouping_container
from check_OPI_format_utils.font import get_incorrect_fonts
from check_OPI_format_utils.position import get_widgets_outside_of_boundary
from xmlrunner import XMLTestRunner

from check_OPI_format_utils.xy_graph import get_traces_with_different_buffer_sizes, get_trigger_pv
from check_opi_format_tests import TestCheckOpiFormatMethods
Expand Down Expand Up @@ -214,7 +213,7 @@ def test_GIVEN_a_label_THEN_it_has_correct_font(self):
def self_valid():
self_test_suite = unittest.TestSuite()
self_test_suite.addTests(loader.loadTestsFromTestCase(TestCheckOpiFormatMethods))
runner = XMLTestRunner(output=os.path.join(logs_dir, "check_opi_format"), stream=sys.stdout)
runner = unittest.TextTestRunner()
return runner.run(self_test_suite).wasSuccessful()

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

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

sys.exit(False in return_values)
3 changes: 1 addition & 2 deletions base/uk.ac.stfc.isis.ibex.opis/check_opi_format_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import unittest
from hamcrest import *
from lxml import etree
import xmlrunner
import sys

from check_OPI_format_utils.colour_checker import check_specific_isis_colours, check_any_isis_colour, \
Expand Down Expand Up @@ -579,4 +578,4 @@ def test_GIVEN_a_colourless_grouping_container_inside_a_tabbed_container_THEN_no


if __name__ == '__main__':
unittest.main(testRunner=xmlrunner.XMLTestRunner(output='test-reports', stream=sys.stdout))
unittest.main()
1 change: 0 additions & 1 deletion base/uk.ac.stfc.isis.ibex.opis/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lxml
pyhamcrest
pywin32
xmlrunner
30 changes: 15 additions & 15 deletions base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="2.1.0.202303072132"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.33/"/>
<unit id="org.eclipse.platform.ide" version="4.33.0.I20240903-0240"/>
<unit id="org.eclipse.rcp.feature.group" version="4.33.0.v20240903-0618"/>
<unit id="org.eclipse.rcp.source.feature.group" version="4.33.0.v20240903-0618"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.source.feature.group" version="0.0.0"/>
<unit id="jakarta.annotation-api" version="1.3.5"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/releases/2024-09/"/>
<repository location="https://download.eclipse.org/releases/2024-12/"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.cloudio.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.cloudio.user.feature.group" version="0.0.0"/>
Expand All @@ -53,7 +53,7 @@
<unit id="org.eclipse.gef.zest.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://shadow.nd.rl.ac.uk/ICP_P2/css_gui_dependencies_2023_12_20/p2repo"/>
<repository location="http://shadow.nd.rl.ac.uk/ICP_P2/css_gui_dependencies_2025_04_16/p2repo"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
Expand Down Expand Up @@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.1</version>
<version>2.24.3</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.24.1</version>
<version>2.24.3</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>5.18.6</version>
<version>5.19.0</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -139,7 +139,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.17.1</version>
<version>1.18.0</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -149,7 +149,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.13.0</version>
<version>2.13.1</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -169,7 +169,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.14.0</version>
<version>5.16.1</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -179,7 +179,7 @@
<dependency>
<groupId>net.sf.py4j</groupId>
<artifactId>py4j</artifactId>
<version>0.10.9.7</version>
<version>0.10.9.9</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -209,7 +209,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
<version>2.12.1</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -259,7 +259,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.1-jre</version>
<version>33.4.0-jre</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
13 changes: 7 additions & 6 deletions ...erver.tests/src/uk/ac/stfc/isis/ibex/ui/configserver/tests/CheckboxLabelProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.mockito.Mockito.*;

import java.util.List;
import java.util.stream.Stream;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.WritableMap;
Expand Down Expand Up @@ -211,16 +212,16 @@ public void GIVEN_table_WHEN_checkboxes_updated_then_table_sorted_THEN_checkbox_
public void GIVEN_checkbox_with_selection_adapters_WHEN_clear_checkbox_selection_listeners_THEN_selection_adapters_removed() {
Button mockCheckBox = mock(Button.class);

TypedListener[] checkBoxListeners = new TypedListener[2];
checkBoxListeners[0] = new TypedListener(modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[0]));
checkBoxListeners[1] = new TypedListener(modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[1]));
var checkBoxListeners = new CheckboxSelectionAdapter[2];
checkBoxListeners[0] = modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[0]);
checkBoxListeners[1] = modifiedCheckboxLabelProvider.new CheckboxSelectionAdapter(mockCheckBox, testModels[1]);

when(mockCheckBox.getListeners(SWT.Selection)).thenReturn(checkBoxListeners);
when(mockCheckBox.getTypedListeners(SWT.Selection, CheckboxSelectionAdapter.class)).thenReturn(Stream.of(checkBoxListeners));

CheckboxLabelProvider.clearCheckBoxSelectListeners(mockCheckBox);

verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[0].getEventListener());
verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[1].getEventListener());
verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[0]);
verify(mockCheckBox, times(1)).removeSelectionListener((SelectionListener) checkBoxListeners[1]);
}

@Test
Expand Down
6 changes: 4 additions & 2 deletions ...phing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibWebsocketEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ public void cursorPositionChanged(final MatplotlibCursorPosition position) {
final Map<String, Object> event = Map.of(
"x", position.x(),
"y", position.y(),
"button", 0,
"button", 0,
"buttons", 0,
"guiEvent", new HashMap<>(),
"modifiers", new ArrayList<>()
);
Expand Down Expand Up @@ -285,7 +286,8 @@ public void notifyButtonPress(final MatplotlibCursorPosition position, Matplotli
final Map<String, Object> event = Map.of(
"x", position.x(),
"y", position.y(),
"button", 0,
"button", 0,
"buttons", 0,
"guiEvent", new HashMap<>(),
"modifiers", new ArrayList<>()
);
Expand Down
7 changes: 0 additions & 7 deletions base/uk.ac.stfc.isis.ibex.ui.widgets/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop

This file was deleted.

15 changes: 2 additions & 13 deletions ....stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/CheckboxLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TypedListener;

/**
* A LabelProvider that adds a check box to a cell in a table.
Expand Down Expand Up @@ -185,16 +182,8 @@ private void resetCheckBoxListeners(boolean doUpdate, Button checkBox, T model)
* will remove.
*/
public static void clearCheckBoxSelectListeners(Button checkBox) {
for (Listener listener: checkBox.getListeners(SWT.Selection)) {
if (listener instanceof TypedListener) {
TypedListener typedListener = (TypedListener) listener;

if (typedListener.getEventListener() instanceof CheckboxLabelProvider.CheckboxSelectionAdapter) {

checkBox.removeSelectionListener((SelectionListener)
typedListener.getEventListener());
}
}
for (var listener: checkBox.getTypedListeners(SWT.Selection, CheckboxLabelProvider.CheckboxSelectionAdapter.class).toList()) {
checkBox.removeSelectionListener(listener);
}
}

Expand Down
2 changes: 1 addition & 1 deletion build/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5+11"
set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-21.0.6+7"
set "LOCAL_JRE_LOCATION=%~dp0jdk"

set "TARGET_DIR=%3"
Expand Down
2 changes: 1 addition & 1 deletion build/build_script_generator.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5+11"
set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-21.0.6+7"
set "LOCAL_JRE_LOCATION=%~dp0\jdk"
set "TARGET_DIR=%2"
if "%TARGET_DIR%" == "" (
Expand Down
2 changes: 1 addition & 1 deletion build/copy_in_maven.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.5" "%~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.9" "%~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"
Expand Down
Loading