From 74e7b5042749b4cd7a15404391b66b359d7ebfb1 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Wed, 4 Jun 2025 15:01:24 -0400 Subject: [PATCH] [releng] Update dependencies to latest 2025-06 for RC2 (#1184) --- .mvn/extensions.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF | 2 +- core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 12 +++++++++++- releng/org.eclipse.cdt.target/cdt.target | 10 +++++----- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 18 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 8673de28ada..50d59fe4db6 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 4.0.12 + 4.0.13 diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF index f6db99ef53c..70bd504e683 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF +++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.core.resources;bundle-version="[3.22.200,4)", org.eclipse.cdt.codan.ui.cxx;bundle-version="[3.7.100,4)", org.junit;bundle-version="[4.13.2,5)", - org.mockito.mockito-core;bundle-version="[5.17.0,6)", + org.mockito.mockito-core;bundle-version="[5.18.0,6.0.0)", org.eclipse.cdt.core;bundle-version="[9.1.0,10)" Fragment-Host: org.eclipse.cdt.codan.checkers.ui Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF index 4be676f65ea..ac42fc23d47 100644 --- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF @@ -51,7 +51,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.22.200,4)", org.eclipse.cdt.make.core;bundle-version="[8.0.0,9)", org.eclipse.cdt.meson.core;bundle-version="[1.2.300,2)", org.eclipse.cdt.core.autotools.core;bundle-version="[1.3.300,2)", - org.mockito.mockito-core;bundle-version="[5.17.0,6)" + org.mockito.mockito-core;bundle-version="[5.18.0,6.0.0)" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF index 61449154a3c..66a39ede36c 100644 --- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF @@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.28.0,4)", org.eclipse.ltk.ui.refactoring;bundle-version="[3.13.600,4)", org.eclipse.osgi;bundle-version="[3.23.100,4)", org.eclipse.e4.core.contexts;bundle-version="[1.13.100,2.0.0)", - org.mockito.mockito-core;bundle-version="[5.17.0,6)" + org.mockito.mockito-core;bundle-version="[5.18.0,6.0.0)" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF index 32695077aa0..cde862fa124 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.207.200,4)", org.eclipse.cdt.launch;bundle-version="[11.0.0,12)", org.eclipse.debug.core;bundle-version="[3.23.0,4)", org.eclipse.core.resources;bundle-version="[3.22.200,4)", - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.cdt.native.serial;bundle-version="[12.1.0,13)", org.eclipse.launchbar.ui;bundle-version="[2.5.600,3)" Bundle-ActivationPolicy: lazy diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF index c08f11d0317..0b445b994d7 100644 --- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.207.200,4)", org.eclipse.cdt.debug.core;bundle-version="[9.0.0,10)", org.eclipse.cdt.debug.ui;bundle-version="[8.5.700,9)", org.eclipse.ui.console;bundle-version="[3.14.300,4)", - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)" + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF index 3af8ca90407..636d687edd1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.cdt.gdb;bundle-version="[7.2.300,8)", org.eclipse.cdt.dsf.gdb;bundle-version="[7.1.500,8)", org.eclipse.core.variables;bundle-version="[3.6.500,4)", - org.mockito.mockito-core;bundle-version="[5.17.0,6)" + org.mockito.mockito-core;bundle-version="[5.18.0,6.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ClassPath: . diff --git a/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF index 1d7285ff8c7..9211d8bff13 100644 --- a/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF +++ b/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.100.qualifier Fragment-Host: org.eclipse.launchbar.core;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="[4.13.2,5)", - org.mockito.mockito-core;bundle-version="[5.17.0,6)" + org.mockito.mockito-core;bundle-version="[5.18.0,6.0.0)" Automatic-Module-Name: org.eclipse.launchbar.core.tests Bundle-Localization: fragment Bundle-Vendor: %providerName diff --git a/pom.xml b/pom.xml index e2b71b45167..b8a22c2d427 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 3.9.1 - 4.0.12 + 4.0.13 1.5.2 jacoco https://ci.eclipse.org/cdt/job/cdt/job/main/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository @@ -819,6 +819,16 @@ UTF-8 + + org.eclipse.tycho + tycho-versions-plugin + ${tycho-version} + + + org.eclipse.tycho.extras + tycho-version-bump-plugin + ${tycho-version} + org.eclipse.tycho diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index c4d7526bb70..0db21a0540a 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -7,7 +7,7 @@ - + @@ -22,11 +22,11 @@ - + - + @@ -46,7 +46,7 @@ - + @@ -118,7 +118,7 @@ org.mockito mockito-core - 5.17.0 + 5.18.0 jar diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF index 94015a01496..51e6a5d479b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.equinox.security;bundle-version="[1.4.600,2)", org.eclipse.tm.terminal.view.core;bundle-version="[4.10.400,5)";resolution:=optional, org.eclipse.tm.terminal.view.ui;bundle-version="[4.11.600,5)";resolution:=optional, - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)", org.eclipse.cdt.native.serial;bundle-version="[12.1.0,13)" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF index 91a3acf6434..fe41811997e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.tm.terminal.view.core;bundle-version="[4.10.400,5)";resolution:=optional, org.eclipse.tm.terminal.view.ui;bundle-version="[4.11.600,5)";resolution:=optional, org.eclipse.tm.terminal.connector.process;bundle-version="[4.9.200,5)", - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF index d3af457b28c..a750e9e7a25 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.tm.terminal.view.core;bundle-version="[4.10.400,5)";resolution:=optional, org.eclipse.tm.terminal.view.ui;bundle-version="[4.11.600,5)";resolution:=optional, - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.remote/META-INF/MANIFEST.MF index 4bf69ceba03..c3226d57876 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.remote/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="[3.207.200,4)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)", - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.remote.core;bundle-version="[4.2.300,5)", org.eclipse.remote.ui;bundle-version="[2.3.300,3)", org.eclipse.core.resources;bundle-version="[3.22.200,4)", diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF index fc4de42f562..12e5a2cf3bc 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.equinox.security;bundle-version="[1.4.600,2)", org.eclipse.tm.terminal.view.core;bundle-version="[4.10.400,5)";resolution:=optional, org.eclipse.tm.terminal.view.ui;bundle-version="[4.11.600,5)";resolution:=optional, - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)", com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)", org.eclipse.jsch.core;bundle-version="[1.5.600,2.0.0)" diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF index 2ae36732c35..50b426fca07 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.equinox.security;bundle-version="[1.4.600,2)", org.eclipse.tm.terminal.view.core;bundle-version="[4.10.400,5)";resolution:=optional, org.eclipse.tm.terminal.view.ui;bundle-version="[4.11.600,5)";resolution:=optional, - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy diff --git a/terminal/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF index 475f53b6663..09aacf4da05 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 4.6.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.junit;bundle-version="[4.13.2,5)", - org.eclipse.tm.terminal.control;bundle-version="[5.5.400,6)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.core.runtime;bundle-version="[3.33.0,4)", org.eclipse.ui;bundle-version="[3.207.200,4)", org.opentest4j;bundle-version="[1.3.0,2)" diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF index 6d111d21ed3..0be792c583e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.400,4)", org.eclipse.debug.ui;bundle-version="[3.18.800,4)";resolution:=optional, org.eclipse.egit.ui;bundle-version="[7.3.0,8)";resolution:=optional, org.eclipse.tm.terminal.view.core;bundle-version="[4.10.0,5.0.0)", - org.eclipse.tm.terminal.control;bundle-version="[5.5.0,6.0.0)", + org.eclipse.tm.terminal.control;bundle-version="[5.6.0,6.0.0)", org.eclipse.ui;bundle-version="[3.207.200,4)", org.eclipse.ui.ide;bundle-version="[3.22.600,4)";resolution:=optional, org.eclipse.ui.editors;bundle-version="[3.20.0,4)";resolution:=optional,