From a6c62ced0f20ed4d0f7742f09bfef8bf94b7c69e Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 21 Oct 2024 15:26:54 +0200 Subject: [PATCH] MWE2 2.20.0.M1 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 +- .../META-INF/MANIFEST.MF | 8 ++++---- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.dev-bom/pom.xml | 12 ++++++------ 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 +- .../wizard-expectations/full/full.parent/pom.xml | 2 +- .../lsMavenTychoApp.target.target | 2 +- .../lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml | 2 +- .../lsMavenTychoFatjar.target.target | 2 +- .../lsMavenTychoFatjar.parent/pom.xml | 2 +- .../mavenTycho.target/mavenTycho.target.target | 2 +- .../mavenTycho/mavenTycho.parent/pom.xml | 2 +- .../mavenTychoJ17.target/mavenTychoJ17.target.target | 2 +- .../mavenTychoJ17/mavenTychoJ17.parent/pom.xml | 2 +- .../mavenTychoP2.target/mavenTychoP2.target.target | 2 +- .../mavenTychoP2/mavenTychoP2.parent/pom.xml | 2 +- .../mavenTychoP2J17.target.target | 2 +- .../mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml | 2 +- .../mavenTychoP2J21.target.target | 2 +- .../mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml | 2 +- .../src/org/eclipse/xtext/util/XtextVersion.java | 4 ++-- .../META-INF/MANIFEST.MF | 6 +++--- .../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-r202203.target | 2 +- xtext-r202206.target | 2 +- xtext-r202209.target | 2 +- xtext-r202212.target | 2 +- xtext-r202303.target | 2 +- xtext-r202306.target | 2 +- xtext-r202309.target | 2 +- xtext-r202312.target | 2 +- xtext-r202403.target | 2 +- xtext-r202406.target | 2 +- xtext-r202409.target | 2 +- 47 files changed, 67 insertions(+), 67 deletions(-) diff --git a/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml b/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml index 33f84b6e670..9ce4adad9ff 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 0bf4100f0bb..89952337de0 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.19.0.v20240705-1027 + 2.20.0.v20241021-1304 ${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 cc5336fe7a7..a758d3020ab 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-11 Bundle-Vendor: Eclipse Xtext Bundle-ClassPath: . Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.19.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.19.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.20.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtend.lib;bundle-version="2.37.0", org.eclipse.jdt.core;bundle-version="3.29.0", org.eclipse.core.resources;bundle-version="3.16.100", org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.xtend.ide.tests;bundle-version="2.37.0", org.junit, - org.eclipse.emf.mwe.utils;bundle-version="1.13.0", + org.eclipse.emf.mwe.utils;bundle-version="1.14.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.xtext.builder;bundle-version="2.37.0", - org.eclipse.emf.mwe2.launch;bundle-version="2.19.0";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional, org.eclipse.xtext.ui;bundle-version="2.37.0", org.eclipse.xtext.ui.testing;bundle-version="2.37.0", org.eclipse.xtend.core.tests;bundle-version="2.37.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 7407fe758e7..398819314fc 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-11 Bundle-Localization: plugin Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.37.0", org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.19.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.core.resources;bundle-version="3.16.100", org.eclipse.jdt.core;bundle-version="3.29.0", diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index d08f934e999..15e815e818a 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -238,32 +238,32 @@ org.eclipse.emf org.eclipse.emf.mwe.core - 1.13.0 + 1.14.0.M1 org.eclipse.emf org.eclipse.emf.mwe.utils - 1.13.0 + 1.14.0.M1 org.eclipse.emf org.eclipse.emf.mwe2.language - 2.19.0 + 2.20.0.M1 org.eclipse.emf org.eclipse.emf.mwe2.launch - 2.19.0 + 2.20.0.M1 org.eclipse.emf org.eclipse.emf.mwe2.lib - 2.19.0 + 2.20.0.M1 org.eclipse.emf org.eclipse.emf.mwe2.runtime - 2.19.0 + 2.20.0.M1 org.eclipse.jdt diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF index 26d4421c903..7c4220c3d25 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-11 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.common;bundle-version="2.24.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.19.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0", org.eclipse.xtext.ecore;bundle-version="2.37.0", org.eclipse.xtext.testlanguages;bundle-version="2.37.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 dc91ac7c75e..e1279c12c60 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.37.0", org.junit;bundle-version="4.13.2", org.eclipse.xtext.xbase;bundle-version="2.37.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.19.0";resolution:=optional + org.eclipse.emf.mwe2.lib;bundle-version="2.20.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 d5db3059de2..db2b800bc9b 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.37.0";visibility:=reexport, org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional, org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.eclipse.xtext.testlanguages.ide;bundle-version="2.37.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.19.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.20.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 7ddf25970d6..de6473fc3bf 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-11 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.emf.mwe.utils;bundle-version="1.13.0", + org.eclipse.emf.mwe.utils;bundle-version="1.14.0", org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.common;bundle-version="2.24.0", - org.eclipse.emf.mwe2.launch;bundle-version="2.19.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.37.0", @@ -19,8 +19,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext.xtext.generator;bundle-version="2.37.0", - org.eclipse.emf.mwe.core;bundle-version="1.13.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.19.0", + org.eclipse.emf.mwe.core;bundle-version="1.14.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.20.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 079ddd3d826..17660c8a89c 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 5a1e2fa3f05..4c7b01f4715 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-11 Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", - org.eclipse.emf.mwe.utils;bundle-version="1.13.0", + org.eclipse.emf.mwe.utils;bundle-version="1.14.0", org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, org.eclipse.emf.common;bundle-version="2.24.0", - org.eclipse.emf.mwe2.launch;bundle-version="2.19.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages;bundle-version="2.37.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing;bundle-version="2.37.0", @@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0", org.eclipse.xtext.xbase.lib;bundle-version="2.37.0", org.eclipse.xtext.xtext.generator;bundle-version="2.37.0", org.eclipse.xtext.xtext.wizard;bundle-version="2.37.0", - org.eclipse.emf.mwe.core;bundle-version="1.13.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.19.0", + org.eclipse.emf.mwe.core;bundle-version="1.14.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.20.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 6dde23e2f7f..ee21c6aaa4d 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 33e2aa9ff60..8a7f6000b0a 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.19.0 + 2.20.0.M1 UTF-8 11 11 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 33c03ad7418..7031dfa4efc 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 44dcde0175b..60f47addd17 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.19.0 + 2.20.0.M1 UTF-8 11 11 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 5d35810abf7..a9a958e957b 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 a5fc1462c89..3c33ec94cfd 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.19.0 + 2.20.0.M1 UTF-8 11 11 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 265730e125e..fb4ac635789 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 84a707005cd..c0d8e7cd6cb 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.19.0 + 2.20.0.M1 UTF-8 11 11 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target index 494ef642bb4..06f3c74fa6d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml index b3444384f3b..84d81faf694 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.19.0 + 2.20.0.M1 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 65ce42f6c26..cbc1e3c9e64 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 0ae0e50aa3b..33245116b0b 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.19.0 + 2.20.0.M1 UTF-8 11 11 diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target index 4a4e5af463d..a975a6c2790 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target @@ -12,7 +12,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml index 028eae71f87..3d3da4133d5 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml @@ -8,7 +8,7 @@ unspecified - 2.19.0 + 2.20.0.M1 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 2f05162c543..c7a6724220d 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 30c109d3590..975d9b9605f 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.19.0 + 2.20.0.M1 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 11f41d26ceb..3d32a1514f7 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.19.0"; + return "2.20.0.M1"; } /** * @noreference */ public String getMweBuildNumber() { - return ""; + return "S202410211304"; } 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 3323d91b94c..89ec78d4368 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.37.0";visibility:=reexport, org.eclipse.xtext.xtext.generator;bundle-version="2.37.0";visibility:=reexport, org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";visibility:=reexport, - org.eclipse.emf.mwe.utils;bundle-version="1.13.0";visibility:=reexport, - org.eclipse.emf.mwe2.launch;bundle-version="2.19.0";visibility:=reexport, - org.eclipse.emf.mwe2.lib;bundle-version="2.19.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.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 48e20aacad0..21e932fae92 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.37.0";x-installation:=greedy org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";visibility:=reexport;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.common;bundle-version="2.24.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.19.0";resolution:=optional, + org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";resolution:=optional, org.eclipse.equinox.common;bundle-version="3.16.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 041cbd790bb..62659d726d4 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 d586ec2cd9a..c0446915490 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.19.0 + 2.20.0.M1 diff --git a/org.eclipse.xtext.xtext.ui.feature/feature.xml b/org.eclipse.xtext.xtext.ui.feature/feature.xml index 3e08b95410a..7f6e777add7 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-r202203.target b/xtext-r202203.target index 18d654b83ff..32c9fcb7440 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index ee26b7473ad..b5761f6c13e 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 3bb32026a21..085653aaa5f 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 375abd21ec2..b66f71705a3 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index bec3f87a801..21be40d1103 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 23de85a7df7..c48553400a0 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index 9a859d7196f..a1d3659ce51 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index 65cf47f5f58..4360523c6ad 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202403.target b/xtext-r202403.target index 0f2cf60f1e3..270be5d25f0 100644 --- a/xtext-r202403.target +++ b/xtext-r202403.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202406.target b/xtext-r202406.target index 6901cb19b07..32bc096a82d 100644 --- a/xtext-r202406.target +++ b/xtext-r202406.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202409.target b/xtext-r202409.target index 39c62cfc63a..ec46bf63ecb 100644 --- a/xtext-r202409.target +++ b/xtext-r202409.target @@ -7,7 +7,7 @@ - +