From 5916b1b33a41fe63098e3044896cf93fbd1d0b0b Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 10 Dec 2024 16:58:47 +0100 Subject: [PATCH] update to mwe(2) 2.21.0.M0 Signed-off-by: Christian Dietrich --- org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml | 2 +- org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml | 2 +- org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.dev-bom/pom.xml | 4 ++-- org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.xtext.sdk.feature/feature.xml | 2 +- org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 8 ++++---- .../full/full.parent/full.target/full.target.target | 2 +- .../testdata/wizard-expectations/full/full.parent/pom.xml | 2 +- .../lsMavenTychoApp.target/lsMavenTychoApp.target.target | 2 +- .../lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml | 2 +- .../lsMavenTychoFatjar.target.target | 2 +- .../lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml | 2 +- .../mavenTycho.target/mavenTycho.target.target | 2 +- .../mavenTycho/mavenTycho.parent/pom.xml | 2 +- .../mavenTychoJUnit5.target.target | 2 +- .../mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml | 2 +- .../mavenTychoP2.target/mavenTychoP2.target.target | 2 +- .../mavenTychoP2/mavenTychoP2.parent/pom.xml | 2 +- .../mavenTychoP2J21.target/mavenTychoP2J21.target.target | 2 +- .../mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml | 2 +- .../src/org/eclipse/xtext/util/XtextVersion.java | 4 ++-- .../META-INF/MANIFEST.MF | 6 +++--- org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF | 2 +- .../tp/domainmodel.target | 2 +- .../org.eclipse.xtext.example.domainmodel/pom.xml | 2 +- org.eclipse.xtext.xtext.ui.feature/feature.xml | 2 +- org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.xtext/META-INF/MANIFEST.MF | 4 ++-- xtext-latest.target | 2 +- xtext-r202403.target | 2 +- xtext-r202406.target | 2 +- xtext-r202409.target | 2 +- xtext-r202412.target | 2 +- 38 files changed, 54 insertions(+), 54 deletions(-) diff --git a/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml b/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml index 9ce4adad9ff..a5f9263ed06 100644 --- a/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml +++ b/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml @@ -1,7 +1,7 @@ diff --git a/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml b/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml index a8eb5ade04a..1f5181e18cf 100644 --- a/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml +++ b/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml @@ -10,7 +10,7 @@ eclipse-feature org.eclipse.emf org.eclipse.emf.mwe2.language.sdk - 2.20.0.v20241021-1304 + 2.21.0.v20241210-1535 ${project.parent.version} diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF index ae67fa6ba99..7aec9eadda7 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -7,18 +7,18 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 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.20.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0", org.eclipse.xtend.lib;bundle-version="2.38.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.xtend.ide.tests;bundle-version="2.38.0", org.junit, - org.eclipse.emf.mwe.utils;bundle-version="1.14.0", + org.eclipse.emf.mwe.utils;bundle-version="1.15.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.xtext.builder;bundle-version="2.38.0", - org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional, org.eclipse.xtext.ui;bundle-version="2.38.0", org.eclipse.xtext.ui.testing;bundle-version="2.38.0", org.eclipse.xtend.core.tests;bundle-version="2.38.0", 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 cc393651762..a07bfeb4d90 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,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.38.0", org.eclipse.emf.ecore;bundle-version="2.36.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0", org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.core.resources;bundle-version="3.20.100", org.eclipse.jdt.core;bundle-version="3.37.0", diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index f010d988e58..176d2a048d1 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -127,8 +127,8 @@ 1.10.2 5.10.2 - 2.20.0 - 1.14.0 + 2.21.0.M0 + 1.15.0.M0 0.23.1 3.37.0 ISO-8859-1 diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF index b33adfd6cd3..abce01748d1 100644 --- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.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.20.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0", org.eclipse.xtext.ecore;bundle-version="2.38.0", org.eclipse.xtext.testlanguages;bundle-version="2.38.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF index c967ff80d7f..165368238ff 100644 --- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF @@ -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.38.0", org.junit;bundle-version="4.13.2", org.eclipse.xtext.xbase;bundle-version="2.38.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";resolution:=optional + org.eclipse.emf.mwe2.lib;bundle-version="2.21.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 ce59592aefd..c7e3588ea43 100644 --- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport, org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional, org.eclipse.xtext.testlanguages;bundle-version="2.38.0", org.eclipse.xtext.testlanguages.ide;bundle-version="2.38.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.20.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", org.aopalliance;bundle-version="1.0.0", com.google.gson;bundle-version="2.10.1" Import-Package: org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF index 724a0105198..177c3bbec67 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", - org.eclipse.emf.mwe.utils;bundle-version="1.14.0", + org.eclipse.emf.mwe.utils;bundle-version="1.15.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.20.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.38.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.38.0", @@ -19,8 +19,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext.xtext.generator;bundle-version="2.38.0", - org.eclipse.emf.mwe.core;bundle-version="1.14.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.20.0", + org.eclipse.emf.mwe.core;bundle-version="1.15.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.21.0", org.junit;bundle-version="4.13.2", org.aopalliance;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.sdk.feature/feature.xml b/org.eclipse.xtext.sdk.feature/feature.xml index 4f387e37f1f..2dbebb5ab43 100644 --- a/org.eclipse.xtext.sdk.feature/feature.xml +++ b/org.eclipse.xtext.sdk.feature/feature.xml @@ -71,7 +71,7 @@ SPDX-License-Identifier: EPL-2.0 - + diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index 3d3deb27445..f73b4baa815 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -7,10 +7,10 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", - org.eclipse.emf.mwe.utils;bundle-version="1.14.0", + org.eclipse.emf.mwe.utils;bundle-version="1.15.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.20.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.38.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.38.0", @@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0", org.eclipse.xtext.xbase.lib;bundle-version="2.38.0", org.eclipse.xtext.xtext.generator;bundle-version="2.38.0", org.eclipse.xtext.xtext.wizard;bundle-version="2.38.0", - org.eclipse.emf.mwe.core;bundle-version="1.14.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.20.0", + org.eclipse.emf.mwe.core;bundle-version="1.15.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.21.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 2e4e5e53e96..5cd1c44f8f3 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 @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml index 1f1d8255163..287104d5d8e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0 + 2.21.0.M0 UTF-8 17 17 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 7322da02f1f..604a8075ed1 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 @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml index ae92d96c44c..bf816c98be7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0 + 2.21.0.M0 UTF-8 17 17 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 765efdb25c7..b2d8bcba144 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 @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml index a799350031c..033251fb0bb 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0 + 2.21.0.M0 UTF-8 17 17 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 ce3f27b77f8..d8d78da4df1 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 @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml index 479c48103f1..38a42ecd877 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0 + 2.21.0.M0 UTF-8 17 17 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 3924d2ea3ad..b27691fbd96 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 @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml index b3b7715ad4b..19069efba34 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0 + 2.21.0.M0 UTF-8 17 17 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 21cdee8e053..580086d76c0 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 @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml index e7071322b37..5d1e033bbc6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0 + 2.21.0.M0 UTF-8 17 17 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target index 2657ff797d2..51b941f1fec 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml index 08451583298..cb1b4b69c1e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.20.0 + 2.21.0.M0 UTF-8 21 21 diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java index 3116e054b76..b567b8275f5 100644 --- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java +++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java @@ -52,14 +52,14 @@ public String getXtextGradlePluginVersion() { * @noreference */ public String getMweVersion() { - return "2.20.0"; + return "2.21.0.M0"; } /** * @noreference */ public String getMweBuildNumber() { - return ""; + return "S202412101535"; } public String getAntlrGeneratorVersion() { 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 4e79d5a8b9c..ba7af9fa6cc 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.38.0";visibility:=reexport, org.eclipse.xtext.xtext.generator;bundle-version="2.38.0";visibility:=reexport, org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";visibility:=reexport, - org.eclipse.emf.mwe.utils;bundle-version="1.14.0";visibility:=reexport, - org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";visibility:=reexport, - org.eclipse.emf.mwe2.lib;bundle-version="2.20.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.objectweb.asm;bundle-version="[9.7.1,9.8.0)";visibility:=reexport, org.apache.commons.commons-logging;bundle-version="1.3.4";visibility:=reexport, org.apache.log4j;bundle-version="1.2.24";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 8c406bb3922..0d5a1aa1279 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.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.20.0";resolution:=optional, + org.eclipse.emf.mwe2.lib;bundle-version="2.21.0";resolution:=optional, org.eclipse.equinox.common;bundle-version="3.19.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target index 36924c47de7..d9f2547a5bf 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target @@ -13,7 +13,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml index 91a44875dec..0d16090e103 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml @@ -11,7 +11,7 @@ eclipse-plugin - 2.20.0 + 2.21.0.M0 diff --git a/org.eclipse.xtext.xtext.ui.feature/feature.xml b/org.eclipse.xtext.xtext.ui.feature/feature.xml index edad90042b1..ab920d9a23f 100644 --- a/org.eclipse.xtext.xtext.ui.feature/feature.xml +++ b/org.eclipse.xtext.xtext.ui.feature/feature.xml @@ -35,7 +35,7 @@ SPDX-License-Identifier: EPL-2.0 optional="true"/> - + - + diff --git a/xtext-r202403.target b/xtext-r202403.target index ec5d9c6c41b..e80fb298aac 100644 --- a/xtext-r202403.target +++ b/xtext-r202403.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202406.target b/xtext-r202406.target index 8c3a3411499..9c12344107f 100644 --- a/xtext-r202406.target +++ b/xtext-r202406.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202409.target b/xtext-r202409.target index 47f31b636a5..af775889282 100644 --- a/xtext-r202409.target +++ b/xtext-r202409.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202412.target b/xtext-r202412.target index cb0bf37ed87..e4feb5b9dde 100644 --- a/xtext-r202412.target +++ b/xtext-r202412.target @@ -7,7 +7,7 @@ - +