From aa710bf270d3e32e2e9851a62c763995baca567f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Thu, 29 Jan 2026 13:49:51 +0100 Subject: [PATCH 1/8] Migrate Eclipse 4.37 to version 4.39 and remove unused dependencies --- .../BA_FeatureDependenciesCommon/feature.xml | 24 ------------ .../BA_FeatureDependenciesDebugE4/feature.xml | 8 ---- .../source/BA_SiteRepository/Ultimate.target | 37 ++----------------- 3 files changed, 3 insertions(+), 66 deletions(-) diff --git a/trunk/source/BA_FeatureDependenciesCommon/feature.xml b/trunk/source/BA_FeatureDependenciesCommon/feature.xml index c7664bb6f25..be0b9aae413 100644 --- a/trunk/source/BA_FeatureDependenciesCommon/feature.xml +++ b/trunk/source/BA_FeatureDependenciesCommon/feature.xml @@ -10,14 +10,6 @@ id="com.google.gson" version="0.0.0"/> - - - - @@ -34,10 +26,6 @@ id="org.apache.commons.commons-io" version="0.0.0"/> - - @@ -46,18 +34,6 @@ id="org.apache.logging.log4j.api" version="0.0.0"/> - - - - - - diff --git a/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml b/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml index 2e4a986b711..b67f4a2ed2e 100644 --- a/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml +++ b/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml @@ -62,14 +62,6 @@ id="org.apache.commons.commons-jxpath" version="0.0.0"/> - - - - diff --git a/trunk/source/BA_SiteRepository/Ultimate.target b/trunk/source/BA_SiteRepository/Ultimate.target index e30df18ddd0..4dffd557312 100644 --- a/trunk/source/BA_SiteRepository/Ultimate.target +++ b/trunk/source/BA_SiteRepository/Ultimate.target @@ -1,55 +1,24 @@ - + -ea -Xms4M -Xmx4G - + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - From 4ab77bf2f65316ad85ac1ab34c804140b5f933f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Wed, 10 Dec 2025 16:30:15 +0100 Subject: [PATCH 2/8] Update Maven dependencies --- trunk/source/BA_SiteRepository/Ultimate.target | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/source/BA_SiteRepository/Ultimate.target b/trunk/source/BA_SiteRepository/Ultimate.target index 4dffd557312..e8ef4640cbc 100644 --- a/trunk/source/BA_SiteRepository/Ultimate.target +++ b/trunk/source/BA_SiteRepository/Ultimate.target @@ -25,13 +25,13 @@ io.github.uuverifiers eldarica_2.12 - 2.1 + 2.2.1 jar io.github.uuverifiers princess_2.12 - 2024-11-08 + 2025-11-17 jar @@ -43,31 +43,31 @@ org.apache.commons commons-lang3 - 3.17.0 + 3.20.0 jar org.ops4j.pax.logging pax-logging-api - 2.2.7 + 2.3.2 jar org.ops4j.pax.logging pax-logging-log4j2 - 2.2.7 + 2.3.2 jar org.scala-lang scala-library - 2.12.20 + 2.12.21 jar org.yaml snakeyaml - 2.3 + 2.5 jar From 24b9239974b01ef1ca184ef768fb96b563003194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Wed, 10 Dec 2025 17:47:41 +0100 Subject: [PATCH 3/8] Update filename of launcher Jar in startup scripts --- releaseScripts/default/adds/UltDelta.py | 2 +- releaseScripts/default/adds/Ultimate.py | 2 +- releaseScripts/default/adds/reqchecker/run_complete_analysis.py | 2 +- releaseScripts/default/adds/run-ultimate.sh | 2 +- releaseScripts/website-config/backend/WebBackend.ini | 2 +- trunk/source/WebsiteStatic/scripts/webinterface/externals.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/releaseScripts/default/adds/UltDelta.py b/releaseScripts/default/adds/UltDelta.py index 023226cfde4..106dc431f7f 100755 --- a/releaseScripts/default/adds/UltDelta.py +++ b/releaseScripts/default/adds/UltDelta.py @@ -67,7 +67,7 @@ def get_binary(): "-jar", os.path.join( ultimatedir, - "plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar", + "plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar", ), "-data", datadir, diff --git a/releaseScripts/default/adds/Ultimate.py b/releaseScripts/default/adds/Ultimate.py index fe99d504d8e..e5502332b94 100755 --- a/releaseScripts/default/adds/Ultimate.py +++ b/releaseScripts/default/adds/Ultimate.py @@ -292,7 +292,7 @@ def create_ultimate_base_call(): "-jar", os.path.join( ultimatedir, - "plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar", + "plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar", ), "-data", "@noDefault", diff --git a/releaseScripts/default/adds/reqchecker/run_complete_analysis.py b/releaseScripts/default/adds/reqchecker/run_complete_analysis.py index 6944debc7c7..23833fafc7c 100755 --- a/releaseScripts/default/adds/reqchecker/run_complete_analysis.py +++ b/releaseScripts/default/adds/reqchecker/run_complete_analysis.py @@ -719,7 +719,7 @@ def create_common_ultimate_cli_args(args, toolchain, settings, input_file): "-Xmx100G", "-Xss4m", "-jar", - "plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar", + "plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar", "-tc", toolchain, "-s", diff --git a/releaseScripts/default/adds/run-ultimate.sh b/releaseScripts/default/adds/run-ultimate.sh index e8123de75ef..0252d6a6b69 100755 --- a/releaseScripts/default/adds/run-ultimate.sh +++ b/releaseScripts/default/adds/run-ultimate.sh @@ -4,6 +4,6 @@ java \ -Dosgi.configuration.area=config/ \ -Xmx10G \ -Xss4m \ --jar plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar \ +-jar plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar \ -data config/data \ "$@" diff --git a/releaseScripts/website-config/backend/WebBackend.ini b/releaseScripts/website-config/backend/WebBackend.ini index b69ab4e7aeb..f1af8b1e7e1 100644 --- a/releaseScripts/website-config/backend/WebBackend.ini +++ b/releaseScripts/website-config/backend/WebBackend.ini @@ -1,5 +1,5 @@ -startup -plugins/org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar +plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar --launcher.library plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.2.1500.v20250801-0854 -nosplash diff --git a/trunk/source/WebsiteStatic/scripts/webinterface/externals.py b/trunk/source/WebsiteStatic/scripts/webinterface/externals.py index 1df6db063d8..387ecafffcb 100644 --- a/trunk/source/WebsiteStatic/scripts/webinterface/externals.py +++ b/trunk/source/WebsiteStatic/scripts/webinterface/externals.py @@ -16,7 +16,7 @@ def get_ultimate_cli() -> list[str]: jar = ( ult_bin.parent / "plugins" - / "org.eclipse.equinox.launcher_1.7.0.v20250519-0528.jar" + / "org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar" ) datadir = ult_bin.parent / "data" return [ From 77e99c163bf69805b8e4b89334cfdb622d4a2967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Wed, 28 Jan 2026 14:07:10 +0100 Subject: [PATCH 4/8] Remove SnakeYAML (already contained in Eclipse dependencies) --- trunk/source/BA_SiteRepository/Ultimate.target | 6 ------ 1 file changed, 6 deletions(-) diff --git a/trunk/source/BA_SiteRepository/Ultimate.target b/trunk/source/BA_SiteRepository/Ultimate.target index e8ef4640cbc..80edd3a1bc0 100644 --- a/trunk/source/BA_SiteRepository/Ultimate.target +++ b/trunk/source/BA_SiteRepository/Ultimate.target @@ -64,12 +64,6 @@ 2.12.21 jar - - org.yaml - snakeyaml - 2.5 - jar - xerces xercesImpl From 084e7d517afc189cfd33c347195197c6fd253adc Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 3 Feb 2026 23:03:12 +0100 Subject: [PATCH 5/8] Remove unused XML fields in Eclipse feature definitions --- trunk/source/BA_FeatureUltimateCommon/feature.xml | 10 ++-------- trunk/source/BA_FeatureUltimateDebug/feature.xml | 5 +---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/trunk/source/BA_FeatureUltimateCommon/feature.xml b/trunk/source/BA_FeatureUltimateCommon/feature.xml index 17016763383..57a46d799de 100644 --- a/trunk/source/BA_FeatureUltimateCommon/feature.xml +++ b/trunk/source/BA_FeatureUltimateCommon/feature.xml @@ -13,10 +13,7 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> From 61973934bc0c2b0eccbc993c0fabb37206f85763 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 3 Feb 2026 23:04:31 +0100 Subject: [PATCH 6/8] Use only Eclipse features for products to include dependencies This change also removes duplicate imports of required feature definitions. --- .../BA_FeatureDependenciesDebugE4/feature.xml | 2 +- .../BA_FeatureUltimateCommandLine/feature.xml | 1 - .../BA_FeatureUltimateDebug/feature.xml | 2 - .../feature.xml | 11 +----- trunk/source/BA_FeatureWebBackend/feature.xml | 2 +- trunk/source/BA_SiteRepository/CLI-E4.product | 2 - .../source/BA_SiteRepository/Debug-E4.product | 3 -- .../BA_SiteRepository/DeltaDebugger.product | 2 - .../UltimateEliminator.product | 39 ++----------------- .../BA_SiteRepository/WebBackend.product | 2 - 10 files changed, 6 insertions(+), 60 deletions(-) diff --git a/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml b/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml index b67f4a2ed2e..12fdc750ee0 100644 --- a/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml +++ b/trunk/source/BA_FeatureDependenciesDebugE4/feature.xml @@ -7,7 +7,7 @@ arch="x86_64"> - + - diff --git a/trunk/source/BA_FeatureUltimateDebug/feature.xml b/trunk/source/BA_FeatureUltimateDebug/feature.xml index 3b2346a7961..dd20dcc6e1d 100644 --- a/trunk/source/BA_FeatureUltimateDebug/feature.xml +++ b/trunk/source/BA_FeatureUltimateDebug/feature.xml @@ -9,8 +9,6 @@ - - - - + - - - - diff --git a/trunk/source/BA_FeatureWebBackend/feature.xml b/trunk/source/BA_FeatureWebBackend/feature.xml index adb70b028b9..792dfb466f5 100644 --- a/trunk/source/BA_FeatureWebBackend/feature.xml +++ b/trunk/source/BA_FeatureWebBackend/feature.xml @@ -7,7 +7,7 @@ arch="x86_64"> - + - - diff --git a/trunk/source/BA_SiteRepository/Debug-E4.product b/trunk/source/BA_SiteRepository/Debug-E4.product index eaad77895ae..c33ff4011c4 100644 --- a/trunk/source/BA_SiteRepository/Debug-E4.product +++ b/trunk/source/BA_SiteRepository/Debug-E4.product @@ -47,9 +47,6 @@ - - - diff --git a/trunk/source/BA_SiteRepository/DeltaDebugger.product b/trunk/source/BA_SiteRepository/DeltaDebugger.product index 0dc9d4b1b25..0f971366247 100644 --- a/trunk/source/BA_SiteRepository/DeltaDebugger.product +++ b/trunk/source/BA_SiteRepository/DeltaDebugger.product @@ -48,8 +48,6 @@ - - diff --git a/trunk/source/BA_SiteRepository/UltimateEliminator.product b/trunk/source/BA_SiteRepository/UltimateEliminator.product index 8617ef93cd2..59922936611 100644 --- a/trunk/source/BA_SiteRepository/UltimateEliminator.product +++ b/trunk/source/BA_SiteRepository/UltimateEliminator.product @@ -44,42 +44,9 @@ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/trunk/source/BA_SiteRepository/WebBackend.product b/trunk/source/BA_SiteRepository/WebBackend.product index 9eb1145d81b..a8189e33349 100644 --- a/trunk/source/BA_SiteRepository/WebBackend.product +++ b/trunk/source/BA_SiteRepository/WebBackend.product @@ -36,8 +36,6 @@ - - From 09322ad16b4ab3713bf8049b3f77bbc53d811d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Thu, 5 Feb 2026 09:27:50 +0100 Subject: [PATCH 7/8] Update dependencies in POM --- trunk/source/BA_MavenParentUltimate/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/source/BA_MavenParentUltimate/pom.xml b/trunk/source/BA_MavenParentUltimate/pom.xml index f171c4993bd..a6e1b9d1fe0 100644 --- a/trunk/source/BA_MavenParentUltimate/pom.xml +++ b/trunk/source/BA_MavenParentUltimate/pom.xml @@ -20,9 +20,9 @@ - 5.0.0 + 5.0.2 - 5.2.0.4988 + 5.5.0.6356 0.8.14 @@ -30,13 +30,13 @@ 3.2.0 - 3.5.0 + 3.5.1 - 3.7.1 + 3.8.0 - 3.3.1 + 3.5.0 - 3.14.1 + 3.15.0 ${basedir}/.. @@ -233,7 +233,7 @@ org.eclipse.jdt ecj - 3.43.0 + 3.45.0 From a0352e1214ecfa29d952e4c6fa188fb574290b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=BCssele?= Date: Tue, 24 Mar 2026 15:07:36 +0100 Subject: [PATCH 8/8] wrapper scripts: look for available launcher JAR, instead of hardcoding version --- releaseScripts/default/adds/UltDelta.py | 15 +++++++++++---- releaseScripts/default/adds/Ultimate.py | 15 +++++++++++---- .../adds/reqchecker/run_complete_analysis.py | 12 +++++++++++- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/releaseScripts/default/adds/UltDelta.py b/releaseScripts/default/adds/UltDelta.py index 106dc431f7f..80d8e96d739 100755 --- a/releaseScripts/default/adds/UltDelta.py +++ b/releaseScripts/default/adds/UltDelta.py @@ -52,6 +52,16 @@ def check_string_contains(strings, words): return False +@lru_cache(maxsize=1) +def get_launcher_jar(): + candidates = glob.glob(os.path.join(ultimatedir, "plugins", "org.eclipse.equinox.launcher_*.jar")) + if not candidates: + raise RuntimeError("Could not find any launcher JAR.") + if len(candidates) > 1: + raise RuntimeError("Found multiple launcher JARs: " + ", ".join(candidates)) + return candidates[0] + + def get_binary(): ultimate_bin = [ "java", @@ -65,10 +75,7 @@ def get_binary(): ultimate_bin = ultimate_bin + [ "-jar", - os.path.join( - ultimatedir, - "plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar", - ), + get_launcher_jar(), "-data", datadir, ] diff --git a/releaseScripts/default/adds/Ultimate.py b/releaseScripts/default/adds/Ultimate.py index e5502332b94..7d8c5a41a72 100755 --- a/releaseScripts/default/adds/Ultimate.py +++ b/releaseScripts/default/adds/Ultimate.py @@ -277,6 +277,16 @@ def get_java(): sys.exit(ExitCode.FAIL_NO_JAVA) +@lru_cache(maxsize=1) +def get_launcher_jar(): + candidates = glob.glob(os.path.join(ultimatedir, "plugins", "org.eclipse.equinox.launcher_*.jar")) + if not candidates: + raise RuntimeError("Could not find any launcher JAR.") + if len(candidates) > 1: + raise RuntimeError("Found multiple launcher JARs: " + ", ".join(candidates)) + return candidates[0] + + def create_ultimate_base_call(): ultimate_bin = [ get_java(), @@ -290,10 +300,7 @@ def create_ultimate_base_call(): ultimate_bin = ultimate_bin + [ "-jar", - os.path.join( - ultimatedir, - "plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar", - ), + get_launcher_jar(), "-data", "@noDefault", "-ultimatedata", diff --git a/releaseScripts/default/adds/reqchecker/run_complete_analysis.py b/releaseScripts/default/adds/reqchecker/run_complete_analysis.py index 23833fafc7c..d14ab9c74a2 100755 --- a/releaseScripts/default/adds/reqchecker/run_complete_analysis.py +++ b/releaseScripts/default/adds/reqchecker/run_complete_analysis.py @@ -712,6 +712,16 @@ def extract_vacuity_run_z3(args, tmp_smt_filename): return relevant_lines +@lru_cache(maxsize=1) +def get_launcher_jar(): + candidates = glob.glob("plugins/org.eclipse.equinox.launcher_*.jar") + if not candidates: + raise RuntimeError("Could not find any launcher JAR.") + if len(candidates) > 1: + raise RuntimeError("Found multiple launcher JARs: " + ", ".join(candidates)) + return candidates[0] + + def create_common_ultimate_cli_args(args, toolchain, settings, input_file): return [ "java", @@ -719,7 +729,7 @@ def create_common_ultimate_cli_args(args, toolchain, settings, input_file): "-Xmx100G", "-Xss4m", "-jar", - "plugins/org.eclipse.equinox.launcher_1.7.100.v20251111-0406.jar", + get_launcher_jar(), "-tc", toolchain, "-s",