diff --git a/releaseScripts/default/adds/UltDelta.py b/releaseScripts/default/adds/UltDelta.py index 023226cfde4..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.0.v20250519-0528.jar", - ), + get_launcher_jar(), "-data", datadir, ] diff --git a/releaseScripts/default/adds/Ultimate.py b/releaseScripts/default/adds/Ultimate.py index fe99d504d8e..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.0.v20250519-0528.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 6944debc7c7..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.0.v20250519-0528.jar", + get_launcher_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/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..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_FeatureUltimateCommandLine/feature.xml b/trunk/source/BA_FeatureUltimateCommandLine/feature.xml index e28d1830fb9..d9e7a2193b4 100644 --- a/trunk/source/BA_FeatureUltimateCommandLine/feature.xml +++ b/trunk/source/BA_FeatureUltimateCommandLine/feature.xml @@ -7,7 +7,6 @@ arch="x86_64"> - 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"/> diff --git a/trunk/source/BA_FeatureUltimateDeltaDebugger/feature.xml b/trunk/source/BA_FeatureUltimateDeltaDebugger/feature.xml index 08049b211fa..c35d602917a 100644 --- a/trunk/source/BA_FeatureUltimateDeltaDebugger/feature.xml +++ b/trunk/source/BA_FeatureUltimateDeltaDebugger/feature.xml @@ -6,20 +6,11 @@ provider-name="Ultimate Program Analysis Team"> - - + - - - - 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"> - + - 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 diff --git a/trunk/source/BA_SiteRepository/CLI-E4.product b/trunk/source/BA_SiteRepository/CLI-E4.product index b2000a02aae..5a86e136019 100644 --- a/trunk/source/BA_SiteRepository/CLI-E4.product +++ b/trunk/source/BA_SiteRepository/CLI-E4.product @@ -48,8 +48,6 @@ - - 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/Ultimate.target b/trunk/source/BA_SiteRepository/Ultimate.target index e30df18ddd0..80edd3a1bc0 100644 --- a/trunk/source/BA_SiteRepository/Ultimate.target +++ b/trunk/source/BA_SiteRepository/Ultimate.target @@ -1,68 +1,37 @@ - + -ea -Xms4M -Xmx4G - + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - 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 @@ -74,31 +43,25 @@ 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 - jar - - - org.yaml - snakeyaml - 2.3 + 2.12.21 jar 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 @@ - - 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 [