From ec1ab025d158ea20970fd0f48003ef42d5f36743 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Fri, 26 Apr 2024 10:31:42 +0200 Subject: [PATCH 1/2] update to mwe 2.18.0.M2 --- org.eclipse.xtext.dev-bom/pom.xml | 12 ++++++------ .../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 ++-- .../tp/domainmodel.target | 2 +- .../org.eclipse.xtext.example.domainmodel/pom.xml | 2 +- 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 +- 28 files changed, 34 insertions(+), 34 deletions(-) diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 64cd997bbcd..f1408d48e48 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.12.0.M1 + 1.12.0.M2 org.eclipse.emf org.eclipse.emf.mwe.utils - 1.12.0.M1 + 1.12.0.M2 org.eclipse.emf org.eclipse.emf.mwe2.language - 2.18.0.M1 + 2.18.0.M2 org.eclipse.emf org.eclipse.emf.mwe2.launch - 2.18.0.M1 + 2.18.0.M2 org.eclipse.emf org.eclipse.emf.mwe2.lib - 2.18.0.M1 + 2.18.0.M2 org.eclipse.emf org.eclipse.emf.mwe2.runtime - 2.18.0.M1 + 2.18.0.M2 org.eclipse.jdt 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 77b1bd9dac7..3357a8eb4c8 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 7a318e481fc..5e4aec3a1cd 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.18.0.M1 + 2.18.0.M2 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 f607b019391..43af1fb2edd 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 b364e22efb5..3def4d80b54 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.18.0.M1 + 2.18.0.M2 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 731d627ae4b..0103cdcb16d 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 a3e55c9f2dc..88fdeb1b832 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.18.0.M1 + 2.18.0.M2 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 1978789d5de..16564e8a781 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 a3669ecf2d0..32c8a8b52eb 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.18.0.M1 + 2.18.0.M2 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 beb7974bb03..d6420fe8097 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 50a3d734ea2..98a5dec7e1d 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.18.0.M1 + 2.18.0.M2 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 1dc7a10840b..5a8f47c0483 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 8b616d0c00e..66eac5b2824 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.18.0.M1 + 2.18.0.M2 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 6648c0a354c..09d1b8a1277 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 612e589313b..0a0ee154817 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.18.0.M1 + 2.18.0.M2 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 a8410e68607..6581adb7f50 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.18.0.M1"; + return "2.18.0.M2"; } /** * @noreference */ public String getMweBuildNumber() { - return "S202404050451"; + return "S202404260736"; } public String getAntlrGeneratorVersion() { 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 ebe67305c0b..462994763b5 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 c06dcb83180..3ce5318803b 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.18.0.M1 + 2.18.0.M2 diff --git a/xtext-latest.target b/xtext-latest.target index 815c13e09e5..f53f04e1acd 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index dc5422f3acc..26746808903 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 70caae2f1bc..0f80aed0264 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 861d285ead9..9c9c91ec83a 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 7555181e0f7..773eecc62c4 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index de0589aa273..43f5912b76e 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 33bc3073e83..62678e7066c 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index 315cd9eec9f..e7488cc386a 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index b050ea34a7f..b228efeab69 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -7,7 +7,7 @@ - + diff --git a/xtext-r202403.target b/xtext-r202403.target index 95a0a41bf40..35e69f8eb09 100644 --- a/xtext-r202403.target +++ b/xtext-r202403.target @@ -7,7 +7,7 @@ - + From 24e62270eee25bef1689e1e1f9c4b25abc2b79d6 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Fri, 26 Apr 2024 12:32:30 +0200 Subject: [PATCH 2/2] bump seq. number Signed-off-by: Christian Dietrich --- 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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xtext-latest.target b/xtext-latest.target index f53f04e1acd..ba7bca5689f 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index 26746808903..1f9978e8bcb 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 0f80aed0264..5d8c9341821 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 9c9c91ec83a..4563da9c086 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 773eecc62c4..229bd2b73f8 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index 43f5912b76e..76cadb5d45c 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 62678e7066c..f358433146b 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index e7488cc386a..3289794cd39 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index b228efeab69..c037faba054 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202403.target b/xtext-r202403.target index 35e69f8eb09..3d0b66c86f5 100644 --- a/xtext-r202403.target +++ b/xtext-r202403.target @@ -1,6 +1,6 @@ - +