From a202bccf0f9b3bbc2378bd70d7d32bb0a98a1eae Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Sat, 30 Dec 2023 17:41:37 +0100 Subject: [PATCH 1/3] update to mwe(2) 1.11.0/2.17.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 +- .../META-INF/MANIFEST.MF | 6 +++--- org.eclipse.xtext.dev-bom/pom.xml | 12 ++++++------ 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 | 6 +++--- org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 6 +++--- .../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 +- .../src/org/eclipse/xtext/util/XtextVersion.java | 4 ++-- .../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 | 4 ++-- org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- xtext-latest.target | 4 ++-- xtext-r202203.target | 4 ++-- xtext-r202206.target | 4 ++-- xtext-r202209.target | 4 ++-- xtext-r202212.target | 4 ++-- xtext-r202303.target | 4 ++-- xtext-r202306.target | 4 ++-- xtext-r202309.target | 4 ++-- xtext-r202312.target | 4 ++-- 39 files changed, 61 insertions(+), 61 deletions(-) diff --git a/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml b/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml index 1b31e92cbc8..e504c0f5494 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 21fc42d72b2..efe84ca4ef7 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.16.0.v20231117-0522 + 2.17.0.v20231117-0522 ${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 035a704e60d..31f0ce9e2c4 100644 --- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-Vendor: Eclipse Xtext Bundle-ClassPath: . Require-Bundle: com.google.inject;bundle-version="7.0.0", org.eclipse.emf.ecore;bundle-version="2.26.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.16.0", - org.eclipse.emf.mwe2.runtime;bundle-version="2.16.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.17.0", + org.eclipse.emf.mwe2.runtime;bundle-version="2.17.0", org.eclipse.xtend.lib, org.eclipse.jdt.core;bundle-version="3.29.0", org.eclipse.core.resources;bundle-version="3.16.100", @@ -20,6 +20,6 @@ Require-Bundle: com.google.inject;bundle-version="7.0.0", org.eclipse.ui.editors;bundle-version="3.14.300", org.eclipse.xtext.builder, org.eclipse.xtext.util, - org.eclipse.emf.mwe2.launch;bundle-version="2.16.0";resolution:=optional, + org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional, org.eclipse.xtext.ui.testing Automatic-Module-Name: org.eclipse.xtend.performance.tests diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 7cc9b048e9d..6c58ff7f4b9 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -237,32 +237,32 @@ org.eclipse.emf org.eclipse.emf.mwe.core - 1.10.0 + 1.11.0.M0 org.eclipse.emf org.eclipse.emf.mwe.utils - 1.10.0 + 1.11.0.M0 org.eclipse.emf org.eclipse.emf.mwe2.language - 2.16.0 + 2.17.0.M0 org.eclipse.emf org.eclipse.emf.mwe2.launch - 2.16.0 + 2.17.0.M0 org.eclipse.emf org.eclipse.emf.mwe2.lib - 2.16.0 + 2.17.0.M0 org.eclipse.emf org.eclipse.emf.mwe2.runtime - 2.16.0 + 2.17.0.M0 org.eclipse.jdt diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF index fccf0ced37a..4a2fad134c9 100644 --- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF @@ -39,7 +39,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xtext.generator;bundle-version="2.30.0", org.junit;bundle-version="4.13.2", org.eclipse.xtext.xbase;bundle-version="2.30.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.16.0";resolution:=optional + org.eclipse.emf.mwe2.lib;bundle-version="2.17.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 ecccbd0cc6c..8ce4845f508 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;visibility:=reexport, org.eclipse.lsp4j.jsonrpc;bundle-version="[0.21.1,0.22.0)";resolution:=optional, org.eclipse.xtext.testlanguages, org.eclipse.xtext.testlanguages.ide, - org.eclipse.emf.mwe2.lib;bundle-version="2.16.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.17.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 b4c3f06e063..e285e3cb306 100644 --- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, 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.16.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing, @@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.34.0", org.eclipse.xtext.xtext.generator, - org.eclipse.emf.mwe.core;bundle-version="1.10.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.16.0", + org.eclipse.emf.mwe.core;bundle-version="1.11.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.17.0", org.junit;bundle-version="4.13.2", org.aopalliance;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF index d6742425b1f..93588f70fe8 100644 --- a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xtext.generator;resolution:=optional;x-installation:=greedy, org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.mwe.utils;bundle-version="1.10.0";resolution:=optional;x-installation:=greedy, - org.eclipse.emf.mwe2.launch;bundle-version="2.16.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.util, org.eclipse.emf.ecore;bundle-version="2.26.0", org.eclipse.emf.common;bundle-version="2.24.0", diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index a938f1c21dd..691cf5b13ec 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, 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.16.0";resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.testlanguages, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.testing, @@ -21,8 +21,8 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase.lib;bundle-version="2.34.0", org.eclipse.xtext.xtext.generator, org.eclipse.xtext.xtext.wizard, - org.eclipse.emf.mwe.core;bundle-version="1.10.0", - org.eclipse.emf.mwe2.lib;bundle-version="2.16.0", + org.eclipse.emf.mwe.core;bundle-version="1.11.0", + org.eclipse.emf.mwe2.lib;bundle-version="2.17.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 663accd555e..90717bdb9d8 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 5f2aad723ec..567eac2f254 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.16.0 + 2.17.0.M0 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 033205350a5..590c1ae8cb5 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 2ca30f66fa8..9667797a967 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.16.0 + 2.17.0.M0 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 69e1630ba52..86652de9311 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 bd605b4e789..9aa39a6dd13 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.16.0 + 2.17.0.M0 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 8d869b217da..600c30262c1 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 c6df52ce369..9b661389f73 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.16.0 + 2.17.0.M0 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 1047e569dc4..5a208e432d4 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 72c94b293a5..0249f9b3951 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.16.0 + 2.17.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 4fa19fefe35..275961f9938 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 493b41c5e77..c2c9545af01 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.16.0 + 2.17.0.M0 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 97170cde978..5cdfee84409 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 e8e0ca8cc20..3a82f612d8e 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.16.0 + 2.17.0.M0 UTF-8 17 17 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 09cf8708cf3..aa59ef41949 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.16.0"; + return "2.17.0.M0"; } /** * @noreference */ public String getMweBuildNumber() { - return ""; + return "S202312301643"; } public String getAntlrGeneratorVersion() { diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index 174e6e410c3..8c4c68cb480 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;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.16.0";resolution:=optional, + org.eclipse.emf.mwe2.lib;bundle-version="2.17.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 67a59d63c1c..cfc191c3b14 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 @@ -12,7 +12,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 c07d9d91fa0..16774f8c17e 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.16.0 + 2.17.0.M0 diff --git a/org.eclipse.xtext.xtext.ui.feature/feature.xml b/org.eclipse.xtext.xtext.ui.feature/feature.xml index a21e4608d71..85dc488c3cd 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 5f9a0090ce9..d492632db96 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -1,13 +1,13 @@ - + - + diff --git a/xtext-r202206.target b/xtext-r202206.target index f4a83c72160..b329c463170 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -1,13 +1,13 @@ - + - + diff --git a/xtext-r202209.target b/xtext-r202209.target index cc129cccde6..a58d7d527f3 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -1,13 +1,13 @@ - + - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 7a96eb38613..e5c306adf95 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -1,13 +1,13 @@ - + - + diff --git a/xtext-r202303.target b/xtext-r202303.target index 5bd5ab42efe..808c10f6621 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -1,13 +1,13 @@ - + - + diff --git a/xtext-r202306.target b/xtext-r202306.target index c28b5d58fc2..bb3f88e0411 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -1,13 +1,13 @@ - + - + diff --git a/xtext-r202309.target b/xtext-r202309.target index 15f7470023a..656059c2521 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -1,13 +1,13 @@ - + - + diff --git a/xtext-r202312.target b/xtext-r202312.target index 79f5b82c039..3cb7d746eb3 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -1,13 +1,13 @@ - + - + From 5c9a84681d57f5358558a6f160f768fd82cf1785 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Sat, 30 Dec 2023 18:14:56 +0100 Subject: [PATCH 2/3] switch to Xtext M0 for bootstrapping Signed-off-by: Christian Dietrich --- xtext-r202203.target | 4 ++-- xtext-r202206.target | 4 ++-- xtext-r202209.target | 4 ++-- xtext-r202212.target | 4 ++-- xtext-r202303.target | 4 ++-- xtext-r202306.target | 4 ++-- xtext-r202309.target | 4 ++-- xtext-r202312.target | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xtext-r202203.target b/xtext-r202203.target index d492632db96..658dbf9bdf9 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -31,8 +31,8 @@ - - + + diff --git a/xtext-r202206.target b/xtext-r202206.target index b329c463170..cb5cc99d73a 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -30,8 +30,8 @@ - - + + diff --git a/xtext-r202209.target b/xtext-r202209.target index a58d7d527f3..7f7bde44359 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -15,8 +15,8 @@ - - + + diff --git a/xtext-r202212.target b/xtext-r202212.target index e5c306adf95..32d50492fae 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -15,8 +15,8 @@ - - + + diff --git a/xtext-r202303.target b/xtext-r202303.target index 808c10f6621..e75ad54f304 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -15,8 +15,8 @@ - - + + diff --git a/xtext-r202306.target b/xtext-r202306.target index bb3f88e0411..5f773fd6ad8 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -15,8 +15,8 @@ - - + + diff --git a/xtext-r202309.target b/xtext-r202309.target index 656059c2521..6b447704f88 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -15,8 +15,8 @@ - - + + diff --git a/xtext-r202312.target b/xtext-r202312.target index 3cb7d746eb3..fe00119048f 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -15,8 +15,8 @@ - - + + From 06ac8e070690b403ad259fe2fbb4d5e020cf2663 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Sat, 30 Dec 2023 20:46:56 +0100 Subject: [PATCH 3/3] use workaround also in latest Signed-off-by: Christian Dietrich --- xtext-latest.target | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xtext-latest.target b/xtext-latest.target index e041c8de3a2..3395026f68a 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -32,6 +32,11 @@ + + + + +