diff --git a/Jenkinsfile b/Jenkinsfile index 03f5714876e..0bd833041a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } parameters { - choice(name: 'TARGET_PLATFORM', choices: ['r202403', 'r202406', 'r202409', 'r202412', 'r202503', 'r202506', 'r202509', 'r202512', 'r202603', 'latest'], description: 'Which Target Platform should be used?') + choice(name: 'TARGET_PLATFORM', choices: ['r202512', 'r202603', 'latest'], description: 'Which Target Platform should be used?') // see https://wiki.eclipse.org/Jenkins#JDK choice(name: 'JDK_VERSION', choices: [ '21', '25' ], description: 'Which JDK version should be used?') } @@ -182,8 +182,8 @@ def selectedTargetPlatform() { println("Choosing 'latest' target since this build was triggered by upstream with Java ${javaVersion}") return 'latest' } else if (isTriggeredByUpstream() && javaVersion>=21) { - println("Choosing 'r2024-03' target since this build was triggered by upstream with Java ${javaVersion}") - return 'r2024-03' + println("Choosing 'r2025-12' target since this build was triggered by upstream with Java ${javaVersion}") + return 'r2025-12' } else { return tp } diff --git a/full-build.sh b/full-build.sh index 82330aac90e..403b1950f64 100755 --- a/full-build.sh +++ b/full-build.sh @@ -16,7 +16,7 @@ while [ "$1" != "" ]; do echo -e "\t-h --help" echo -e "\t--no-tests Skip test execution" echo -e "\t--local-repository= Use local Maven repository" - echo -e "\t--tp=$TARGET_PLATFORM (valid values: r2024-03,r2024-06,...,latest)" + echo -e "\t--tp=$TARGET_PLATFORM (valid values: r202512,r202603,...,latest)" echo "" exit ;; diff --git a/full-deploy.sh b/full-deploy.sh index e103a6cc6e9..2b7b63ed441 100755 --- a/full-deploy.sh +++ b/full-deploy.sh @@ -18,7 +18,7 @@ while [ "$1" != "" ]; do echo -e "\t-h --help" echo -e "\t--no-tests Skip test execution" echo -e "\t--local-repository= Use local Maven repository" - echo -e "\t--tp=$TARGET_PLATFORM (valid values: r2024-03,r2024-06,...,latest)" + echo -e "\t--tp=$TARGET_PLATFORM (valid values: r202512,r202603,...,latest)" echo "" exit ;; diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index 14760bf24fd..4c75d794cf8 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -12,15 +12,15 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.43.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.xbase.ui;bundle-version="2.43.0", org.hamcrest.core;bundle-version="2.2.0", - org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.equinox.common;bundle-version="3.19.0", + org.eclipse.core.runtime;bundle-version="3.34.100", + org.eclipse.equinox.common;bundle-version="3.20.300", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", - org.eclipse.core.resources;bundle-version="3.20.100", + org.eclipse.core.resources;bundle-version="3.23.100", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.builder;bundle-version="2.43.0", org.eclipse.xtend.lib;bundle-version="2.43.0", org.objectweb.asm;bundle-version="[9.9.1,10.0.0)", - org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.jdt.core;bundle-version="3.44.0", org.eclipse.xtext.builder.standalone;bundle-version="2.43.0", org.eclipse.xtext.java;bundle-version="2.43.0" Import-Package: jakarta.inject;version="2.0.1", diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF index 7a8b28520d7..d31a8b79cc2 100644 --- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF @@ -93,13 +93,13 @@ Export-Package: org.eclipse.xtend.core;version="2.43.0"; org.eclipse.xtend.core.tests", org.eclipse.xtend.core.xtend.impl;version="2.43.0";x-internal:=true, org.eclipse.xtend.core.xtend.util;version="2.43.0";x-internal:=true -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, org.eclipse.xtext.common.types;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtend.lib;bundle-version="2.43.0", org.eclipse.xtext.smap;bundle-version="2.43.0", diff --git a/org.eclipse.xtend.doc/META-INF/MANIFEST.MF b/org.eclipse.xtend.doc/META-INF/MANIFEST.MF index ca61b199b58..fc67a4d4a27 100644 --- a/org.eclipse.xtend.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.doc/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtend.doc;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.help;bundle-version="3.10.300" +Require-Bundle: org.eclipse.help;bundle-version="3.10.600" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtend.examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/META-INF/MANIFEST.MF index 8ba92bec57a..4698c0cd63e 100644 --- a/org.eclipse.xtend.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtend.examples;singleton:=true Bundle-Version: 2.43.0.qualifier -Require-Bundle: org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.core.runtime;bundle-version="3.31.0", +Require-Bundle: org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.emf.common.ui;bundle-version="2.22.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF index 33b65c42609..995a9eeec3d 100644 --- a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.43.0", org.eclipse.xtext.ide;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.xbase.ide;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional + org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.xtend.ide.common.contentassist.antlr;version="2.43.0";x-friends:="org.eclipse.xtend.ide", org.eclipse.xtend.ide.common.contentassist.antlr.internal;version="2.43.0";x-friends:="org.eclipse.xtend.ide", diff --git a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF index 6678b7a9800..d2361f92eaf 100644 --- a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF @@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="4.1.0", org.eclipse.swtbot.junit4_x;bundle-version="4.1.0", org.eclipse.swtbot.swt.finder;bundle-version="4.1.0", org.eclipse.xtend.ide;bundle-version="2.43.0", - org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.jdt.ui;bundle-version="3.32.0", + org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.jdt.ui;bundle-version="3.36.0", org.eclipse.xtext.ui;bundle-version="2.43.0", org.hamcrest.library;bundle-version="1.3.0", org.eclipse.xtend.core;bundle-version="2.43.0", diff --git a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF index d2dbff93223..131c8cbd72c 100644 --- a/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide.tests/META-INF/MANIFEST.MF @@ -8,23 +8,23 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtend.core;bundle-version="2.43.0", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.ui.workbench;bundle-version="3.131.100", - org.eclipse.core.resources;bundle-version="3.20.100", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.pde.core;bundle-version="3.18.0", + org.eclipse.ui.workbench;bundle-version="3.137.0", + org.eclipse.core.resources;bundle-version="3.23.100", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.pde.core;bundle-version="3.21.100", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.apache.ant;bundle-version="1.10.14", org.eclipse.xtend.ide;bundle-version="2.43.0", - org.eclipse.ui.ide;bundle-version="3.22.100", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.ui.ide;bundle-version="3.22.800", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext.xbase.ui;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.jdt.ui;bundle-version="3.32.0", - org.eclipse.jdt.launching;bundle-version="3.21.100", + org.eclipse.jdt.ui;bundle-version="3.36.0", + org.eclipse.jdt.launching;bundle-version="3.24.0", org.eclipse.xtext.builder;bundle-version="2.43.0", - org.eclipse.search;bundle-version="3.16.100", - org.eclipse.jdt.core.manipulation;bundle-version="1.21.0", - org.eclipse.core.expressions;bundle-version="3.9.300", + org.eclipse.search;bundle-version="3.17.400", + org.eclipse.jdt.core.manipulation;bundle-version="1.23.200", + org.eclipse.core.expressions;bundle-version="3.9.500", org.eclipse.xtend.lib;bundle-version="2.43.0", org.eclipse.xtend.ide.tests.data;bundle-version="2.43.0", org.eclipse.xtext.ide;bundle-version="2.43.0", diff --git a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF index 7718c4fa72a..49fd4396cc1 100644 --- a/org.eclipse.xtend.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.ide/META-INF/MANIFEST.MF @@ -14,22 +14,22 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.43.0", org.eclipse.xtext.common.types.ui;bundle-version="2.43.0", org.eclipse.xtext.xbase.ui;bundle-version="2.43.0", org.eclipse.xtend.ide.common;bundle-version="2.43.0";visibility:=reexport, - org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.ui.ide;bundle-version="3.22.100", - org.eclipse.ui.console;bundle-version="3.14.0", - org.eclipse.core.filesystem;bundle-version="1.10.300", - org.eclipse.jdt.ui;bundle-version="3.32.0", - org.eclipse.compare;bundle-version="3.10.0", - org.eclipse.jdt.launching;bundle-version="3.21.100", - org.eclipse.ltk.ui.refactoring;bundle-version="3.13.300";resolution:=optional, - org.eclipse.jdt.debug.ui;bundle-version="3.13.300", - org.eclipse.ui.editors;bundle-version="3.17.200", + org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.ui.ide;bundle-version="3.22.800", + org.eclipse.ui.console;bundle-version="3.15.0", + org.eclipse.core.filesystem;bundle-version="1.11.400", + org.eclipse.jdt.ui;bundle-version="3.36.0", + org.eclipse.compare;bundle-version="3.11.600", + org.eclipse.jdt.launching;bundle-version="3.24.0", + org.eclipse.ltk.ui.refactoring;bundle-version="3.13.700";resolution:=optional, + org.eclipse.jdt.debug.ui;bundle-version="3.15.200", + org.eclipse.ui.editors;bundle-version="3.20.200", org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.jdt.core.manipulation;bundle-version="1.21.0";resolution:=optional, - org.eclipse.e4.core.services;bundle-version="2.4.300", - org.eclipse.e4.ui.css.swt.theme;bundle-version="0.14.300" + org.eclipse.jdt.core.manipulation;bundle-version="1.23.200";resolution:=optional, + org.eclipse.e4.core.services;bundle-version="2.5.300", + org.eclipse.e4.ui.css.swt.theme;bundle-version="0.14.600" Import-Package: org.apache.log4j;version="1.2.26", org.osgi.service.event;version="[1.4.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF b/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF index 33ffdac6d71..4f6cbd5d94b 100644 --- a/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.xtend.m2e;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.m2e.core;bundle-version="2.6.0";resolution:=optional, +Require-Bundle: org.eclipse.m2e.core;bundle-version="2.7.600";resolution:=optional, org.eclipse.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.builder;bundle-version="2.43.0", org.eclipse.xtend.core;bundle-version="2.43.0", - org.eclipse.m2e.maven.runtime;bundle-version="3.9.600";resolution:=optional + org.eclipse.m2e.maven.runtime;bundle-version="3.9.1101";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.xtend.m2e;version="2.43.0";x-internal:=true Import-Package: org.apache.maven.plugin;provider=m2e;resolution:=optional diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF index d6823d2e262..402dea22930 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -7,23 +7,23 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: Eclipse Xtext Bundle-ClassPath: . Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.25.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.25.0", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.core.resources;bundle-version="3.20.100", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.core.resources;bundle-version="3.23.100", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtend.ide.tests;bundle-version="2.43.0", org.junit, - org.eclipse.emf.mwe.utils;bundle-version="1.15.0", - org.eclipse.ui.editors;bundle-version="3.17.200", + org.eclipse.emf.mwe.utils;bundle-version="1.19.0", + org.eclipse.ui.editors;bundle-version="3.20.200", org.eclipse.xtext.builder;bundle-version="2.43.0", - org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional, org.eclipse.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.ui.testing;bundle-version="2.43.0", org.eclipse.xtend.core.tests;bundle-version="2.43.0", org.eclipse.xtend.core;bundle-version="2.43.0", org.eclipse.xtext.testing;bundle-version="2.43.0", org.eclipse.xtext.java;bundle-version="2.43.0", - org.eclipse.ui.ide;bundle-version="3.22.100" + org.eclipse.ui.ide;bundle-version="3.22.800" Automatic-Module-Name: org.eclipse.xtend.performance.tests diff --git a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF index 9be71a4b9a9..7e773f9d545 100644 --- a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Bundle-Vendor: Eclipse Xtext Bundle-Version: 2.43.0.qualifier Require-Bundle: org.eclipse.xtend.core;bundle-version="2.43.0";visibility:=reexport, com.google.inject;bundle-version="7.0.0";visibility:=reexport, - org.eclipse.jdt.core;bundle-version="3.37.0";visibility:=reexport, + org.eclipse.jdt.core;bundle-version="3.44.0";visibility:=reexport, org.eclipse.emf.codegen;bundle-version="2.23.0";visibility:=reexport Import-Package: org.apache.log4j;version="1.2.26" diff --git a/org.eclipse.xtext.activities/META-INF/MANIFEST.MF b/org.eclipse.xtext.activities/META-INF/MANIFEST.MF index 2870ec66de0..a0b68ec62c6 100644 --- a/org.eclipse.xtext.activities/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.activities/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Localization: plugin Bundle-Activator: org.eclipse.xtext.activities.Activator -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0" +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100" Export-Package: org.eclipse.xtext.activities;version="2.43.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.activities diff --git a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF index 18835ff450a..6edc0b74317 100644 --- a/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF @@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.common.types;bundle-version="2.43.0", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional, org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.equinox.common;bundle-version="3.19.0" + org.eclipse.core.runtime;bundle-version="3.34.100", + org.eclipse.equinox.common;bundle-version="3.20.300" Export-Package: org.eclipse.xtext.builder.standalone;version="2.43.0";x-friends:="org.eclipse.xtext.builder.standalone.tests,org.eclipse.xtext.builder.tests", org.eclipse.xtext.builder.standalone.compiler;version="2.43.0";x-friends:="org.eclipse.xtext.builder.standalone.tests,org.eclipse.xtext.builder.tests", org.eclipse.xtext.builder.standalone.incremental;version="2.43.0";x-friends:="org.eclipse.xtext.builder.tests,org.eclipse.xtext.builder.standalone.tests" diff --git a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF index 8ca59e8d2ad..b011c2e992c 100644 --- a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF @@ -10,18 +10,18 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional, org.eclipse.xtext.ui.shared;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ecore;bundle-version="2.43.0", - org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.ide;bundle-version="3.22.800", org.eclipse.xtext.builder.standalone;bundle-version="2.43.0", org.eclipse.xtext.common.types;bundle-version="2.43.0", org.eclipse.xtend.lib;bundle-version="2.43.0", org.eclipse.xtext.common.types.shared;bundle-version="2.43.0", - org.eclipse.pde.ui;bundle-version="3.15.100", + org.eclipse.pde.ui;bundle-version="3.16.300", org.eclipse.xtext.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.ui.ecore;bundle-version="2.43.0", org.eclipse.xtext.testlanguages;bundle-version="2.43.0", @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.ui.testing;bundle-version="2.43.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtext.common.types.eclipse.tests;bundle-version="2.43.0" Import-Package: org.apache.log4j;version="1.2.26", org.eclipse.xtext.tests;version="2.43.0", diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF index 727a25dfd30..8c35208e96b 100644 --- a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF @@ -47,22 +47,22 @@ Export-Package: org.eclipse.xtext.builder;version="2.43.0", org.eclipse.xtext.builder.trace.util;version="2.43.0";x-internal:=true Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, - org.eclipse.core.resources;bundle-version="3.20.100";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jface;bundle-version="3.33.0";resolution:=optional;x-installation:=greedy, - org.eclipse.ui;bundle-version="3.205.100";resolution:=optional;x-installation:=greedy, + org.eclipse.core.resources;bundle-version="3.23.100";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy, + org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional;x-installation:=greedy, + org.eclipse.jface;bundle-version="3.38.100";resolution:=optional;x-installation:=greedy, + org.eclipse.ui;bundle-version="3.207.400";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.ide;bundle-version="3.22.800";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.ui;bundle-version="2.43.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.launching;bundle-version="3.21.100";resolution:=optional;x-installation:=greedy, - org.eclipse.ui.forms;bundle-version="3.13.200";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.launching;bundle-version="3.24.0";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.forms;bundle-version="3.13.700";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0";visibility:=reexport, org.eclipse.emf.ecore.editor;bundle-version="2.18.0";resolution:=optional;x-installation:=greedy, - org.eclipse.debug.core;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy, - org.eclipse.debug.ui;bundle-version="3.18.300";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.jdt.debug;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy, - org.eclipse.ui.console;bundle-version="3.14.0", + org.eclipse.debug.core;bundle-version="3.23.200";resolution:=optional;x-installation:=greedy, + org.eclipse.debug.ui;bundle-version="3.19.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.jdt.debug;bundle-version="3.25.0";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.console;bundle-version="3.15.0", org.eclipse.xtext.smap;bundle-version="2.43.0" Bundle-ActivationPolicy: lazy Import-Package: org.apache.log4j;version="1.2.26" diff --git a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF index 0a4a89a0d06..3f223b1d6ea 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF @@ -8,30 +8,30 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.43.0", org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.25.0", org.eclipse.xtext;bundle-version="2.43.0", - org.eclipse.core.resources;bundle-version="3.20.100", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.jdt.launching;bundle-version="3.21.100", + org.eclipse.core.resources;bundle-version="3.23.100", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.core.runtime;bundle-version="3.34.100", + org.eclipse.jdt.launching;bundle-version="3.24.0", org.eclipse.xtext.common.types.ui;bundle-version="2.43.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.jdt.ui;bundle-version="3.32.0", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.jdt.ui;bundle-version="3.36.0", org.eclipse.xtext.builder;bundle-version="2.43.0", org.hamcrest.core;bundle-version="2.2.0", - org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.ide;bundle-version="3.22.800", org.eclipse.xtext.common.types.shared;bundle-version="2.43.0", org.eclipse.xtext.ui.testing;bundle-version="2.43.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional, - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtext.xbase.testing;bundle-version="2.43.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.43.0" Export-Package: org.eclipse.xtext.common.types.access;version="2.43.0", diff --git a/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF index d3d6a522c2d..e355fa3d87e 100644 --- a/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.edit/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Export-Package: org.eclipse.xtext.common.types.provider;version="2.43.0" Bundle-Activator: org.eclipse.xtext.common.types.provider.TypesEditPlugin$Implementation Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.43.0", org.eclipse.emf.edit;bundle-version="2.21.0", - org.eclipse.core.runtime;bundle-version="3.31.0" + org.eclipse.core.runtime;bundle-version="3.34.100" Automatic-Module-Name: org.eclipse.xtext.common.types.edit diff --git a/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF index de09c3b0f86..c5a3a96c5d2 100644 --- a/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-Localization: fragment Fragment-Host: org.eclipse.xtext.common.types.shared Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext.xbase.ui;bundle-version="2.43.0", - org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional, - org.eclipse.jdt.ui;bundle-version="3.32.0";resolution:=optional + org.eclipse.ui.ide;bundle-version="3.22.800";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="3.36.0";resolution:=optional Bundle-Vendor: %providerName Import-Package: org.apache.log4j;version="1.2.26", org.eclipse.ui.ide diff --git a/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF index 22ed85b76ac..bac8b9e16d5 100644 --- a/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.shared/META-INF/MANIFEST.MF @@ -6,16 +6,16 @@ Bundle-SymbolicName: org.eclipse.xtext.common.types.shared;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Activator: org.eclipse.xtext.common.types.shared.Activator Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext.common.types;bundle-version="2.43.0", org.eclipse.xtext.common.types.ui;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", org.eclipse.xtext.builder;bundle-version="2.43.0", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.debug.core;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy, - org.eclipse.debug.ui;bundle-version="3.18.300";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.debug;bundle-version="3.21.300";resolution:=optional;x-installation:=greedy + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.debug.core;bundle-version="3.23.200";resolution:=optional;x-installation:=greedy, + org.eclipse.debug.ui;bundle-version="3.19.100";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.debug;bundle-version="3.25.0";resolution:=optional;x-installation:=greedy Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.common.types.shared;version="2.43.0";x-internal:=true diff --git a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF index 3a2cc1005da..83efc9a0632 100644 --- a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -5,20 +5,20 @@ Bundle-Vendor: %providerName Bundle-Version: 2.43.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.common.types.ui Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.43.0";visibility:=reexport, - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.jdt.core;bundle-version="3.44.0", org.eclipse.xtext;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.core.resources;bundle-version="3.20.100", + org.eclipse.core.runtime;bundle-version="3.34.100", + org.eclipse.core.resources;bundle-version="3.23.100", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.jdt.ui;bundle-version="3.32.0", - org.eclipse.search;bundle-version="3.16.100", - org.eclipse.ltk.ui.refactoring;bundle-version="3.13.300", - org.eclipse.jdt.core.manipulation;bundle-version="1.21.0", + org.eclipse.jdt.ui;bundle-version="3.36.0", + org.eclipse.search;bundle-version="3.17.400", + org.eclipse.ltk.ui.refactoring;bundle-version="3.13.700", + org.eclipse.jdt.core.manipulation;bundle-version="1.23.200", org.eclipse.xtext.smap;bundle-version="2.43.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.edit;bundle-version="2.43.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional + org.eclipse.ui.ide;bundle-version="3.22.800";resolution:=optional Import-Package: org.apache.log4j;version="1.2.26" Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.xtext.common.types.access.jdt;version="2.43.0", diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 68e44245781..1def94f4b43 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -130,7 +130,7 @@ 2.25.0 1.19.0 1.0.0 - 3.37.0 + 3.44.0 ISO-8859-1 @@ -283,12 +283,12 @@ org.eclipse.jdt org.eclipse.jdt.debug - 3.21.300 + 3.25.0 org.eclipse.jdt org.eclipse.jdt.launching - 3.21.100 + 3.24.0 org.eclipse.lsp4j @@ -328,77 +328,77 @@ org.eclipse.platform org.eclipse.core.commands - 3.12.0 + 3.12.500 org.eclipse.platform org.eclipse.core.contenttype - 3.9.300 + 3.9.800 org.eclipse.platform org.eclipse.core.expressions - 3.9.300 + 3.9.500 org.eclipse.platform org.eclipse.core.filesystem - 1.10.300 + 1.11.400 org.eclipse.platform org.eclipse.core.jobs - 3.15.200 + 3.15.700 org.eclipse.platform org.eclipse.core.resources - 3.20.100 + 3.23.100 org.eclipse.platform org.eclipse.core.runtime - 3.31.0 + 3.34.100 org.eclipse.platform org.eclipse.core.variables - 3.6.300 + 3.6.700 org.eclipse.platform org.eclipse.debug.core - 3.21.300 + 3.23.200 org.eclipse.platform org.eclipse.equinox.app - 1.7.0 + 1.7.500 org.eclipse.platform org.eclipse.equinox.common - 3.19.0 + 3.20.300 org.eclipse.platform org.eclipse.equinox.preferences - 3.11.0 + 3.12.100 org.eclipse.platform org.eclipse.equinox.registry - 3.12.0 + 3.12.600 org.eclipse.platform org.eclipse.osgi - 3.19.0 + 3.24.0 org.eclipse.platform org.eclipse.text - 3.14.0 + 3.14.500 org.eclipse.xtext @@ -519,28 +519,6 @@ - - - java-25 - - - java-25 - - - - - 3.44.0 - - diff --git a/org.eclipse.xtext.doc/META-INF/MANIFEST.MF b/org.eclipse.xtext.doc/META-INF/MANIFEST.MF index 2fb819aa8fa..ba09ef7394e 100644 --- a/org.eclipse.xtext.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.doc/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.doc;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.help;bundle-version="3.10.300" +Require-Bundle: org.eclipse.help;bundle-version="3.10.600" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF index 0bd5d2af1d1..bcc375669db 100644 --- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF @@ -9,14 +9,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.common;bundle-version="2.30.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.25.0", org.eclipse.xtext.ecore;bundle-version="2.43.0", org.eclipse.xtext.testlanguages;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.hamcrest.core;bundle-version="2.2.0", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.xtext.wizard;bundle-version="2.43.0" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF index 985465d6186..0e31aeb4dec 100644 --- a/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ecore/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Xtext Ecore Support Bundle-SymbolicName: org.eclipse.xtext.ecore;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Vendor: Eclipse Xtext -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext;bundle-version="2.43.0";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF index 077ffdfcd2a..b16f4d3eb2e 100644 --- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Export-Package: org.eclipse.xtext.enumrules;version="2.43.0", Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.equinox.common;bundle-version="3.19.0", + org.eclipse.equinox.common;bundle-version="3.20.300", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.common.types;bundle-version="2.43.0", org.eclipse.xtext.ecore;bundle-version="2.43.0", @@ -38,7 +38,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xtext.generator;bundle-version="2.43.0", org.junit;bundle-version="4.13.2", org.eclipse.xtext.xbase;bundle-version="2.43.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.21.0";resolution:=optional + org.eclipse.emf.mwe2.lib;bundle-version="2.25.0";resolution:=optional Import-Package: org.apache.log4j, org.junit;version="4.13.2", org.junit.rules;version="4.13.2", diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF index 5d7f5e234a1..2453500a143 100644 --- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF @@ -11,14 +11,14 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.testing;bundle-version="2.43.0", org.eclipse.xtext.xtext.generator;bundle-version="2.43.0", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext.ide;bundle-version="2.43.0", org.junit;bundle-version="4.13.2", org.eclipse.lsp4j;bundle-version="[1.0.0,1.1.0)";resolution:=optional, org.eclipse.lsp4j.jsonrpc;bundle-version="[1.0.0,1.1.0)";resolution:=optional, org.eclipse.xtext.testlanguages;bundle-version="2.43.0", org.eclipse.xtext.testlanguages.ide;bundle-version="2.43.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.25.0", org.aopalliance;bundle-version="1.0.0", com.google.gson;bundle-version="2.10.1" Import-Package: org.apache.log4j;version="1.2.26" diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index 15ae095f65d..c90af60550f 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.43.0", org.eclipse.xtext.util;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, - org.eclipse.equinox.common;bundle-version="3.19.0", + org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional;x-installation:=greedy, + org.eclipse.equinox.common;bundle-version="3.20.300", org.eclipse.lsp4j;bundle-version="[1.0.0,1.1.0)";resolution:=optional, org.eclipse.lsp4j.jsonrpc;bundle-version="[1.0.0,1.1.0)";resolution:=optional, org.eclipse.emf.ecore.change;bundle-version="2.16.0" diff --git a/org.eclipse.xtext.java/META-INF/MANIFEST.MF b/org.eclipse.xtext.java/META-INF/MANIFEST.MF index 474d0b01bab..b8efe7e92a8 100644 --- a/org.eclipse.xtext.java/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.java/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.common.types;bundle-version="2.43.0", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.jdt.core;bundle-version="3.44.0", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.jdt.facade;bundle-version="2.43.0" diff --git a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF index 9c77a73fa02..df5e91b94c8 100644 --- a/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.jdt.facade/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.jdt.facade Bundle-Version: 2.43.0.qualifier Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-21 -Require-Bundle: org.eclipse.jdt.core;bundle-version="3.37.0" +Require-Bundle: org.eclipse.jdt.core;bundle-version="3.44.0" Export-Package: org.eclipse.xtext.jdt.facade;version="2.43.0";x-friends:="org.eclipse.xtext.java" Import-Package: org.apache.log4j;version="1.2.26" Automatic-Module-Name: org.eclipse.xtext.jdt.facade diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index 34b6a587a4c..b2960b09ddc 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -7,20 +7,20 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", - org.eclipse.emf.mwe.utils;bundle-version="1.15.0", + org.eclipse.emf.mwe.utils;bundle-version="1.19.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.common;bundle-version="2.30.0", - org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.xtext.generator;bundle-version="2.43.0", - org.eclipse.emf.mwe.core;bundle-version="1.15.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", + org.eclipse.emf.mwe.core;bundle-version="1.19.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.25.0", org.junit;bundle-version="4.13.2", org.aopalliance;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.logging/META-INF/MANIFEST.MF b/org.eclipse.xtext.logging/META-INF/MANIFEST.MF index 0c580a83b4a..5e7559627f9 100644 --- a/org.eclipse.xtext.logging/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.logging/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.xtext.logging;singleton:=true Bundle-Vendor: %providerName Bundle-Version: 2.43.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 -Import-Package: org.eclipse.core.runtime;bundle-version="3.31.0", +Import-Package: org.eclipse.core.runtime;bundle-version="3.34.100", org.osgi.framework;version="1.5.0" Export-Package: org.eclipse.xtext.logging;version="2.43.0";x-internal:=true Automatic-Module-Name: org.eclipse.xtext.logging diff --git a/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF b/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF index 2ca430dc9fd..57d96f04f9c 100644 --- a/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-SymbolicName: org.eclipse.xtext.m2e;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.m2e.core;bundle-version="2.6.0";resolution:=optional, +Require-Bundle: org.eclipse.m2e.core;bundle-version="2.7.600";resolution:=optional, org.eclipse.xtend.lib;bundle-version="2.43.0", org.eclipse.xtext.builder;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.m2e.maven.runtime;bundle-version="3.9.600";resolution:=optional, - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional + org.eclipse.m2e.maven.runtime;bundle-version="3.9.1101";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.xtext.m2e;version="2.43.0";x-internal:=true Import-Package: org.apache.maven.plugin;provider=m2e;resolution:=optional diff --git a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF index ffd0823ec05..b22fb96ba8a 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-SymbolicName: org.eclipse.xtext.purexbase.eclipse.tests;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.43.0", org.eclipse.xtext.purexbase.ui;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext;bundle-version="2.43.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder;bundle-version="2.43.0", - org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.jdt.core;bundle-version="3.44.0", org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.testing;bundle-version="2.43.0", diff --git a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF index f862da95e1b..c657bb553ab 100644 --- a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-Version: 2.43.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.purexbase.tests;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.testing;bundle-version="2.43.0", - org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.jdt.core;bundle-version="3.44.0", org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.xbase.testing;bundle-version="2.43.0", diff --git a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF index c2e9d1ae22b..33581638dd6 100644 --- a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF @@ -8,19 +8,19 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.purexbase.ide;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui.ide;bundle-version="3.22.800", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.xtext.builder;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.common.types.ui;bundle-version="2.43.0", org.eclipse.xtext.xbase.ui;bundle-version="2.43.0", - org.eclipse.jdt.core;bundle-version="3.37.0", + org.eclipse.jdt.core;bundle-version="3.44.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.jdt.debug.ui;bundle-version="3.13.300", + org.eclipse.jdt.debug.ui;bundle-version="3.15.200", org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional Import-Package: org.apache.log4j;version="1.2.26", org.apache.commons.logging diff --git a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF index c82a704d204..c0a07ffe6b3 100644 --- a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.xtext.purexbase; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.xbase;bundle-version="2.43.0", - org.eclipse.equinox.common;bundle-version="3.19.0", + org.eclipse.equinox.common;bundle-version="3.20.300", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", diff --git a/org.eclipse.xtext.relengutil/.project b/org.eclipse.xtext.relengutil/.project index 99990bbb7e2..79d1206181e 100644 --- a/org.eclipse.xtext.relengutil/.project +++ b/org.eclipse.xtext.relengutil/.project @@ -37,4 +37,15 @@ org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature + + + 1773083988367 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF b/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF index f41a6dcd2f1..25008847fbf 100644 --- a/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.43.0.qualifier Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext.util;bundle-version="2.43.0", - org.eclipse.m2e.maven.runtime;bundle-version="3.9.600", + org.eclipse.m2e.maven.runtime;bundle-version="3.9.1101", org.eclipse.xtext.xtext.generator.dependencies;bundle-version="2.43.0", org.eclipse.xtext.purexbase;bundle-version="2.43.0", org.eclipse.xtext.xtext.bootstrap;bundle-version="2.43.0", diff --git a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java index 519bb386e85..c44bc86d0f7 100644 --- a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java +++ b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java @@ -13,6 +13,7 @@ import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +//import java.nio.file.Files; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -83,6 +84,35 @@ public String put(String key, String value) { } } } + + // Also process examples/projects subdirectories +// File examplesDir = new File(gitRoot, "org.eclipse.xtext.xtext.ui.examples/projects"); +// if (examplesDir.exists()) { +// Files.walk(examplesDir.toPath()) +// .filter(p -> p.endsWith("META-INF/MANIFEST.MF")) +// .forEach(path -> { +// File manifest = path.toFile(); +// MergeableManifest2 mergable; +// try (FileInputStream is = new FileInputStream(manifest)) { +// mergable = new MergeableManifest2(is); +// } catch (IOException e) { +// throw new RuntimeException(e); +// } +// mergable.getMainAttributes().put(MergeableManifest2.BUNDLE_VERSION, newVersion + ".qualifier"); +// updateRequiredXtextBundles(mergable, newVersion); +// updateImportedXtextPackages(mergable, newVersion); +// updateExportedXtextPackages(mergable, newVersion); +// updateRequiredBundle(mergable, versionsFromDevBom); +// +// if (mergable.isModified()) { +// try (FileOutputStream out = new FileOutputStream(manifest)) { +// mergable.write(out); +// } catch (IOException e) { +// throw new RuntimeException(e); +// } +// } +// }); +// } } catch (Exception e) { e.printStackTrace(); throw e; @@ -97,23 +127,23 @@ private static void addMissingVersions(Map bundleToVersion) { bundleToVersion.put("org.eclipse.lsp4j", LSP4J_VERSION); bundleToVersion.put("org.eclipse.lsp4j.jsonrpc", LSP4J_VERSION); - bundleToVersion.put("org.eclipse.jdt.core", "3.37.0"); - bundleToVersion.put("org.eclipse.jdt.core.manipulation", "1.21.0"); - bundleToVersion.put("org.eclipse.jdt.debug", "3.21.300"); - bundleToVersion.put("org.eclipse.jdt.debug.ui", "3.13.300"); - bundleToVersion.put("org.eclipse.jdt.junit", "3.16.300"); - bundleToVersion.put("org.eclipse.jdt.launching", "3.21.100"); - bundleToVersion.put("org.eclipse.jdt.ui", "3.32.0"); + bundleToVersion.put("org.eclipse.jdt.core", "3.44.0"); + bundleToVersion.put("org.eclipse.jdt.core.manipulation", "1.23.200"); + bundleToVersion.put("org.eclipse.jdt.debug", "3.25.0"); + bundleToVersion.put("org.eclipse.jdt.debug.ui", "3.15.200"); + bundleToVersion.put("org.eclipse.jdt.junit", "3.17.300"); + bundleToVersion.put("org.eclipse.jdt.launching", "3.24.0"); + bundleToVersion.put("org.eclipse.jdt.ui", "3.36.0"); - bundleToVersion.put("org.eclipse.ui", "3.205.100"); - bundleToVersion.put("org.eclipse.ui.console", "3.14.0"); - bundleToVersion.put("org.eclipse.ui.editors", "3.17.200"); - bundleToVersion.put("org.eclipse.ui.forms", "3.13.200"); - bundleToVersion.put("org.eclipse.ui.ide", "3.22.100"); - bundleToVersion.put("org.eclipse.ui.navigator", "3.12.300"); - bundleToVersion.put("org.eclipse.ui.views", "3.12.200"); - bundleToVersion.put("org.eclipse.ui.workbench", "3.131.100"); - bundleToVersion.put("org.eclipse.ui.workbench.texteditor", "3.17.300"); + bundleToVersion.put("org.eclipse.ui", "3.207.400"); + bundleToVersion.put("org.eclipse.ui.console", "3.15.0"); + bundleToVersion.put("org.eclipse.ui.editors", "3.20.200"); + bundleToVersion.put("org.eclipse.ui.forms", "3.13.700"); + bundleToVersion.put("org.eclipse.ui.ide", "3.22.800"); + bundleToVersion.put("org.eclipse.ui.navigator", "3.13.300"); + bundleToVersion.put("org.eclipse.ui.views", "3.12.800"); + bundleToVersion.put("org.eclipse.ui.workbench", "3.137.0"); + bundleToVersion.put("org.eclipse.ui.workbench.texteditor", "3.19.400"); bundleToVersion.put("org.eclipse.swtbot.eclipse.core", "4.1.0"); bundleToVersion.put("org.eclipse.swtbot.eclipse.finder", "4.1.0"); @@ -123,23 +153,23 @@ private static void addMissingVersions(Map bundleToVersion) { bundleToVersion.put("org.apache.ant", "1.10.14"); bundleToVersion.put("org.eclipse.buildship.core", "3.1.9"); - bundleToVersion.put("org.eclipse.compare", "3.10.0"); - bundleToVersion.put("org.eclipse.e4.core.services", "2.4.300"); - bundleToVersion.put("org.eclipse.e4.ui.css.swt.theme", "0.14.300"); + bundleToVersion.put("org.eclipse.compare", "3.11.600"); + bundleToVersion.put("org.eclipse.e4.core.services", "2.5.300"); + bundleToVersion.put("org.eclipse.e4.ui.css.swt.theme", "0.14.600"); bundleToVersion.put("jakarta.inject.jakarta.inject-api", "2.0.1"); - bundleToVersion.put("org.eclipse.core.databinding", "1.13.200"); - bundleToVersion.put("org.eclipse.core.databinding.beans", "1.10.200"); - bundleToVersion.put("org.eclipse.core.databinding.property", "1.10.200"); + bundleToVersion.put("org.eclipse.core.databinding", "1.13.700"); + bundleToVersion.put("org.eclipse.core.databinding.beans", "1.10.500"); + bundleToVersion.put("org.eclipse.core.databinding.property", "1.10.500"); - bundleToVersion.put("org.eclipse.core.expressions", "3.9.300"); - bundleToVersion.put("org.eclipse.core.filesystem", "1.10.300"); - bundleToVersion.put("org.eclipse.core.resources", "3.20.100"); - bundleToVersion.put("org.eclipse.core.runtime", "3.31.0"); - bundleToVersion.put("org.eclipse.debug.core", "3.21.300"); - bundleToVersion.put("org.eclipse.debug.ui", "3.18.300"); - bundleToVersion.put("org.eclipse.draw2d", "3.15.0"); + bundleToVersion.put("org.eclipse.core.expressions", "3.9.500"); + bundleToVersion.put("org.eclipse.core.filesystem", "1.11.400"); + bundleToVersion.put("org.eclipse.core.resources", "3.23.100"); + bundleToVersion.put("org.eclipse.core.runtime", "3.34.100"); + bundleToVersion.put("org.eclipse.debug.core", "3.23.200"); + bundleToVersion.put("org.eclipse.debug.ui", "3.19.100"); + bundleToVersion.put("org.eclipse.draw2d", "3.21.0"); bundleToVersion.put("org.eclipse.emf.codegen", "2.23.0"); bundleToVersion.put("org.eclipse.emf.codegen.ecore", "2.37.0"); bundleToVersion.put("org.eclipse.emf.common", "2.30.0"); @@ -150,21 +180,21 @@ private static void addMissingVersions(Map bundleToVersion) { bundleToVersion.put("org.eclipse.emf.ecore.xmi", "2.37.0"); bundleToVersion.put("org.eclipse.emf.edit", "2.21.0"); bundleToVersion.put("org.eclipse.emf.edit.ui", "2.23.0"); - bundleToVersion.put("org.eclipse.equinox.common", "3.19.0"); - bundleToVersion.put("org.eclipse.help", "3.10.300"); - bundleToVersion.put("org.eclipse.jface", "3.33.0"); - bundleToVersion.put("org.eclipse.jface.databinding", "1.15.200"); - bundleToVersion.put("org.eclipse.jface.text", "3.25.0"); - bundleToVersion.put("org.eclipse.ltk.core.refactoring", "3.14.300"); - bundleToVersion.put("org.eclipse.ltk.ui.refactoring", "3.13.300"); - bundleToVersion.put("org.eclipse.m2e.core", "2.6.0"); - bundleToVersion.put("org.eclipse.m2e.maven.runtime", "3.9.600"); - bundleToVersion.put("org.eclipse.pde.core", "3.18.0"); - bundleToVersion.put("org.eclipse.pde.ui", "3.15.100"); - bundleToVersion.put("org.eclipse.search", "3.16.100"); + bundleToVersion.put("org.eclipse.equinox.common", "3.20.300"); + bundleToVersion.put("org.eclipse.help", "3.10.600"); + bundleToVersion.put("org.eclipse.jface", "3.38.100"); + bundleToVersion.put("org.eclipse.jface.databinding", "1.15.400"); + bundleToVersion.put("org.eclipse.jface.text", "3.29.0"); + bundleToVersion.put("org.eclipse.ltk.core.refactoring", "3.15.100"); + bundleToVersion.put("org.eclipse.ltk.ui.refactoring", "3.13.700"); + bundleToVersion.put("org.eclipse.m2e.core", "2.7.600"); + bundleToVersion.put("org.eclipse.m2e.maven.runtime", "3.9.1101"); + bundleToVersion.put("org.eclipse.pde.core", "3.21.100"); + bundleToVersion.put("org.eclipse.pde.ui", "3.16.300"); + bundleToVersion.put("org.eclipse.search", "3.17.400"); - bundleToVersion.put("org.eclipse.team.core", "3.10.300"); - bundleToVersion.put("org.eclipse.team.ui", "3.10.300"); + bundleToVersion.put("org.eclipse.team.core", "3.10.900"); + bundleToVersion.put("org.eclipse.team.ui", "3.11.300"); } @@ -231,7 +261,7 @@ private static void updateRequiredXtextBundles(MergeableManifest2 mergable, Stri List updatedBundles = new ArrayList<>(); for (BundleOrPackage requiredBundle : requiredBundles.list()) { String bundleName = requiredBundle.getName(); - if (bundleName.startsWith("org.eclipse.x")) { + if (bundleName.startsWith("org.eclipse.x") && !bundleName.startsWith("org.eclipse.xtext.example")) { updatedBundles.add(bundleName + ";bundle-version=\"" + newVersion + "\""); } } diff --git a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF index 0244d1bebf7..a1900ebf298 100644 --- a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF @@ -8,18 +8,18 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.testlanguages;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.testlanguages.ide;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui.ide;bundle-version="3.22.800", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.xtext.builder;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, + org.eclipse.core.runtime;bundle-version="3.34.100", + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional, org.eclipse.xtext.testing;bundle-version="2.43.0", org.eclipse.xtext.xbase.testing;bundle-version="2.43.0", org.eclipse.xtext.ui.testing;bundle-version="2.43.0" diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index 206fa773e03..a06f53f42f3 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -7,21 +7,21 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", - org.eclipse.emf.mwe.utils;bundle-version="1.15.0", + org.eclipse.emf.mwe.utils;bundle-version="1.19.0", org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport, org.eclipse.emf.common;bundle-version="2.30.0", - org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.xtext.generator;bundle-version="2.43.0", org.eclipse.xtext.xtext.wizard;bundle-version="2.43.0", - org.eclipse.emf.mwe.core;bundle-version="1.15.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", + org.eclipse.emf.mwe.core;bundle-version="1.19.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.25.0", org.junit;bundle-version="4.13.2", org.aopalliance;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target index 419ef616160..8d721993c96 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target index cbc6fb97ffc..ab7e2275f15 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target index 87a00932dd2..28a3c3b91af 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target index b43ffe75479..e401ce4b345 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target index cff2255b062..aaec1fbad4c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target index 032ff3b79af..80a1cf18017 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target @@ -9,7 +9,7 @@ - + diff --git a/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF index 741148fe4d0..d5a2a0cbedd 100644 --- a/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Xtext Automatic-Module-Name: org.eclipse.xtext.ui.codemining Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.xtext.ui.codemining;version="2.43.0";x-internal:=true -Require-Bundle: org.eclipse.equinox.common;bundle-version="3.19.0", +Require-Bundle: org.eclipse.equinox.common;bundle-version="3.20.300", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0" Import-Package: org.eclipse.jface.text, diff --git a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF index 8f2aa3ae605..2d08e106f85 100644 --- a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-Version: 2.43.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.43.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, + org.eclipse.core.runtime;bundle-version="3.34.100", + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.xbase.testing;bundle-version="2.43.0", org.eclipse.xtext.testing;bundle-version="2.43.0", diff --git a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF index 4abec85dd20..47aecb30dde 100644 --- a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF @@ -9,17 +9,17 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.ui.codetemplates.ide;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui.ide;bundle-version="3.22.800", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.xtext.builder;bundle-version="2.43.0", - org.eclipse.ui.workbench.texteditor;bundle-version="3.17.300", - org.eclipse.core.expressions;bundle-version="3.9.300", - org.eclipse.ui.navigator;bundle-version="3.12.300", + org.eclipse.ui.workbench.texteditor;bundle-version="3.19.400", + org.eclipse.core.expressions;bundle-version="3.9.500", + org.eclipse.ui.navigator;bundle-version="3.13.300", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.ide;bundle-version="2.43.0", - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0" Import-Package: org.apache.log4j;version="1.2.26" diff --git a/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF index 521f698b19e..48feeac1a95 100644 --- a/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.ecore/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Localization: plugin Bundle-Version: 2.43.0.qualifier Bundle-Activator: org.eclipse.xtext.ui.ecore.Activator Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.core.runtime;bundle-version="3.31.0", +Require-Bundle: org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.ecore;bundle-version="2.43.0";visibility:=reexport, diff --git a/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF index e8154c4baa5..627196b4db6 100644 --- a/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.shared/META-INF/MANIFEST.MF @@ -8,11 +8,11 @@ Bundle-Activator: org.eclipse.xtext.ui.shared.internal.Activator Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.43.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder;bundle-version="2.43.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.ui;bundle-version="3.32.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.ui;bundle-version="3.36.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.ui;bundle-version="2.43.0";resolution:=optional;x-installation:=greedy, - org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional;x-installation:=greedy, - org.eclipse.core.expressions;bundle-version="3.9.300" + org.eclipse.ui.ide;bundle-version="3.22.800";resolution:=optional;x-installation:=greedy, + org.eclipse.core.expressions;bundle-version="3.9.500" Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.ui.shared;version="2.43.0", diff --git a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF index fe17f6ac6c8..b891162c04f 100644 --- a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF @@ -20,16 +20,16 @@ Import-Package: org.apache.log4j;version="1.2.26";resolution:=optional, org.junit.runners.model;version="4.13.2" Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, - org.eclipse.ui.ide;bundle-version="3.22.100";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.ui;bundle-version="3.32.0";resolution:=optional, - org.eclipse.jdt.launching;bundle-version="3.21.100";resolution:=optional;x-installation:=greedy, + org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.ide;bundle-version="3.22.800";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.ui;bundle-version="3.36.0";resolution:=optional, + org.eclipse.jdt.launching;bundle-version="3.24.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder.standalone;bundle-version="2.43.0", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";resolution:=optional, - org.eclipse.pde.core;bundle-version="3.18.0";resolution:=optional, + org.eclipse.pde.core;bundle-version="3.21.100";resolution:=optional, org.eclipse.xtext.common.types.ui;bundle-version="2.43.0";resolution:=optional, - org.eclipse.core.filesystem;bundle-version="1.10.300", + org.eclipse.core.filesystem;bundle-version="1.11.400", org.eclipse.xtext.builder;bundle-version="2.43.0";resolution:=optional, org.eclipse.xtext.testing;bundle-version="2.43.0" Automatic-Module-Name: org.eclipse.xtext.ui.testing diff --git a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF index aec459011c0..154e5c3eea8 100644 --- a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF @@ -5,28 +5,28 @@ Bundle-SymbolicName: org.eclipse.xtext.ui.tests;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.core.filesystem;bundle-version="1.10.300", - org.eclipse.ui.workbench.texteditor;bundle-version="3.17.300", - org.eclipse.ui.ide;bundle-version="3.22.100", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.jdt.launching;bundle-version="3.21.100", + org.eclipse.core.filesystem;bundle-version="1.11.400", + org.eclipse.ui.workbench.texteditor;bundle-version="3.19.400", + org.eclipse.ui.ide;bundle-version="3.22.800", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.jdt.launching;bundle-version="3.24.0", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.testing;bundle-version="2.43.0", org.eclipse.xtext.xtext.ui;bundle-version="2.43.0", org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.common;bundle-version="2.30.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.xtext.builder;bundle-version="2.43.0", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", org.eclipse.xtext.ui.ecore;bundle-version="2.43.0", org.eclipse.xtext.testlanguages.ui;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.junit;bundle-version="4.13.2";resolution:=optional, - org.eclipse.core.expressions;bundle-version="3.9.300", + org.eclipse.core.expressions;bundle-version="3.9.500", org.eclipse.xtext.ui.testing;bundle-version="2.43.0", org.eclipse.xtext.common.types.ui;bundle-version="2.43.0";resolution:=optional, - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0" Bundle-Activator: org.eclipse.xtext.ui.tests.internal.TestsActivator Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui/META-INF/MANIFEST.MF index 0578e9ff237..3462e0164d3 100644 --- a/org.eclipse.xtext.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui/META-INF/MANIFEST.MF @@ -4,30 +4,30 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.ui;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0";visibility:=reexport, - org.eclipse.core.resources;bundle-version="3.20.100";visibility:=reexport, - org.eclipse.ui;bundle-version="3.205.100";visibility:=reexport, - org.eclipse.ui.editors;bundle-version="3.17.200";visibility:=reexport, - org.eclipse.jface.text;bundle-version="3.25.0";visibility:=reexport, - org.eclipse.ui.ide;bundle-version="3.22.100", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100";visibility:=reexport, + org.eclipse.core.resources;bundle-version="3.23.100";visibility:=reexport, + org.eclipse.ui;bundle-version="3.207.400";visibility:=reexport, + org.eclipse.ui.editors;bundle-version="3.20.200";visibility:=reexport, + org.eclipse.jface.text;bundle-version="3.29.0";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="3.22.800", org.eclipse.xtext;bundle-version="2.43.0";visibility:=reexport, - org.eclipse.ui.views;bundle-version="3.12.200", + org.eclipse.ui.views;bundle-version="3.12.800", org.eclipse.emf.edit.ui;bundle-version="2.23.0";visibility:=reexport, - org.eclipse.ui.workbench.texteditor;bundle-version="3.17.300", - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.core.expressions;bundle-version="3.9.300", - org.eclipse.search;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy, - org.eclipse.ltk.core.refactoring;bundle-version="3.14.300";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.ltk.ui.refactoring;bundle-version="3.13.300";resolution:=optional;x-installation:=greedy, - org.eclipse.compare;bundle-version="3.10.0";resolution:=optional;x-installation:=greedy, - org.eclipse.team.core;bundle-version="3.10.300";resolution:=optional;x-installation:=greedy, - org.eclipse.team.ui;bundle-version="3.10.300";resolution:=optional;x-installation:=greedy, - org.eclipse.core.filesystem;bundle-version="1.10.300";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.launching;bundle-version="3.21.100";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.workbench.texteditor;bundle-version="3.19.400", + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy, + org.eclipse.core.expressions;bundle-version="3.9.500", + org.eclipse.search;bundle-version="3.17.400";resolution:=optional;x-installation:=greedy, + org.eclipse.ltk.core.refactoring;bundle-version="3.15.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.ltk.ui.refactoring;bundle-version="3.13.700";resolution:=optional;x-installation:=greedy, + org.eclipse.compare;bundle-version="3.11.600";resolution:=optional;x-installation:=greedy, + org.eclipse.team.core;bundle-version="3.10.900";resolution:=optional;x-installation:=greedy, + org.eclipse.team.ui;bundle-version="3.11.300";resolution:=optional;x-installation:=greedy, + org.eclipse.core.filesystem;bundle-version="1.11.400";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.launching;bundle-version="3.24.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.ui.forms;bundle-version="3.13.200", + org.eclipse.ui.forms;bundle-version="3.13.700", org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.jdt.ui;bundle-version="3.32.0";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="3.36.0";resolution:=optional, org.eclipse.xtext.ide;bundle-version="2.43.0";visibility:=reexport Bundle-Activator: org.eclipse.xtext.ui.internal.Activator Export-Package: org.eclipse.xtext.common.ui.contentassist;version="2.43.0", diff --git a/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF index a89fe573d66..c4d208cb107 100644 --- a/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF @@ -8,10 +8,10 @@ Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reexport, - org.eclipse.jdt.core;bundle-version="3.37.0";visibility:=reexport, + org.eclipse.jdt.core;bundle-version="3.44.0";visibility:=reexport, org.junit;bundle-version="4.13.2", org.eclipse.xtext.testing;bundle-version="2.43.0";visibility:=reexport, - org.eclipse.core.runtime;bundle-version="3.31.0" + org.eclipse.core.runtime;bundle-version="3.34.100" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.xbase.testing;version="2.43.0", org.eclipse.xtext.xbase.testing.evaluation;version="2.43.0";x-friends:="org.eclipse.xtext.xbase.tests,org.eclipse.xtext.purexbase.tests,org.eclipse.xtend.core.tests", diff --git a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF index 9d7f71bb451..7f9db4352f5 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF @@ -7,20 +7,20 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.testlanguages.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.xbase.testlanguages;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.xbase.testlanguages.ide;bundle-version="2.43.0", - org.eclipse.jdt.debug.ui;bundle-version="3.13.300", + org.eclipse.jdt.debug.ui;bundle-version="3.15.200", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui.ide;bundle-version="3.22.800", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", org.eclipse.xtext.xbase.ui;bundle-version="2.43.0", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.xtext.builder;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.common.types.ui;bundle-version="2.43.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", - org.eclipse.compare;bundle-version="3.10.0", - org.eclipse.core.runtime;bundle-version="3.31.0", - org.eclipse.ui.workbench;bundle-version="3.131.100";resolution:=optional, + org.eclipse.compare;bundle-version="3.11.600", + org.eclipse.core.runtime;bundle-version="3.34.100", + org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional, org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF index 9601f211132..15b620da846 100644 --- a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.43.0", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", org.hamcrest.core;bundle-version="2.2.0", org.eclipse.xtext.xbase.testlanguages;bundle-version="2.43.0", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext.xbase.testdata;bundle-version="2.43.0", org.eclipse.xtext.xbase.ide;bundle-version="2.43.0", org.junit;bundle-version="4.13.2" diff --git a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF index 23c7e8acd02..c1941d4ee05 100644 --- a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-Version: 2.43.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.43.0";visibility:=reexport, - org.eclipse.core.resources;bundle-version="3.20.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.core.resources;bundle-version="3.23.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.ui;bundle-version="2.43.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.xbase.ui;bundle-version="2.43.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, + org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.ui;bundle-version="2.43.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.ui.testing;bundle-version="2.43.0" Export-Package: org.eclipse.xtext.xbase.ui.testing;version="2.43.0";x-friends:="org.eclipse.xtext.xbase.ui.tests" diff --git a/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF index d9aed2bd46b..5df380d448a 100644 --- a/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.tests/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.ui.workbench;bundle-version="3.131.100", - org.eclipse.core.resources;bundle-version="3.20.100", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.ui.ide;bundle-version="3.22.100", - org.eclipse.core.runtime;bundle-version="3.31.0", + org.eclipse.ui.workbench;bundle-version="3.137.0", + org.eclipse.core.resources;bundle-version="3.23.100", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.ui.ide;bundle-version="3.22.800", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.xbase;bundle-version="2.43.0", org.eclipse.xtext.xbase.ui;bundle-version="2.43.0", diff --git a/org.eclipse.xtext.xbase.ui.tests/src/org/eclipse/xtext/xbase/ui/tests/JavaVersionExtendedTest.java b/org.eclipse.xtext.xbase.ui.tests/src/org/eclipse/xtext/xbase/ui/tests/JavaVersionExtendedTest.java index 3f950946324..02c5ec32386 100644 --- a/org.eclipse.xtext.xbase.ui.tests/src/org/eclipse/xtext/xbase/ui/tests/JavaVersionExtendedTest.java +++ b/org.eclipse.xtext.xbase.ui.tests/src/org/eclipse/xtext/xbase/ui/tests/JavaVersionExtendedTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2022 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2018, 2026 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -27,12 +27,9 @@ public void testToJdtClassFileConstant() { assertEquals(ClassFileConstants.JDK11, JavaVersion.JAVA11.toJdtClassFileConstant()); assertEquals(ClassFileConstants.JDK17, JavaVersion.JAVA17.toJdtClassFileConstant()); assertEquals(ClassFileConstants.JDK21, JavaVersion.JAVA21.toJdtClassFileConstant()); - // until we use the newer JDT as minimal requirement, we cannot refer to ClassFileConstants.JDK25 - // or the test won't compile with older target platforms - // assertEquals(ClassFileConstants.JDK25, JavaVersion.JAVA25.toJdtClassFileConstant()); - assertEquals(4521984, JavaVersion.JAVA25.toJdtClassFileConstant()); + assertEquals(ClassFileConstants.JDK25, JavaVersion.JAVA25.toJdtClassFileConstant()); } - + @SuppressWarnings("deprecation") @Test public void testSpoofedClassFileConstant() { diff --git a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF index 49d7084c4ce..42dd30a6ae8 100644 --- a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF @@ -7,28 +7,28 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui.ide;bundle-version="3.22.100", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui.ide;bundle-version="3.22.800", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.xtext.builder;bundle-version="2.43.0", org.eclipse.xtext.common.types.ui;bundle-version="2.43.0", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.ui;bundle-version="3.32.0";resolution:=optional;x-installation:=greedy, - org.eclipse.jdt.core.manipulation;bundle-version="1.21.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.ui;bundle-version="3.36.0";resolution:=optional;x-installation:=greedy, + org.eclipse.jdt.core.manipulation;bundle-version="1.23.200";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.shared;bundle-version="2.43.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", - org.eclipse.jdt.junit;bundle-version="3.16.300";resolution:=optional, - org.eclipse.jdt.debug.ui;bundle-version="3.13.300";resolution:=optional;x-installation:=greedy, - org.eclipse.debug.ui;bundle-version="3.18.300";resolution:=optional;x-installation:=greedy, - org.eclipse.pde.ui;bundle-version="3.15.100";resolution:=optional, - org.eclipse.search;bundle-version="3.16.100", - org.eclipse.ltk.ui.refactoring;bundle-version="3.13.300";resolution:=optional;x-installation:=greedy, - org.eclipse.core.filesystem;bundle-version="1.10.300", - org.eclipse.jdt.debug;bundle-version="3.21.300", - org.eclipse.core.expressions;bundle-version="3.9.300", + org.eclipse.jdt.junit;bundle-version="3.17.300";resolution:=optional, + org.eclipse.jdt.debug.ui;bundle-version="3.15.200";resolution:=optional;x-installation:=greedy, + org.eclipse.debug.ui;bundle-version="3.19.100";resolution:=optional;x-installation:=greedy, + org.eclipse.pde.ui;bundle-version="3.16.300";resolution:=optional, + org.eclipse.search;bundle-version="3.17.400", + org.eclipse.ltk.ui.refactoring;bundle-version="3.13.700";resolution:=optional;x-installation:=greedy, + org.eclipse.core.filesystem;bundle-version="1.11.400", + org.eclipse.jdt.debug;bundle-version="3.25.0", + org.eclipse.core.expressions;bundle-version="3.9.500", org.eclipse.xtext.xbase.ide;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.43.0" Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF index ebbe8b99398..38faac14e59 100644 --- a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF @@ -11,9 +11,9 @@ Require-Bundle: de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optiona org.eclipse.xtext.common.types;bundle-version="2.43.0";visibility:=reexport, org.eclipse.xtext.xtext.generator;bundle-version="2.43.0";visibility:=reexport, org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";visibility:=reexport, - org.eclipse.emf.mwe.utils;bundle-version="1.15.0";visibility:=reexport, - org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";visibility:=reexport, - org.eclipse.emf.mwe2.lib;bundle-version="2.21.0";visibility:=reexport, + org.eclipse.emf.mwe.utils;bundle-version="1.19.0";visibility:=reexport, + org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";visibility:=reexport, + org.eclipse.emf.mwe2.lib;bundle-version="2.25.0";visibility:=reexport, org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";visibility:=reexport, org.apache.commons.commons-logging;bundle-version="1.3.4";visibility:=reexport, org.apache.log4j;bundle-version="1.2.26";visibility:=reexport, diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index 980eb2add2c..a59828420ba 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -13,11 +13,11 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0";x-installation:=greedy org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";visibility:=reexport;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.emf.common;bundle-version="2.30.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.21.0";resolution:=optional, - org.eclipse.equinox.common;bundle-version="3.19.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.25.0";resolution:=optional, + org.eclipse.equinox.common;bundle-version="3.20.300", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, - org.eclipse.jdt.core;bundle-version="3.37.0";resolution:=optional, + org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional, com.google.gson;bundle-version="2.10.1";resolution:=optional Import-Package: org.apache.log4j;version="1.2.26" Export-Package: org.eclipse.xtext.xtext.generator;version="2.43.0", diff --git a/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF index b9e5e44722c..9db625e4a0d 100644 --- a/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.xtext.ui.examples;singleton:=true Bundle-Version: 2.43.0.qualifier -Require-Bundle: org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.core.runtime;bundle-version="3.31.0", +Require-Bundle: org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.emf.common.ui;bundle-version="2.22.0", - org.eclipse.core.resources;bundle-version="3.20.100", - org.eclipse.ui.ide;bundle-version="3.22.100" + org.eclipse.core.resources;bundle-version="3.23.100", + org.eclipse.ui.ide;bundle-version="3.22.800" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: %providerName diff --git a/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF index 6b0e44394be..782a1b4497d 100644 --- a/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext.xtext.ui.graph;bundle-version="2.43.0", org.eclipse.xtext.testing;bundle-version="2.43.0", org.eclipse.xtext;bundle-version="2.43.0", - org.eclipse.draw2d;bundle-version="3.15.0", + org.eclipse.draw2d;bundle-version="3.21.0", org.eclipse.xtext.xtext.ui;bundle-version="2.43.0" Import-Package: org.junit;version="4.13.2", org.junit.runner;version="4.13.2" diff --git a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF index 378c61b220b..8895a23502c 100644 --- a/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.graph/META-INF/MANIFEST.MF @@ -13,14 +13,14 @@ Export-Package: org.eclipse.xtext.xtext.ui.graph;version="2.43.0", org.eclipse.xtext.xtext.ui.graph.figures.layouts;version="2.43.0", org.eclipse.xtext.xtext.ui.graph.figures.primitives;version="2.43.0", org.eclipse.xtext.xtext.ui.graph.trafo;version="2.43.0" -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100", org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.xtext;bundle-version="2.43.0", - org.eclipse.core.resources;bundle-version="3.20.100", + org.eclipse.core.resources;bundle-version="3.23.100", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.draw2d;bundle-version="3.15.0" + org.eclipse.draw2d;bundle-version="3.21.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.xtext.xtext.ui.graph.bundle.Activator Automatic-Module-Name: org.eclipse.xtext.xtext.ui.graph diff --git a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF index 0f07f6954e1..00b20ace0bb 100644 --- a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF @@ -8,14 +8,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext;bundle-version="2.43.0", org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui;bundle-version="3.205.100", + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui;bundle-version="3.207.400", org.eclipse.emf.common;bundle-version="2.30.0", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", - org.eclipse.ui.ide;bundle-version="3.22.100", + org.eclipse.ui.ide;bundle-version="3.22.800", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.jdt.ui;bundle-version="3.32.0", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.jdt.ui;bundle-version="3.36.0", org.eclipse.xtext.testing;bundle-version="2.43.0", org.eclipse.xtext.xtext.ui;bundle-version="2.43.0", org.eclipse.xtext.xtext.wizard;bundle-version="2.43.0", @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0", org.eclipse.xtext.tests;bundle-version="2.43.0", org.eclipse.xtext.testing;bundle-version="2.43.0", org.eclipse.xtext.ui.testing;bundle-version="2.43.0", - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", org.eclipse.xtext.builder;bundle-version="2.43.0", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0" diff --git a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF index 5cf57916af3..383163afd67 100644 --- a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF @@ -6,30 +6,30 @@ Bundle-SymbolicName: org.eclipse.xtext.xtext.ui;singleton:=true Bundle-Version: 2.43.0.qualifier Bundle-Activator: org.eclipse.xtext.xtext.ui.Activator Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.43.0", - org.eclipse.ui.ide;bundle-version="3.22.100", - org.eclipse.jdt.core;bundle-version="3.37.0", - org.eclipse.debug.ui;bundle-version="3.18.300", - org.eclipse.help;bundle-version="3.10.300", + org.eclipse.ui.ide;bundle-version="3.22.800", + org.eclipse.jdt.core;bundle-version="3.44.0", + org.eclipse.debug.ui;bundle-version="3.19.100", + org.eclipse.help;bundle-version="3.10.600", org.eclipse.emf.codegen.ecore;bundle-version="2.37.0", - org.eclipse.core.expressions;bundle-version="3.9.300", + org.eclipse.core.expressions;bundle-version="3.9.500", org.eclipse.xtext.ui.shared;bundle-version="2.43.0", - org.eclipse.ui.editors;bundle-version="3.17.200", - org.eclipse.ui;bundle-version="3.205.100", - org.eclipse.emf.mwe.core;bundle-version="1.15.0";resolution:=optional;x-installation:=greedy, - org.eclipse.emf.mwe2.language;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy, - org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy, - org.eclipse.pde.ui;bundle-version="3.15.100";resolution:=optional;x-installation:=greedy, + org.eclipse.ui.editors;bundle-version="3.20.200", + org.eclipse.ui;bundle-version="3.207.400", + org.eclipse.emf.mwe.core;bundle-version="1.19.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.language;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy, + org.eclipse.pde.ui;bundle-version="3.16.300";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder;bundle-version="2.43.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.compare;bundle-version="3.10.0", + org.eclipse.compare;bundle-version="3.11.600", org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0", org.eclipse.xtext.xbase.lib;bundle-version="2.43.0", - org.eclipse.jface.databinding;bundle-version="1.15.200", - org.eclipse.core.databinding;bundle-version="1.13.200", - org.eclipse.core.databinding.beans;bundle-version="1.10.200", - org.eclipse.core.databinding.property;bundle-version="1.10.200", + org.eclipse.jface.databinding;bundle-version="1.15.400", + org.eclipse.core.databinding;bundle-version="1.13.700", + org.eclipse.core.databinding.beans;bundle-version="1.10.500", + org.eclipse.core.databinding.property;bundle-version="1.10.500", org.eclipse.xtext.xtext.wizard;bundle-version="2.43.0", - org.eclipse.jdt.launching;bundle-version="3.21.100", + org.eclipse.jdt.launching;bundle-version="3.24.0", org.eclipse.xtext.xtext.ide;bundle-version="2.43.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index e9aed0e4da9..4977c131191 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -66,10 +66,10 @@ class TargetPlatformProject extends ProjectDescriptor { - «IF config.javaVersion.isAtLeast(JavaVersion.JAVA21)» + «IF config.javaVersion.isAtLeast(JavaVersion.JAVA25)» «ELSE» - + «ENDIF» diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 7d0bd4173de..d0fa8e87dec 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -121,14 +121,14 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); { - boolean _isAtLeast_1 = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA21); + boolean _isAtLeast_1 = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA25); if (_isAtLeast_1) { _builder.append("\t\t\t"); _builder.append(""); _builder.newLine(); } else { _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); } } diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index a63623b1df3..d1d02b6ff5d 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -207,12 +207,12 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.37.0";visibility:=re org.eclipse.emf.common;bundle-version="2.30.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport, org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional, - org.eclipse.emf.mwe.core;bundle-version="1.15.0";resolution:=optional;visibility:=reexport, - org.eclipse.emf.mwe.utils;bundle-version="1.15.0";resolution:=optional;visibility:=reexport, + org.eclipse.emf.mwe.core;bundle-version="1.19.0";resolution:=optional;visibility:=reexport, + org.eclipse.emf.mwe.utils;bundle-version="1.19.0";resolution:=optional;visibility:=reexport, org.eclipse.xtext.util;bundle-version="2.43.0";visibility:=reexport, - org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy, + org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional;x-installation:=greedy, org.eclipse.xtend.lib;bundle-version="2.43.0", - org.eclipse.equinox.common;bundle-version="3.19.0" + org.eclipse.equinox.common;bundle-version="3.20.300" Import-Package: org.apache.log4j;version="1.2.26",org.osgi.framework Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.xtext.internal.Activator diff --git a/releng/org.eclipse.xtext.contributor/Xtext.setup b/releng/org.eclipse.xtext.contributor/Xtext.setup index ed637345076..f457b1babd1 100644 --- a/releng/org.eclipse.xtext.contributor/Xtext.setup +++ b/releng/org.eclipse.xtext.contributor/Xtext.setup @@ -77,51 +77,6 @@ - - - - - - - - - - - - - - - Choose the compatibility level of the target platform - xtext-r202512 - - - xtext-r202509 - - - xtext-r202506 - - - xtext-r202503 - - - xtext-r202412 - - - xtext-r202409 - - - xtext-r202406 - - - xtext-r202403 - - - xtext-r202312 - - - xtext-r202309 - - - xtext-r202306 - - - xtext-r202303 - - - xtext-r202212 - - - xtext-r202209 - - - xtext-r202206 + filter="(eclipse.target.platform=2026-03)"> + xtext-r202603 - xtext-r202203 + filter="(eclipse.target.platform=2025-12)"> + xtext-r202512 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202406.target b/xtext-r202406.target deleted file mode 100644 index b8c51e685c0..00000000000 --- a/xtext-r202406.target +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202409.target b/xtext-r202409.target deleted file mode 100644 index cb523811a8c..00000000000 --- a/xtext-r202409.target +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202412.target b/xtext-r202412.target deleted file mode 100644 index 73b0add28ef..00000000000 --- a/xtext-r202412.target +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202503.target b/xtext-r202503.target deleted file mode 100644 index 78152bbcc70..00000000000 --- a/xtext-r202503.target +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202506.target b/xtext-r202506.target deleted file mode 100644 index 684f82519ae..00000000000 --- a/xtext-r202506.target +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xtext-r202509.target b/xtext-r202509.target deleted file mode 100644 index ceeb56b6588..00000000000 --- a/xtext-r202509.target +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -