diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF
index e679eef8111..d653c9a5553 100644
--- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF
@@ -7,37 +7,80 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Export-Package: org.eclipse.xtend.core;version="2.38.0";x-friends:="org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests,org.eclipse.xtend.core.tests",
- org.eclipse.xtend.core.compiler;version="2.38.0";x-friends:="org.eclipse.xtend.m2e,org.eclipse.xtend.ide.tests,org.eclipse.xtend.core.tests",
+Export-Package: org.eclipse.xtend.core;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide.common,
+   org.eclipse.xtend.ide.tests,
+   org.eclipse.xtend.core.tests",
+ org.eclipse.xtend.core.compiler;version="2.38.0";
+  x-friends:="org.eclipse.xtend.m2e,
+   org.eclipse.xtend.ide.tests,
+   org.eclipse.xtend.core.tests",
  org.eclipse.xtend.core.compiler.batch;version="2.38.0",
  org.eclipse.xtend.core.compiler.output;version="2.38.0";x-internal:=true,
- org.eclipse.xtend.core.conversion;version="2.38.0";x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.core.tests",
+ org.eclipse.xtend.core.conversion;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common,
+   org.eclipse.xtend.core.tests",
  org.eclipse.xtend.core.documentation;version="2.38.0";x-internal:=true,
  org.eclipse.xtend.core.findReferences;version="2.38.0";x-internal:=true,
- org.eclipse.xtend.core.formatting2;version="2.38.0";x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.core.tests",
+ org.eclipse.xtend.core.formatting2;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common,
+   org.eclipse.xtend.core.tests",
  org.eclipse.xtend.core.imports;version="2.38.0";x-internal:=true,
  org.eclipse.xtend.core.jvmmodel;version="2.38.0";
   x-friends:="org.eclipse.xtend.ide,
    org.eclipse.xtend.ide.tests,
    org.eclipse.xtend.ide.common,
    org.eclipse.xtend.core.tests",
- org.eclipse.xtend.core.linking;version="2.38.0";x-friends:="org.eclipse.xtend.core.tests,org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
- org.eclipse.xtend.core.macro;version="2.38.0";x-friends:="org.eclipse.xtend.core.tests,org.eclipse.xtend.ide,org.eclipse.xtend.ide.tests,org.eclipse.xtend.ide.common",
- org.eclipse.xtend.core.macro.declaration;version="2.38.0";x-friends:="org.eclipse.xtend.core.tests,org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
+ org.eclipse.xtend.core.linking;version="2.38.0";
+  x-friends:="org.eclipse.xtend.core.tests,
+   org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common",
+ org.eclipse.xtend.core.macro;version="2.38.0";
+  x-friends:="org.eclipse.xtend.core.tests,
+   org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.tests,
+   org.eclipse.xtend.ide.common",
+ org.eclipse.xtend.core.macro.declaration;version="2.38.0";
+  x-friends:="org.eclipse.xtend.core.tests,
+   org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common,
+   org.eclipse.xtend.ide.tests",
  org.eclipse.xtend.core.naming;version="2.38.0";x-internal:=true,
- org.eclipse.xtend.core.parser;version="2.38.0";x-friends:="org.eclipse.xtend.core.tests,org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
- org.eclipse.xtend.core.parser.antlr;version="2.38.0";x-friends:="org.eclipse.xtend.ide.tests",
- org.eclipse.xtend.core.parser.antlr.internal;version="2.38.0";x-friends:="org.eclipse.xtend.core.tests,org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.ide.tests",
- org.eclipse.xtend.core.resource;version="2.38.0";x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
- org.eclipse.xtend.core.richstring;version="2.38.0";x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common,org.eclipse.xtend.core.tests",
+ org.eclipse.xtend.core.parser;version="2.38.0";
+  x-friends:="org.eclipse.xtend.core.tests,
+   org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common,
+   org.eclipse.xtend.ide.tests",
+ org.eclipse.xtend.core.parser.antlr;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide.tests",
+ org.eclipse.xtend.core.parser.antlr.internal;version="2.38.0";
+  x-friends:="org.eclipse.xtend.core.tests,
+   org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common,
+   org.eclipse.xtend.ide.tests",
+ org.eclipse.xtend.core.resource;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common",
+ org.eclipse.xtend.core.richstring;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common,
+   org.eclipse.xtend.core.tests",
  org.eclipse.xtend.core.richstring.impl;version="2.38.0";x-internal:=true,
  org.eclipse.xtend.core.richstring.util;version="2.38.0";x-internal:=true,
- org.eclipse.xtend.core.scoping;version="2.38.0";x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
+ org.eclipse.xtend.core.scoping;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common",
  org.eclipse.xtend.core.serializer;version="2.38.0";x-internal:=true,
- org.eclipse.xtend.core.services;version="2.38.0";x-friends:="org.eclipse.xtend.ide,org.eclipse.xtend.ide.common",
+ org.eclipse.xtend.core.services;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide,
+   org.eclipse.xtend.ide.common",
  org.eclipse.xtend.core.tasks;version="2.38.0";x-internal:=true,
- org.eclipse.xtend.core.typesystem;version="2.38.0";x-friends:="org.eclipse.xtend.core.tests",
- org.eclipse.xtend.core.typing;version="2.38.0";x-friends:="org.eclipse.xtend.ide",
+ org.eclipse.xtend.core.typesystem;version="2.38.0";
+  x-friends:="org.eclipse.xtend.core.tests",
+ org.eclipse.xtend.core.typing;version="2.38.0";
+  x-friends:="org.eclipse.xtend.ide",
  org.eclipse.xtend.core.validation;version="2.38.0";
   x-friends:="org.eclipse.xtend.ide,
    org.eclipse.xtend.ide.common,
diff --git a/org.eclipse.xtend.core/build.properties b/org.eclipse.xtend.core/build.properties
index d8e7d4a1908..52f211dd96a 100644
--- a/org.eclipse.xtend.core/build.properties
+++ b/org.eclipse.xtend.core/build.properties
@@ -13,6 +13,4 @@ exclude.. = **/GenerateXtend.mwe2
 src.includes = about.html
 src.excludes = generator/,\
                generator-xtend-gen/
-additional.bundles = org.eclipse.emf.mwe2.launch,\
-                     org.eclipse.emf.mwe2.lib,\
-                     org.eclipse.xtext.xtext.generator
+additional.bundles = org.eclipse.xtext.xtext.generator.dependencies
diff --git a/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/richstring/impl/ProcessedRichStringPackageImpl.java b/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/richstring/impl/ProcessedRichStringPackageImpl.java
index 002b85df272..93c6fef81d8 100644
--- a/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/richstring/impl/ProcessedRichStringPackageImpl.java
+++ b/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/richstring/impl/ProcessedRichStringPackageImpl.java
@@ -151,7 +151,6 @@ private ProcessedRichStringPackageImpl()
 	{
 		super(eNS_URI, ProcessedRichStringFactory.eINSTANCE);
 	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/xtend/impl/XtendPackageImpl.java b/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/xtend/impl/XtendPackageImpl.java
index 72eaf243514..22dceb2f344 100644
--- a/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/xtend/impl/XtendPackageImpl.java
+++ b/org.eclipse.xtend.core/emf-gen/org/eclipse/xtend/core/xtend/impl/XtendPackageImpl.java
@@ -237,7 +237,6 @@ private XtendPackageImpl()
 	{
 		super(eNS_URI, XtendFactory.eINSTANCE);
 	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.xtend.core/model/RichStrings.genmodel b/org.eclipse.xtend.core/model/RichStrings.genmodel
index aa11c15cbb9..96c617577aa 100644
--- a/org.eclipse.xtend.core/model/RichStrings.genmodel
+++ b/org.eclipse.xtend.core/model/RichStrings.genmodel
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtend.core/emf-gen" modelPluginID="org.eclipse.xtend.core"
-    modelName="RichStrings" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    modelName="RichStrings" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false"
     runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel#//types platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xAnnotations platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase Xtend.genmodel#//xtend platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
   <foreignModel>RichStrings.ecore</foreignModel>
diff --git a/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendFlexer.java b/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendFlexer.java
index 170c13c22f2..8aeea1162db 100644
--- a/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendFlexer.java
+++ b/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendFlexer.java
@@ -61,109 +61,109 @@ class InternalXtendFlexer implements org.eclipse.xtend.core.parser.InternalFlexe
     "\16\0\5\4\7\0\1\4\1\0\1\4\21\0\160\5\5\4\1\0"+
     "\2\4\2\0\4\4\1\0\1\4\6\0\1\4\1\0\3\4\1\0"+
     "\1\4\1\0\24\4\1\0\123\4\1\0\213\4\1\0\5\5\2\0"+
-    "\246\4\1\0\46\4\2\0\1\4\7\0\47\4\7\0\1\4\1\0"+
+    "\246\4\1\0\46\4\2\0\1\4\6\0\51\4\6\0\1\4\1\0"+
     "\55\5\1\0\1\5\1\0\2\5\1\0\2\5\1\0\1\5\10\0"+
-    "\33\4\5\0\3\4\15\0\6\5\5\0\1\4\4\0\13\5\1\0"+
+    "\33\4\4\0\4\4\15\0\6\5\5\0\1\4\4\0\13\5\1\0"+
     "\1\5\3\0\53\4\37\5\4\0\2\4\1\5\143\4\1\0\1\4"+
     "\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4\12\5\3\4"+
     "\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5\2\0\131\4"+
-    "\13\5\1\4\16\0\12\5\41\4\11\5\2\4\4\0\1\4\5\0"+
-    "\26\4\4\5\1\4\11\5\1\4\3\5\1\4\5\5\22\0\31\4"+
-    "\3\5\4\0\13\4\65\0\25\4\1\0\10\4\26\0\60\5\66\4"+
-    "\3\5\1\4\22\5\1\4\7\5\12\4\2\5\2\0\12\5\1\0"+
-    "\20\4\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4"+
-    "\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0\2\5"+
-    "\2\0\3\5\1\4\10\0\1\5\4\0\2\4\1\0\3\4\2\5"+
-    "\2\0\12\5\4\4\7\0\2\4\4\0\3\5\1\0\6\4\4\0"+
-    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0"+
-    "\2\4\2\0\1\5\1\0\5\5\4\0\2\5\2\0\3\5\3\0"+
-    "\1\5\7\0\4\4\1\0\1\4\7\0\14\5\3\4\1\5\13\0"+
-    "\3\5\1\0\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0"+
-    "\2\4\1\0\5\4\2\0\1\5\1\4\10\5\1\0\3\5\1\0"+
-    "\3\5\2\0\1\4\17\0\2\4\2\5\2\0\12\5\1\0\1\4"+
-    "\7\0\1\4\6\5\1\0\3\5\1\0\10\4\2\0\2\4\2\0"+
-    "\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5\1\4"+
-    "\7\5\2\0\2\5\2\0\3\5\10\0\2\5\4\0\2\4\1\0"+
-    "\3\4\2\5\2\0\12\5\1\0\1\4\20\0\1\5\1\4\1\0"+
-    "\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4\1\0"+
-    "\2\4\3\0\2\4\3\0\3\4\3\0\14\4\4\0\5\5\3\0"+
-    "\3\5\1\0\4\5\2\0\1\4\6\0\1\5\16\0\12\5\11\0"+
-    "\1\4\6\0\4\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0"+
-    "\20\4\3\0\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5"+
-    "\1\0\3\4\5\0\2\4\2\5\2\0\12\5\20\0\1\4\3\5"+
-    "\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4"+
-    "\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5"+
-    "\7\0\1\4\1\0\2\4\2\5\2\0\12\5\1\0\2\4\15\0"+
-    "\4\5\1\0\10\4\1\0\3\4\1\0\51\4\2\5\1\4\7\5"+
-    "\1\0\3\5\1\0\4\5\1\4\5\0\3\4\1\5\7\0\3\4"+
-    "\2\5\2\0\12\5\12\0\6\4\2\0\2\5\1\0\22\4\3\0"+
-    "\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5\4\0"+
-    "\6\5\1\0\1\5\1\0\10\5\6\0\12\5\2\0\2\5\15\0"+
-    "\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0"+
-    "\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0"+
-    "\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0"+
-    "\2\4\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0"+
-    "\5\4\1\0\1\4\1\0\6\5\2\0\12\5\2\0\4\4\40\0"+
-    "\1\4\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0"+
-    "\1\5\4\0\2\5\10\4\1\0\44\4\4\0\24\5\1\0\2\5"+
-    "\5\4\13\5\1\0\44\5\11\0\1\5\71\0\53\4\24\5\1\4"+
-    "\12\5\6\0\6\4\4\5\4\4\3\5\1\4\3\5\2\4\7\5"+
-    "\3\4\4\5\15\4\14\5\1\4\17\5\2\0\46\4\1\0\1\4"+
-    "\5\0\1\4\2\0\53\4\1\0\u014d\4\1\0\4\4\2\0\7\4"+
-    "\1\0\1\4\1\0\4\4\2\0\51\4\1\0\4\4\2\0\41\4"+
-    "\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\17\4"+
-    "\1\0\71\4\1\0\4\4\2\0\103\4\2\0\3\5\40\0\20\4"+
-    "\20\0\126\4\2\0\6\4\3\0\u026c\4\2\0\21\4\1\0\32\4"+
-    "\5\0\113\4\3\0\13\4\7\0\15\4\1\0\4\4\3\5\13\0"+
-    "\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4\1\0"+
-    "\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5\2\0"+
-    "\12\5\41\0\4\5\1\0\12\5\6\0\130\4\10\0\5\4\2\5"+
-    "\42\4\1\5\1\4\5\0\106\4\12\0\37\4\1\0\14\5\4\0"+
-    "\14\5\12\0\12\5\36\4\2\0\5\4\13\0\54\4\4\0\32\4"+
-    "\6\0\12\5\46\0\27\4\5\5\4\0\65\4\12\5\1\0\35\5"+
-    "\2\0\13\5\6\0\12\5\15\0\1\4\10\0\16\5\102\0\5\5"+
-    "\57\4\21\5\7\4\4\0\12\5\21\0\11\5\14\0\3\5\36\4"+
-    "\15\5\2\4\12\5\54\4\16\5\14\0\44\4\24\5\10\0\12\5"+
-    "\3\0\3\4\12\5\44\4\2\0\11\4\107\0\3\5\1\0\25\5"+
-    "\4\4\1\5\4\4\3\5\2\4\3\5\6\0\300\4\72\5\1\0"+
-    "\5\5\u0116\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4"+
-    "\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4"+
-    "\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4"+
-    "\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\16\0\5\5"+
-    "\32\0\5\5\20\0\2\4\23\0\1\4\13\0\5\5\1\0\12\5"+
-    "\1\0\1\4\15\0\1\4\20\0\15\4\3\0\40\4\20\0\15\5"+
-    "\4\0\1\5\3\0\14\5\21\0\1\4\4\0\1\4\2\0\12\4"+
-    "\1\0\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4"+
-    "\1\0\4\4\1\0\13\4\2\0\4\4\5\0\5\4\4\0\1\4"+
-    "\21\0\51\4\u0a77\0\57\4\1\0\57\4\1\0\205\4\6\0\4\4"+
-    "\3\5\2\4\14\0\46\4\1\0\1\4\5\0\1\4\2\0\70\4"+
-    "\7\0\1\4\17\0\1\5\27\4\11\0\7\4\1\0\7\4\1\0"+
+    "\13\5\1\4\16\0\12\5\41\4\11\5\2\4\4\0\1\4\2\0"+
+    "\1\5\30\4\4\5\1\4\11\5\1\4\3\5\1\4\5\5\22\0"+
+    "\31\4\3\5\4\0\13\4\65\0\25\4\1\0\22\4\13\0\61\5"+
+    "\66\4\3\5\1\4\22\5\1\4\7\5\12\4\2\5\2\0\12\5"+
+    "\1\0\20\4\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0"+
+    "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0"+
+    "\2\5\2\0\3\5\1\4\10\0\1\5\4\0\2\4\1\0\3\4"+
+    "\2\5\2\0\12\5\4\4\7\0\2\4\1\0\1\5\2\0\3\5"+
+    "\1\0\6\4\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4"+
+    "\1\0\2\4\1\0\2\4\2\0\1\5\1\0\5\5\4\0\2\5"+
+    "\2\0\3\5\3\0\1\5\7\0\4\4\1\0\1\4\7\0\14\5"+
+    "\3\4\1\5\13\0\3\5\1\0\11\4\1\0\3\4\1\0\26\4"+
+    "\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5\1\4\10\5"+
+    "\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4\2\5\2\0"+
+    "\12\5\1\0\1\4\7\0\1\4\6\5\1\0\3\5\1\0\10\4"+
+    "\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4"+
+    "\2\0\1\5\1\4\7\5\2\0\2\5\2\0\3\5\7\0\3\5"+
+    "\4\0\2\4\1\0\3\4\2\5\2\0\12\5\1\0\1\4\20\0"+
+    "\1\5\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4"+
+    "\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0\14\4"+
+    "\4\0\5\5\3\0\3\5\1\0\4\5\2\0\1\4\6\0\1\5"+
+    "\16\0\12\5\11\0\1\4\6\0\5\5\10\4\1\0\3\4\1\0"+
+    "\27\4\1\0\20\4\3\0\1\4\7\5\1\0\3\5\1\0\4\5"+
+    "\7\0\2\5\1\0\3\4\5\0\2\4\2\5\2\0\12\5\20\0"+
+    "\1\4\3\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4"+
+    "\1\0\5\4\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5"+
+    "\7\0\2\5\7\0\1\4\1\0\2\4\2\5\2\0\12\5\1\0"+
+    "\2\4\15\0\4\5\11\4\1\0\3\4\1\0\51\4\2\5\1\4"+
+    "\7\5\1\0\3\5\1\0\4\5\1\4\5\0\3\4\1\5\7\0"+
+    "\3\4\2\5\2\0\12\5\12\0\6\4\1\0\3\5\1\0\22\4"+
+    "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5"+
+    "\4\0\6\5\1\0\1\5\1\0\10\5\6\0\12\5\2\0\2\5"+
+    "\15\0\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5"+
+    "\47\0\2\4\1\0\1\4\1\0\5\4\1\0\30\4\1\0\1\4"+
+    "\1\0\12\4\1\5\2\4\11\5\1\4\2\0\5\4\1\0\1\4"+
+    "\1\0\6\5\2\0\12\5\2\0\4\4\40\0\1\4\27\0\2\5"+
+    "\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5\4\0\2\5"+
+    "\10\4\1\0\44\4\4\0\24\5\1\0\2\5\5\4\13\5\1\0"+
+    "\44\5\11\0\1\5\71\0\53\4\24\5\1\4\12\5\6\0\6\4"+
+    "\4\5\4\4\3\5\1\4\3\5\2\4\7\5\3\4\4\5\15\4"+
+    "\14\5\1\4\17\5\2\0\46\4\1\0\1\4\5\0\1\4\2\0"+
+    "\53\4\1\0\u014d\4\1\0\4\4\2\0\7\4\1\0\1\4\1\0"+
+    "\4\4\2\0\51\4\1\0\4\4\2\0\41\4\1\0\4\4\2\0"+
+    "\7\4\1\0\1\4\1\0\4\4\2\0\17\4\1\0\71\4\1\0"+
+    "\4\4\2\0\103\4\2\0\3\5\40\0\20\4\20\0\126\4\2\0"+
+    "\6\4\3\0\u026c\4\2\0\21\4\1\0\32\4\5\0\113\4\3\0"+
+    "\13\4\7\0\15\4\1\0\4\4\3\5\13\0\22\4\3\5\13\0"+
+    "\22\4\2\5\14\0\15\4\1\0\3\4\1\0\2\5\14\0\64\4"+
+    "\40\5\3\0\1\4\3\0\2\4\1\5\2\0\12\5\41\0\4\5"+
+    "\1\0\12\5\6\0\131\4\7\0\5\4\2\5\42\4\1\5\1\4"+
+    "\5\0\106\4\12\0\37\4\1\0\14\5\4\0\14\5\12\0\12\5"+
+    "\36\4\2\0\5\4\13\0\54\4\4\0\32\4\6\0\12\5\46\0"+
+    "\27\4\5\5\4\0\65\4\12\5\1\0\35\5\2\0\13\5\6\0"+
+    "\12\5\15\0\1\4\10\0\16\5\1\0\2\5\77\0\5\5\57\4"+
+    "\21\5\7\4\4\0\12\5\21\0\11\5\14\0\3\5\36\4\15\5"+
+    "\2\4\12\5\54\4\16\5\14\0\44\4\24\5\10\0\12\5\3\0"+
+    "\3\4\12\5\44\4\2\0\11\4\7\0\53\4\2\0\3\4\20\0"+
+    "\3\5\1\0\25\5\4\4\1\5\6\4\1\5\2\4\3\5\1\4"+
+    "\5\0\300\4\72\5\1\0\5\5\u0116\4\2\0\6\4\2\0\46\4"+
+    "\2\0\6\4\2\0\10\4\1\0\1\4\1\0\1\4\1\0\1\4"+
+    "\1\0\37\4\2\0\65\4\1\0\7\4\1\0\1\4\3\0\3\4"+
+    "\1\0\7\4\3\0\4\4\2\0\6\4\4\0\15\4\5\0\3\4"+
+    "\1\0\7\4\16\0\5\5\32\0\5\5\20\0\2\4\23\0\1\4"+
+    "\13\0\5\5\1\0\12\5\1\0\1\4\15\0\1\4\20\0\15\4"+
+    "\3\0\40\4\20\0\15\5\4\0\1\5\3\0\14\5\21\0\1\4"+
+    "\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4\6\0\1\4"+
+    "\1\0\1\4\1\0\1\4\1\0\4\4\1\0\13\4\2\0\4\4"+
+    "\5\0\5\4\4\0\1\4\21\0\51\4\u0a77\0\57\4\1\0\57\4"+
+    "\1\0\205\4\6\0\4\4\3\5\2\4\14\0\46\4\1\0\1\4"+
+    "\5\0\1\4\2\0\70\4\7\0\1\4\17\0\1\5\27\4\11\0"+
     "\7\4\1\0\7\4\1\0\7\4\1\0\7\4\1\0\7\4\1\0"+
-    "\7\4\1\0\40\5\57\0\1\4\u01d5\0\3\4\31\0\11\4\6\5"+
-    "\1\0\5\4\2\0\5\4\4\0\126\4\2\0\2\5\2\0\3\4"+
-    "\1\0\132\4\1\0\4\4\5\0\52\4\2\0\136\4\21\0\33\4"+
-    "\65\0\20\4\u0200\0\u19b6\4\112\0\u51eb\4\25\0\u048d\4\103\0\56\4"+
-    "\2\0\u010d\4\3\0\20\4\12\5\2\4\24\0\57\4\1\5\4\0"+
-    "\12\5\1\0\37\4\2\5\120\4\2\5\45\0\11\4\2\0\147\4"+
-    "\2\0\44\4\1\0\10\4\77\0\13\4\1\5\3\4\1\5\4\4"+
-    "\1\5\27\4\5\5\20\0\1\4\7\0\64\4\14\0\2\5\62\4"+
-    "\22\5\12\0\12\5\6\0\22\5\6\4\3\0\1\4\1\0\1\4"+
-    "\2\0\12\5\34\4\10\5\2\0\27\4\15\5\14\0\35\4\3\0"+
-    "\4\5\57\4\16\5\16\0\1\4\12\5\6\0\5\4\1\5\12\4"+
-    "\12\5\5\4\1\0\51\4\16\5\11\0\3\4\1\5\10\4\2\5"+
-    "\2\0\12\5\6\0\27\4\3\0\1\4\3\5\62\4\1\5\1\4"+
-    "\3\5\2\4\2\5\5\4\2\5\1\4\1\5\1\4\30\0\3\4"+
-    "\2\0\13\4\5\5\2\0\3\4\2\5\12\0\6\4\2\0\6\4"+
-    "\2\0\6\4\11\0\7\4\1\0\7\4\1\0\53\4\1\0\12\4"+
-    "\12\0\163\4\10\5\1\0\2\5\2\0\12\5\6\0\u2ba4\4\14\0"+
-    "\27\4\4\0\61\4\u2104\0\u016e\4\2\0\152\4\46\0\7\4\14\0"+
-    "\5\4\5\0\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0"+
-    "\1\4\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0"+
-    "\100\4\2\0\66\4\50\0\15\4\3\0\20\5\20\0\20\5\3\0"+
-    "\2\4\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0"+
-    "\1\5\4\0\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0"+
-    "\32\4\13\0\131\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0"+
-    "\3\4\3\0\2\4\3\0\2\4\22\0\3\5\4\0";
+    "\7\4\1\0\7\4\1\0\7\4\1\0\40\5\57\0\1\4\u01d5\0"+
+    "\3\4\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4"+
+    "\2\0\2\5\2\0\3\4\1\0\132\4\1\0\4\4\5\0\53\4"+
+    "\1\0\136\4\21\0\40\4\60\0\20\4\u0200\0\u19c0\4\100\0\u51fd\4"+
+    "\3\0\u048d\4\103\0\56\4\2\0\u010d\4\3\0\20\4\12\5\2\4"+
+    "\24\0\57\4\1\5\4\0\12\5\1\0\37\4\2\5\120\4\2\5"+
+    "\45\0\11\4\2\0\147\4\2\0\65\4\2\0\11\4\52\0\15\4"+
+    "\1\5\3\4\1\5\4\4\1\5\27\4\5\5\4\0\1\5\13\0"+
+    "\1\4\7\0\64\4\14\0\2\5\62\4\22\5\12\0\12\5\6\0"+
+    "\22\5\6\4\3\0\1\4\1\0\2\4\13\5\34\4\10\5\2\0"+
+    "\27\4\15\5\14\0\35\4\3\0\4\5\57\4\16\5\16\0\1\4"+
+    "\12\5\6\0\5\4\1\5\12\4\12\5\5\4\1\0\51\4\16\5"+
+    "\11\0\3\4\1\5\10\4\2\5\2\0\12\5\6\0\27\4\3\0"+
+    "\1\4\3\5\62\4\1\5\1\4\3\5\2\4\2\5\5\4\2\5"+
+    "\1\4\1\5\1\4\30\0\3\4\2\0\13\4\5\5\2\0\3\4"+
+    "\2\5\12\0\6\4\2\0\6\4\2\0\6\4\11\0\7\4\1\0"+
+    "\7\4\1\0\53\4\1\0\16\4\6\0\163\4\10\5\1\0\2\5"+
+    "\2\0\12\5\6\0\u2ba4\4\14\0\27\4\4\0\61\4\u2104\0\u016e\4"+
+    "\2\0\152\4\46\0\7\4\14\0\5\4\5\0\1\4\1\5\12\4"+
+    "\1\0\15\4\1\0\5\4\1\0\1\4\1\0\2\4\1\0\2\4"+
+    "\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0\66\4\50\0\15\4"+
+    "\3\0\20\5\20\0\20\5\3\0\2\4\30\0\3\4\31\0\1\4"+
+    "\6\0\5\4\1\0\207\4\2\0\1\5\4\0\1\4\13\0\12\5"+
+    "\7\0\32\4\4\0\1\4\1\0\32\4\13\0\131\4\3\0\6\4"+
+    "\2\0\6\4\2\0\6\4\2\0\3\4\3\0\2\4\3\0\2\4"+
+    "\22\0\3\5\4\0";
 
   /** 
    * Translates characters to character classes
@@ -892,7 +892,7 @@ public String getTokenText() {
     char [] map = new char[0x10000];
     int i = 0;  /* index in packed string  */
     int j = 0;  /* index in unpacked array */
-    while (i < 2336) {
+    while (i < 2326) {
       int  count = packed.charAt(i++);
       char value = packed.charAt(i++);
       do map[j++] = value; while (--count > 0);
diff --git a/org.eclipse.xtend.ide.common/src-gen/org/eclipse/xtend/ide/common/contentassist/antlr/internal/InternalXtendFlexer.java b/org.eclipse.xtend.ide.common/src-gen/org/eclipse/xtend/ide/common/contentassist/antlr/internal/InternalXtendFlexer.java
index f8cc4317c58..0cbcbab8b59 100644
--- a/org.eclipse.xtend.ide.common/src-gen/org/eclipse/xtend/ide/common/contentassist/antlr/internal/InternalXtendFlexer.java
+++ b/org.eclipse.xtend.ide.common/src-gen/org/eclipse/xtend/ide/common/contentassist/antlr/internal/InternalXtendFlexer.java
@@ -61,109 +61,109 @@ class InternalXtendFlexer implements org.eclipse.xtend.core.parser.InternalFlexe
     "\16\0\5\4\7\0\1\4\1\0\1\4\21\0\160\5\5\4\1\0"+
     "\2\4\2\0\4\4\1\0\1\4\6\0\1\4\1\0\3\4\1\0"+
     "\1\4\1\0\24\4\1\0\123\4\1\0\213\4\1\0\5\5\2\0"+
-    "\246\4\1\0\46\4\2\0\1\4\7\0\47\4\7\0\1\4\1\0"+
+    "\246\4\1\0\46\4\2\0\1\4\6\0\51\4\6\0\1\4\1\0"+
     "\55\5\1\0\1\5\1\0\2\5\1\0\2\5\1\0\1\5\10\0"+
-    "\33\4\5\0\3\4\15\0\6\5\5\0\1\4\4\0\13\5\1\0"+
+    "\33\4\4\0\4\4\15\0\6\5\5\0\1\4\4\0\13\5\1\0"+
     "\1\5\3\0\53\4\37\5\4\0\2\4\1\5\143\4\1\0\1\4"+
     "\10\5\1\0\6\5\2\4\2\5\1\0\4\5\2\4\12\5\3\4"+
     "\2\0\1\4\17\0\1\5\1\4\1\5\36\4\33\5\2\0\131\4"+
-    "\13\5\1\4\16\0\12\5\41\4\11\5\2\4\4\0\1\4\5\0"+
-    "\26\4\4\5\1\4\11\5\1\4\3\5\1\4\5\5\22\0\31\4"+
-    "\3\5\4\0\13\4\65\0\25\4\1\0\10\4\26\0\60\5\66\4"+
-    "\3\5\1\4\22\5\1\4\7\5\12\4\2\5\2\0\12\5\1\0"+
-    "\20\4\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4"+
-    "\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0\2\5"+
-    "\2\0\3\5\1\4\10\0\1\5\4\0\2\4\1\0\3\4\2\5"+
-    "\2\0\12\5\4\4\7\0\2\4\4\0\3\5\1\0\6\4\4\0"+
-    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0"+
-    "\2\4\2\0\1\5\1\0\5\5\4\0\2\5\2\0\3\5\3\0"+
-    "\1\5\7\0\4\4\1\0\1\4\7\0\14\5\3\4\1\5\13\0"+
-    "\3\5\1\0\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0"+
-    "\2\4\1\0\5\4\2\0\1\5\1\4\10\5\1\0\3\5\1\0"+
-    "\3\5\2\0\1\4\17\0\2\4\2\5\2\0\12\5\1\0\1\4"+
-    "\7\0\1\4\6\5\1\0\3\5\1\0\10\4\2\0\2\4\2\0"+
-    "\26\4\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5\1\4"+
-    "\7\5\2\0\2\5\2\0\3\5\10\0\2\5\4\0\2\4\1\0"+
-    "\3\4\2\5\2\0\12\5\1\0\1\4\20\0\1\5\1\4\1\0"+
-    "\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0\1\4\1\0"+
-    "\2\4\3\0\2\4\3\0\3\4\3\0\14\4\4\0\5\5\3\0"+
-    "\3\5\1\0\4\5\2\0\1\4\6\0\1\5\16\0\12\5\11\0"+
-    "\1\4\6\0\4\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0"+
-    "\20\4\3\0\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5"+
-    "\1\0\3\4\5\0\2\4\2\5\2\0\12\5\20\0\1\4\3\5"+
-    "\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4"+
-    "\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5\7\0\2\5"+
-    "\7\0\1\4\1\0\2\4\2\5\2\0\12\5\1\0\2\4\15\0"+
-    "\4\5\1\0\10\4\1\0\3\4\1\0\51\4\2\5\1\4\7\5"+
-    "\1\0\3\5\1\0\4\5\1\4\5\0\3\4\1\5\7\0\3\4"+
-    "\2\5\2\0\12\5\12\0\6\4\2\0\2\5\1\0\22\4\3\0"+
-    "\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5\4\0"+
-    "\6\5\1\0\1\5\1\0\10\5\6\0\12\5\2\0\2\5\15\0"+
-    "\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5\47\0"+
-    "\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0"+
-    "\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0"+
-    "\2\4\1\0\4\4\1\5\2\4\6\5\1\0\2\5\1\4\2\0"+
-    "\5\4\1\0\1\4\1\0\6\5\2\0\12\5\2\0\4\4\40\0"+
-    "\1\4\27\0\2\5\6\0\12\5\13\0\1\5\1\0\1\5\1\0"+
-    "\1\5\4\0\2\5\10\4\1\0\44\4\4\0\24\5\1\0\2\5"+
-    "\5\4\13\5\1\0\44\5\11\0\1\5\71\0\53\4\24\5\1\4"+
-    "\12\5\6\0\6\4\4\5\4\4\3\5\1\4\3\5\2\4\7\5"+
-    "\3\4\4\5\15\4\14\5\1\4\17\5\2\0\46\4\1\0\1\4"+
-    "\5\0\1\4\2\0\53\4\1\0\u014d\4\1\0\4\4\2\0\7\4"+
-    "\1\0\1\4\1\0\4\4\2\0\51\4\1\0\4\4\2\0\41\4"+
-    "\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\17\4"+
-    "\1\0\71\4\1\0\4\4\2\0\103\4\2\0\3\5\40\0\20\4"+
-    "\20\0\126\4\2\0\6\4\3\0\u026c\4\2\0\21\4\1\0\32\4"+
-    "\5\0\113\4\3\0\13\4\7\0\15\4\1\0\4\4\3\5\13\0"+
-    "\22\4\3\5\13\0\22\4\2\5\14\0\15\4\1\0\3\4\1\0"+
-    "\2\5\14\0\64\4\40\5\3\0\1\4\3\0\2\4\1\5\2\0"+
-    "\12\5\41\0\4\5\1\0\12\5\6\0\130\4\10\0\5\4\2\5"+
-    "\42\4\1\5\1\4\5\0\106\4\12\0\37\4\1\0\14\5\4\0"+
-    "\14\5\12\0\12\5\36\4\2\0\5\4\13\0\54\4\4\0\32\4"+
-    "\6\0\12\5\46\0\27\4\5\5\4\0\65\4\12\5\1\0\35\5"+
-    "\2\0\13\5\6\0\12\5\15\0\1\4\10\0\16\5\102\0\5\5"+
-    "\57\4\21\5\7\4\4\0\12\5\21\0\11\5\14\0\3\5\36\4"+
-    "\15\5\2\4\12\5\54\4\16\5\14\0\44\4\24\5\10\0\12\5"+
-    "\3\0\3\4\12\5\44\4\2\0\11\4\107\0\3\5\1\0\25\5"+
-    "\4\4\1\5\4\4\3\5\2\4\3\5\6\0\300\4\72\5\1\0"+
-    "\5\5\u0116\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4"+
-    "\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4"+
-    "\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4"+
-    "\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\16\0\5\5"+
-    "\32\0\5\5\20\0\2\4\23\0\1\4\13\0\5\5\1\0\12\5"+
-    "\1\0\1\4\15\0\1\4\20\0\15\4\3\0\40\4\20\0\15\5"+
-    "\4\0\1\5\3\0\14\5\21\0\1\4\4\0\1\4\2\0\12\4"+
-    "\1\0\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4"+
-    "\1\0\4\4\1\0\13\4\2\0\4\4\5\0\5\4\4\0\1\4"+
-    "\21\0\51\4\u0a77\0\57\4\1\0\57\4\1\0\205\4\6\0\4\4"+
-    "\3\5\2\4\14\0\46\4\1\0\1\4\5\0\1\4\2\0\70\4"+
-    "\7\0\1\4\17\0\1\5\27\4\11\0\7\4\1\0\7\4\1\0"+
+    "\13\5\1\4\16\0\12\5\41\4\11\5\2\4\4\0\1\4\2\0"+
+    "\1\5\30\4\4\5\1\4\11\5\1\4\3\5\1\4\5\5\22\0"+
+    "\31\4\3\5\4\0\13\4\65\0\25\4\1\0\22\4\13\0\61\5"+
+    "\66\4\3\5\1\4\22\5\1\4\7\5\12\4\2\5\2\0\12\5"+
+    "\1\0\20\4\3\5\1\0\10\4\2\0\2\4\2\0\26\4\1\0"+
+    "\7\4\1\0\1\4\3\0\4\4\2\0\1\5\1\4\7\5\2\0"+
+    "\2\5\2\0\3\5\1\4\10\0\1\5\4\0\2\4\1\0\3\4"+
+    "\2\5\2\0\12\5\4\4\7\0\2\4\1\0\1\5\2\0\3\5"+
+    "\1\0\6\4\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4"+
+    "\1\0\2\4\1\0\2\4\2\0\1\5\1\0\5\5\4\0\2\5"+
+    "\2\0\3\5\3\0\1\5\7\0\4\4\1\0\1\4\7\0\14\5"+
+    "\3\4\1\5\13\0\3\5\1\0\11\4\1\0\3\4\1\0\26\4"+
+    "\1\0\7\4\1\0\2\4\1\0\5\4\2\0\1\5\1\4\10\5"+
+    "\1\0\3\5\1\0\3\5\2\0\1\4\17\0\2\4\2\5\2\0"+
+    "\12\5\1\0\1\4\7\0\1\4\6\5\1\0\3\5\1\0\10\4"+
+    "\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4"+
+    "\2\0\1\5\1\4\7\5\2\0\2\5\2\0\3\5\7\0\3\5"+
+    "\4\0\2\4\1\0\3\4\2\5\2\0\12\5\1\0\1\4\20\0"+
+    "\1\5\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4"+
+    "\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0\14\4"+
+    "\4\0\5\5\3\0\3\5\1\0\4\5\2\0\1\4\6\0\1\5"+
+    "\16\0\12\5\11\0\1\4\6\0\5\5\10\4\1\0\3\4\1\0"+
+    "\27\4\1\0\20\4\3\0\1\4\7\5\1\0\3\5\1\0\4\5"+
+    "\7\0\2\5\1\0\3\4\5\0\2\4\2\5\2\0\12\5\20\0"+
+    "\1\4\3\5\1\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4"+
+    "\1\0\5\4\2\0\1\5\1\4\7\5\1\0\3\5\1\0\4\5"+
+    "\7\0\2\5\7\0\1\4\1\0\2\4\2\5\2\0\12\5\1\0"+
+    "\2\4\15\0\4\5\11\4\1\0\3\4\1\0\51\4\2\5\1\4"+
+    "\7\5\1\0\3\5\1\0\4\5\1\4\5\0\3\4\1\5\7\0"+
+    "\3\4\2\5\2\0\12\5\12\0\6\4\1\0\3\5\1\0\22\4"+
+    "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\3\0\1\5"+
+    "\4\0\6\5\1\0\1\5\1\0\10\5\6\0\12\5\2\0\2\5"+
+    "\15\0\60\4\1\5\2\4\7\5\4\0\10\4\10\5\1\0\12\5"+
+    "\47\0\2\4\1\0\1\4\1\0\5\4\1\0\30\4\1\0\1\4"+
+    "\1\0\12\4\1\5\2\4\11\5\1\4\2\0\5\4\1\0\1\4"+
+    "\1\0\6\5\2\0\12\5\2\0\4\4\40\0\1\4\27\0\2\5"+
+    "\6\0\12\5\13\0\1\5\1\0\1\5\1\0\1\5\4\0\2\5"+
+    "\10\4\1\0\44\4\4\0\24\5\1\0\2\5\5\4\13\5\1\0"+
+    "\44\5\11\0\1\5\71\0\53\4\24\5\1\4\12\5\6\0\6\4"+
+    "\4\5\4\4\3\5\1\4\3\5\2\4\7\5\3\4\4\5\15\4"+
+    "\14\5\1\4\17\5\2\0\46\4\1\0\1\4\5\0\1\4\2\0"+
+    "\53\4\1\0\u014d\4\1\0\4\4\2\0\7\4\1\0\1\4\1\0"+
+    "\4\4\2\0\51\4\1\0\4\4\2\0\41\4\1\0\4\4\2\0"+
+    "\7\4\1\0\1\4\1\0\4\4\2\0\17\4\1\0\71\4\1\0"+
+    "\4\4\2\0\103\4\2\0\3\5\40\0\20\4\20\0\126\4\2\0"+
+    "\6\4\3\0\u026c\4\2\0\21\4\1\0\32\4\5\0\113\4\3\0"+
+    "\13\4\7\0\15\4\1\0\4\4\3\5\13\0\22\4\3\5\13\0"+
+    "\22\4\2\5\14\0\15\4\1\0\3\4\1\0\2\5\14\0\64\4"+
+    "\40\5\3\0\1\4\3\0\2\4\1\5\2\0\12\5\41\0\4\5"+
+    "\1\0\12\5\6\0\131\4\7\0\5\4\2\5\42\4\1\5\1\4"+
+    "\5\0\106\4\12\0\37\4\1\0\14\5\4\0\14\5\12\0\12\5"+
+    "\36\4\2\0\5\4\13\0\54\4\4\0\32\4\6\0\12\5\46\0"+
+    "\27\4\5\5\4\0\65\4\12\5\1\0\35\5\2\0\13\5\6\0"+
+    "\12\5\15\0\1\4\10\0\16\5\1\0\2\5\77\0\5\5\57\4"+
+    "\21\5\7\4\4\0\12\5\21\0\11\5\14\0\3\5\36\4\15\5"+
+    "\2\4\12\5\54\4\16\5\14\0\44\4\24\5\10\0\12\5\3\0"+
+    "\3\4\12\5\44\4\2\0\11\4\7\0\53\4\2\0\3\4\20\0"+
+    "\3\5\1\0\25\5\4\4\1\5\6\4\1\5\2\4\3\5\1\4"+
+    "\5\0\300\4\72\5\1\0\5\5\u0116\4\2\0\6\4\2\0\46\4"+
+    "\2\0\6\4\2\0\10\4\1\0\1\4\1\0\1\4\1\0\1\4"+
+    "\1\0\37\4\2\0\65\4\1\0\7\4\1\0\1\4\3\0\3\4"+
+    "\1\0\7\4\3\0\4\4\2\0\6\4\4\0\15\4\5\0\3\4"+
+    "\1\0\7\4\16\0\5\5\32\0\5\5\20\0\2\4\23\0\1\4"+
+    "\13\0\5\5\1\0\12\5\1\0\1\4\15\0\1\4\20\0\15\4"+
+    "\3\0\40\4\20\0\15\5\4\0\1\5\3\0\14\5\21\0\1\4"+
+    "\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4\6\0\1\4"+
+    "\1\0\1\4\1\0\1\4\1\0\4\4\1\0\13\4\2\0\4\4"+
+    "\5\0\5\4\4\0\1\4\21\0\51\4\u0a77\0\57\4\1\0\57\4"+
+    "\1\0\205\4\6\0\4\4\3\5\2\4\14\0\46\4\1\0\1\4"+
+    "\5\0\1\4\2\0\70\4\7\0\1\4\17\0\1\5\27\4\11\0"+
     "\7\4\1\0\7\4\1\0\7\4\1\0\7\4\1\0\7\4\1\0"+
-    "\7\4\1\0\40\5\57\0\1\4\u01d5\0\3\4\31\0\11\4\6\5"+
-    "\1\0\5\4\2\0\5\4\4\0\126\4\2\0\2\5\2\0\3\4"+
-    "\1\0\132\4\1\0\4\4\5\0\52\4\2\0\136\4\21\0\33\4"+
-    "\65\0\20\4\u0200\0\u19b6\4\112\0\u51eb\4\25\0\u048d\4\103\0\56\4"+
-    "\2\0\u010d\4\3\0\20\4\12\5\2\4\24\0\57\4\1\5\4\0"+
-    "\12\5\1\0\37\4\2\5\120\4\2\5\45\0\11\4\2\0\147\4"+
-    "\2\0\44\4\1\0\10\4\77\0\13\4\1\5\3\4\1\5\4\4"+
-    "\1\5\27\4\5\5\20\0\1\4\7\0\64\4\14\0\2\5\62\4"+
-    "\22\5\12\0\12\5\6\0\22\5\6\4\3\0\1\4\1\0\1\4"+
-    "\2\0\12\5\34\4\10\5\2\0\27\4\15\5\14\0\35\4\3\0"+
-    "\4\5\57\4\16\5\16\0\1\4\12\5\6\0\5\4\1\5\12\4"+
-    "\12\5\5\4\1\0\51\4\16\5\11\0\3\4\1\5\10\4\2\5"+
-    "\2\0\12\5\6\0\27\4\3\0\1\4\3\5\62\4\1\5\1\4"+
-    "\3\5\2\4\2\5\5\4\2\5\1\4\1\5\1\4\30\0\3\4"+
-    "\2\0\13\4\5\5\2\0\3\4\2\5\12\0\6\4\2\0\6\4"+
-    "\2\0\6\4\11\0\7\4\1\0\7\4\1\0\53\4\1\0\12\4"+
-    "\12\0\163\4\10\5\1\0\2\5\2\0\12\5\6\0\u2ba4\4\14\0"+
-    "\27\4\4\0\61\4\u2104\0\u016e\4\2\0\152\4\46\0\7\4\14\0"+
-    "\5\4\5\0\1\4\1\5\12\4\1\0\15\4\1\0\5\4\1\0"+
-    "\1\4\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0"+
-    "\100\4\2\0\66\4\50\0\15\4\3\0\20\5\20\0\20\5\3\0"+
-    "\2\4\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4\2\0"+
-    "\1\5\4\0\1\4\13\0\12\5\7\0\32\4\4\0\1\4\1\0"+
-    "\32\4\13\0\131\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0"+
-    "\3\4\3\0\2\4\3\0\2\4\22\0\3\5\4\0";
+    "\7\4\1\0\7\4\1\0\7\4\1\0\40\5\57\0\1\4\u01d5\0"+
+    "\3\4\31\0\11\4\6\5\1\0\5\4\2\0\5\4\4\0\126\4"+
+    "\2\0\2\5\2\0\3\4\1\0\132\4\1\0\4\4\5\0\53\4"+
+    "\1\0\136\4\21\0\40\4\60\0\20\4\u0200\0\u19c0\4\100\0\u51fd\4"+
+    "\3\0\u048d\4\103\0\56\4\2\0\u010d\4\3\0\20\4\12\5\2\4"+
+    "\24\0\57\4\1\5\4\0\12\5\1\0\37\4\2\5\120\4\2\5"+
+    "\45\0\11\4\2\0\147\4\2\0\65\4\2\0\11\4\52\0\15\4"+
+    "\1\5\3\4\1\5\4\4\1\5\27\4\5\5\4\0\1\5\13\0"+
+    "\1\4\7\0\64\4\14\0\2\5\62\4\22\5\12\0\12\5\6\0"+
+    "\22\5\6\4\3\0\1\4\1\0\2\4\13\5\34\4\10\5\2\0"+
+    "\27\4\15\5\14\0\35\4\3\0\4\5\57\4\16\5\16\0\1\4"+
+    "\12\5\6\0\5\4\1\5\12\4\12\5\5\4\1\0\51\4\16\5"+
+    "\11\0\3\4\1\5\10\4\2\5\2\0\12\5\6\0\27\4\3\0"+
+    "\1\4\3\5\62\4\1\5\1\4\3\5\2\4\2\5\5\4\2\5"+
+    "\1\4\1\5\1\4\30\0\3\4\2\0\13\4\5\5\2\0\3\4"+
+    "\2\5\12\0\6\4\2\0\6\4\2\0\6\4\11\0\7\4\1\0"+
+    "\7\4\1\0\53\4\1\0\16\4\6\0\163\4\10\5\1\0\2\5"+
+    "\2\0\12\5\6\0\u2ba4\4\14\0\27\4\4\0\61\4\u2104\0\u016e\4"+
+    "\2\0\152\4\46\0\7\4\14\0\5\4\5\0\1\4\1\5\12\4"+
+    "\1\0\15\4\1\0\5\4\1\0\1\4\1\0\2\4\1\0\2\4"+
+    "\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0\66\4\50\0\15\4"+
+    "\3\0\20\5\20\0\20\5\3\0\2\4\30\0\3\4\31\0\1\4"+
+    "\6\0\5\4\1\0\207\4\2\0\1\5\4\0\1\4\13\0\12\5"+
+    "\7\0\32\4\4\0\1\4\1\0\32\4\13\0\131\4\3\0\6\4"+
+    "\2\0\6\4\2\0\6\4\2\0\3\4\3\0\2\4\3\0\2\4"+
+    "\22\0\3\5\4\0";
 
   /** 
    * Translates characters to character classes
@@ -892,7 +892,7 @@ public String getTokenText() {
     char [] map = new char[0x10000];
     int i = 0;  /* index in packed string  */
     int j = 0;  /* index in unpacked array */
-    while (i < 2336) {
+    while (i < 2326) {
       int  count = packed.charAt(i++);
       char value = packed.charAt(i++);
       do map[j++] = value; while (--count > 0);
diff --git a/org.eclipse.xtend.ide/src-gen/org/eclipse/xtend/ide/internal/XtendActivator.java b/org.eclipse.xtend.ide/src-gen/org/eclipse/xtend/ide/internal/XtendActivator.java
index 71885891c91..e341bb24586 100644
--- a/org.eclipse.xtend.ide/src-gen/org/eclipse/xtend/ide/internal/XtendActivator.java
+++ b/org.eclipse.xtend.ide/src-gen/org/eclipse/xtend/ide/internal/XtendActivator.java
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtend.ide.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class XtendActivator extends AbstractUIPlugin {
 	
 	private static XtendActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.purexbase.eclipse.tests/src-gen/org/eclipse/xtext/purexbase/ui/tests/PureXbaseUiInjectorProvider.java b/org.eclipse.xtext.purexbase.eclipse.tests/src-gen/org/eclipse/xtext/purexbase/ui/tests/PureXbaseUiInjectorProvider.java
index 1cab411590d..28ce70cbeaa 100644
--- a/org.eclipse.xtext.purexbase.eclipse.tests/src-gen/org/eclipse/xtext/purexbase/ui/tests/PureXbaseUiInjectorProvider.java
+++ b/org.eclipse.xtext.purexbase.eclipse.tests/src-gen/org/eclipse/xtext/purexbase/ui/tests/PureXbaseUiInjectorProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/AbstractPureXbaseIdeModule.java b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/AbstractPureXbaseIdeModule.java
index 362f57e334d..51054d97082 100644
--- a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/AbstractPureXbaseIdeModule.java
+++ b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/AbstractPureXbaseIdeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PartialPureXbaseContentAssistParser.java b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PartialPureXbaseContentAssistParser.java
index 3c7a8e749dd..812da290982 100644
--- a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PartialPureXbaseContentAssistParser.java
+++ b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PartialPureXbaseContentAssistParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PureXbaseParser.java b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PureXbaseParser.java
index 6ec5f5f3ebd..ef9d6c79263 100644
--- a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PureXbaseParser.java
+++ b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/PureXbaseParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbase.g b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbase.g
index 23bfb78d093..58394692073 100644
--- a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbase.g
+++ b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbase.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbaseParser.java b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbaseParser.java
index bf76a0a8b16..bbbc1d79c94 100644
--- a/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbaseParser.java
+++ b/org.eclipse.xtext.purexbase.ide/src-gen/org/eclipse/xtext/purexbase/ide/contentassist/antlr/internal/InternalPureXbaseParser.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/AbstractPureXbaseUiModule.java b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/AbstractPureXbaseUiModule.java
index 4e5b8f5bb4a..7e5bd03be37 100644
--- a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/AbstractPureXbaseUiModule.java
+++ b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/AbstractPureXbaseUiModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/PureXbaseExecutableExtensionFactory.java b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/PureXbaseExecutableExtensionFactory.java
index fe2311bb5d0..27bdacab6f0 100644
--- a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/PureXbaseExecutableExtensionFactory.java
+++ b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/PureXbaseExecutableExtensionFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/contentassist/AbstractPureXbaseProposalProvider.java b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/contentassist/AbstractPureXbaseProposalProvider.java
index 2bdfc7e6973..dabd1a83a7f 100644
--- a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/contentassist/AbstractPureXbaseProposalProvider.java
+++ b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/contentassist/AbstractPureXbaseProposalProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/editor/PureXbaseEditor.java b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/editor/PureXbaseEditor.java
index af4834d0515..577f55564d9 100644
--- a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/editor/PureXbaseEditor.java
+++ b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/editor/PureXbaseEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/internal/PurexbaseActivator.java b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/internal/PurexbaseActivator.java
index 220f6143349..9820925d0f9 100644
--- a/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/internal/PurexbaseActivator.java
+++ b/org.eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/internal/PurexbaseActivator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.purexbase.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class PurexbaseActivator extends AbstractUIPlugin {
 	
 	private static PurexbaseActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel b/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel
index 6b93e09bb2a..8032aad6879 100644
--- a/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel
+++ b/org.eclipse.xtext.purexbase/model/generated/PureXbase.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2024 itemis AG (http://www.itemis.eu) and others.&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
     modelDirectory="/org.eclipse.xtext.purexbase/src-gen" modelPluginID="org.eclipse.xtext.purexbase"
     forceOverwrite="true" modelName="PureXbase" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     complianceLevel="17.0" copyrightFields="false" runtimeVersion="2.36" usedGenPackages="platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xbase platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel#//xtype">
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/AbstractPureXbaseRuntimeModule.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/AbstractPureXbaseRuntimeModule.java
index 0a7b6cae36e..3c56b794c28 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/AbstractPureXbaseRuntimeModule.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/AbstractPureXbaseRuntimeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/PureXbaseStandaloneSetupGenerated.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/PureXbaseStandaloneSetupGenerated.java
index 5546d5c25fc..8226060071d 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/PureXbaseStandaloneSetupGenerated.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/PureXbaseStandaloneSetupGenerated.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseAntlrTokenFileProvider.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseAntlrTokenFileProvider.java
index c41f84a15a0..5cc62b5eeda 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseAntlrTokenFileProvider.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseAntlrTokenFileProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseParser.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseParser.java
index 63f4e44abb8..186faf5ec2a 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseParser.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/PureXbaseParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbase.g b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbase.g
index efb55ee18d6..52b435ff5bd 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbase.g
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbase.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbaseParser.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbaseParser.java
index 2a84b26defa..9a1eb0903c2 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbaseParser.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbaseParser.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/Model.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/Model.java
index f9bb844547e..7cafd61682e 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/Model.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/Model.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbaseFactory.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbaseFactory.java
index 7d738e18c6c..5ff36de39b4 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbaseFactory.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbaseFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbasePackage.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbasePackage.java
index b31b2970a14..bc5552901c5 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbasePackage.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/PureXbasePackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/ModelImpl.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/ModelImpl.java
index 5fa3e37c35e..a27a55f10e1 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/ModelImpl.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/ModelImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbaseFactoryImpl.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbaseFactoryImpl.java
index 968dff002f1..cb479117185 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbaseFactoryImpl.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbaseFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbasePackageImpl.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbasePackageImpl.java
index 2ce29d1346b..6d32fc6fb9f 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbasePackageImpl.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/impl/PureXbasePackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
@@ -58,7 +58,6 @@ private PureXbasePackageImpl()
   {
     super(eNS_URI, PureXbaseFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseAdapterFactory.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseAdapterFactory.java
index 9c1fa6bc1df..680d8fd7da8 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseAdapterFactory.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseSwitch.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseSwitch.java
index 366ce4b7c2a..d2dfd5ac111 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseSwitch.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/pureXbase/util/PureXbaseSwitch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/scoping/AbstractPureXbaseScopeProvider.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/scoping/AbstractPureXbaseScopeProvider.java
index fd8b5a8a017..37fbab7d090 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/scoping/AbstractPureXbaseScopeProvider.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/scoping/AbstractPureXbaseScopeProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSemanticSequencer.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSemanticSequencer.java
index 94f97ea861c..79e8e1f1ffb 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSemanticSequencer.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSemanticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSyntacticSequencer.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSyntacticSequencer.java
index b9cb6305e71..e00c4791065 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSyntacticSequencer.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/serializer/PureXbaseSyntacticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/services/PureXbaseGrammarAccess.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/services/PureXbaseGrammarAccess.java
index 6cc4f367a57..009579e4830 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/services/PureXbaseGrammarAccess.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/services/PureXbaseGrammarAccess.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/validation/AbstractPureXbaseValidator.java b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/validation/AbstractPureXbaseValidator.java
index e1c18b0804c..15c0bd821e3 100644
--- a/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/validation/AbstractPureXbaseValidator.java
+++ b/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/validation/AbstractPureXbaseValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2011, 2024 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.
diff --git a/org.eclipse.xtext.relengutil/.classpath b/org.eclipse.xtext.relengutil/.classpath
index a197b3cb4e8..7931ec26b91 100644
--- a/org.eclipse.xtext.relengutil/.classpath
+++ b/org.eclipse.xtext.relengutil/.classpath
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.xtext.relengutil/.gitignore b/org.eclipse.xtext.relengutil/.gitignore
new file mode 100644
index 00000000000..6eba84d486f
--- /dev/null
+++ b/org.eclipse.xtext.relengutil/.gitignore
@@ -0,0 +1,2 @@
+.antlr-generator-*.jar
+.jflex.jar
diff --git a/org.eclipse.xtext.relengutil/.project b/org.eclipse.xtext.relengutil/.project
index a47c57c06a7..99990bbb7e2 100644
--- a/org.eclipse.xtext.relengutil/.project
+++ b/org.eclipse.xtext.relengutil/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,9 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF b/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF
index c377fcd3de5..3fdf33c4ec2 100644
--- a/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.relengutil/META-INF/MANIFEST.MF
@@ -6,7 +6,18 @@ Bundle-Version: 2.38.0.qualifier
 Bundle-Vendor: Eclipse Xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.xtext.util;bundle-version="2.38.0",
- org.eclipse.m2e.maven.runtime;bundle-version="3.9.600"
+ org.eclipse.m2e.maven.runtime;bundle-version="3.9.600",
+ org.eclipse.xtext.xtext.generator.dependencies;bundle-version="2.38.0",
+ org.eclipse.xtext.purexbase;bundle-version="2.38.0",
+ org.eclipse.xtext.xtext.bootstrap;bundle-version="2.38.0",
+ org.eclipse.xtext.ui.codetemplates;bundle-version="2.38.0",
+ org.eclipse.xtend.core;bundle-version="2.38.0",
+ org.eclipse.xtext.example.arithmetics;bundle-version="2.38.0";resolution:=optional,
+ org.eclipse.xtext.example.domainmodel;bundle-version="2.38.0";resolution:=optional,
+ org.eclipse.xtext.example.fowlerdsl;bundle-version="2.38.0";resolution:=optional,
+ org.eclipse.xtext.example.homeautomation;bundle-version="2.38.0";resolution:=optional
 Automatic-Module-Name: org.eclipse.xtext.relengutil
 Eclipse-SourceReferences: eclipseSourceReferences
-Import-Package: org.apache.log4j;version="1.2.26"
+Import-Package: org.apache.log4j;version="1.2.26",
+ org.slf4j;version="[2.0.0,3.0.0)",
+ org.slf4j.simple;version="[2.0.0,3.0.0)"
diff --git a/org.eclipse.xtext.relengutil/pom.xml b/org.eclipse.xtext.relengutil/pom.xml
index e41fa9aed32..64f70140a46 100644
--- a/org.eclipse.xtext.relengutil/pom.xml
+++ b/org.eclipse.xtext.relengutil/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.xtext</groupId>
@@ -11,4 +13,31 @@
 
 	<name>Xtext Release Engineering Utilities</name>
 	<description>Utilities to perform maintenance work in Xtext.</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.web.example.entities</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.web.example.statemachine</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<dependency-resolution>
+						<optionalDependencies>ignore</optionalDependencies>
+					</dependency-resolution>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/GenerateAllExamples.mwe2 b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/GenerateAllExamples.mwe2
new file mode 100644
index 00000000000..c2bb9018275
--- /dev/null
+++ b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/GenerateAllExamples.mwe2
@@ -0,0 +1,36 @@
+
+module org.eclipse.xtext.relengutil.GenerateAllXbase
+
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.xtext.generator.*
+
+import org.eclipse.xtext.xtext.generator.*
+import org.eclipse.xtext.xtext.generator.model.project.*
+
+var rootPath = "../org.eclipse.xtext.xtext.ui.examples/projects"
+
+/**
+ * Must run with -Dslf4j.provider=org.slf4j.simple.SimpleServiceProvider
+ */
+Workflow {
+	component = @org.eclipse.xtext.example.arithmetics.GenerateArithmetics {
+		rootPath = "${rootPath}/arithmetics"
+	}
+	component = @org.eclipse.xtext.example.domainmodel.GenerateDomainmodelLanguage {
+		rootPath = "${rootPath}/domainmodel"
+	}
+	component = @org.eclipse.xtext.example.fowlerdsl.GenerateStatemachine {
+		rootPath = "${rootPath}/fowlerdsl"
+	}
+	component = @org.eclipse.xtext.example.homeautomation.GenerateRuleEngine {
+		rootPath = "${rootPath}/homeautomation"
+	}
+	component = @org.eclipse.xtext.web.example.entities.GenerateEntities {
+		rootPath = ".."
+	}
+	component = @org.eclipse.xtext.web.example.statemachine.GenerateStatemachine {
+		rootPath = ".."
+	}
+}
+
+
diff --git a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/GenerateAllXbase.mwe2 b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/GenerateAllXbase.mwe2
new file mode 100644
index 00000000000..bed2997f84a
--- /dev/null
+++ b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/GenerateAllXbase.mwe2
@@ -0,0 +1,23 @@
+
+module org.eclipse.xtext.relengutil.GenerateAllXbase
+
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.xtext.generator.*
+
+import org.eclipse.xtext.xtext.generator.*
+import org.eclipse.xtext.xtext.generator.model.project.*
+
+var rootPath = ".."
+
+/**
+ * Must run with -Dslf4j.provider=org.slf4j.simple.SimpleServiceProvider
+ */
+Workflow {
+	component = @org.eclipse.xtext.xtext.bootstrap.GenerateXtext auto-inject {}
+	component = @org.eclipse.xtext.ui.codetemplates.GenerateCodetemplateLanguages auto-inject {}
+	component = XbaseGeneratorComponent auto-inject {}
+	component = @org.eclipse.xtext.purexbase.PureXbase auto-inject {}
+	component = @org.eclipse.xtend.core.GenerateXtend auto-inject {}
+}
+
+
diff --git a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/XbaseGeneratorComponent.java b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/XbaseGeneratorComponent.java
new file mode 100644
index 00000000000..797101602d0
--- /dev/null
+++ b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/XbaseGeneratorComponent.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2024 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.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.xtext.relengutil;
+
+import org.eclipse.emf.mwe.core.WorkflowContext;
+import org.eclipse.emf.mwe.core.issues.Issues;
+import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2;
+import org.eclipse.emf.mwe.core.monitor.ProgressMonitor;
+import org.eclipse.emf.mwe2.runtime.Mandatory;
+
+/**
+ * MWE2 wrapper around the GenerateXbase class.
+ */
+public class XbaseGeneratorComponent extends AbstractWorkflowComponent2 {
+
+	private String rootPath;
+	
+	public XbaseGeneratorComponent() {}
+	
+	@Mandatory
+	public void setRootPath(String rootPath) {
+		this.rootPath = rootPath;
+	}
+	
+	@Override
+	protected void invokeInternal(WorkflowContext ctx, ProgressMonitor monitor, Issues issues) {
+		try {
+			var generateXbase = Class.forName("org.eclipse.xtext.xbase.GenerateXbase");
+			var main = generateXbase.getMethod("main", String[].class);
+			main.invoke(null, new Object[] {  new String[] {rootPath} });
+		} catch(ReflectiveOperationException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+}
diff --git a/org.eclipse.xtext.ui.codetemplates.ui/src-gen/org/eclipse/xtext/ui/codetemplates/ui/internal/CodetemplatesActivator.java b/org.eclipse.xtext.ui.codetemplates.ui/src-gen/org/eclipse/xtext/ui/codetemplates/ui/internal/CodetemplatesActivator.java
index cba5fede9d4..e5051f63b25 100644
--- a/org.eclipse.xtext.ui.codetemplates.ui/src-gen/org/eclipse/xtext/ui/codetemplates/ui/internal/CodetemplatesActivator.java
+++ b/org.eclipse.xtext.ui.codetemplates.ui/src-gen/org/eclipse/xtext/ui/codetemplates/ui/internal/CodetemplatesActivator.java
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.ui.codetemplates.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -37,7 +37,7 @@ public class CodetemplatesActivator extends AbstractUIPlugin {
 	
 	private static CodetemplatesActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.ui.codetemplates/src-gen/org/eclipse/xtext/ui/codetemplates/templates/impl/TemplatesPackageImpl.java b/org.eclipse.xtext.ui.codetemplates/src-gen/org/eclipse/xtext/ui/codetemplates/templates/impl/TemplatesPackageImpl.java
index 36480b0c019..c3e5551b1f3 100644
--- a/org.eclipse.xtext.ui.codetemplates/src-gen/org/eclipse/xtext/ui/codetemplates/templates/impl/TemplatesPackageImpl.java
+++ b/org.eclipse.xtext.ui.codetemplates/src-gen/org/eclipse/xtext/ui/codetemplates/templates/impl/TemplatesPackageImpl.java
@@ -104,7 +104,6 @@ private TemplatesPackageImpl()
   {
     super(eNS_URI, TemplatesFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.web.example.entities/src-gen/org/eclipse/xtext/web/example/entities/domainmodel/impl/DomainmodelPackageImpl.java b/org.eclipse.xtext.web.example.entities/src-gen/org/eclipse/xtext/web/example/entities/domainmodel/impl/DomainmodelPackageImpl.java
index 52e99681a49..676fe024a29 100644
--- a/org.eclipse.xtext.web.example.entities/src-gen/org/eclipse/xtext/web/example/entities/domainmodel/impl/DomainmodelPackageImpl.java
+++ b/org.eclipse.xtext.web.example.entities/src-gen/org/eclipse/xtext/web/example/entities/domainmodel/impl/DomainmodelPackageImpl.java
@@ -107,7 +107,6 @@ private DomainmodelPackageImpl()
   {
     super(eNS_URI, DomainmodelFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.web.example.statemachine/src-gen/org/eclipse/xtext/web/example/statemachine/statemachine/impl/StatemachinePackageImpl.java b/org.eclipse.xtext.web.example.statemachine/src-gen/org/eclipse/xtext/web/example/statemachine/statemachine/impl/StatemachinePackageImpl.java
index bd4421e9de1..8788a8927aa 100644
--- a/org.eclipse.xtext.web.example.statemachine/src-gen/org/eclipse/xtext/web/example/statemachine/statemachine/impl/StatemachinePackageImpl.java
+++ b/org.eclipse.xtext.web.example.statemachine/src-gen/org/eclipse/xtext/web/example/statemachine/statemachine/impl/StatemachinePackageImpl.java
@@ -117,7 +117,6 @@ private StatemachinePackageImpl()
   {
     super(eNS_URI, StatemachineFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/AbstractXbaseWithAnnotationsIdeModule.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/AbstractXbaseWithAnnotationsIdeModule.java
index bffdde2f49a..9b93f313e20 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/AbstractXbaseWithAnnotationsIdeModule.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/AbstractXbaseWithAnnotationsIdeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/XbaseWithAnnotationsParser.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/XbaseWithAnnotationsParser.java
index f343392aa49..f8a54c20680 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/XbaseWithAnnotationsParser.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/XbaseWithAnnotationsParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotations.g b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotations.g
index b4f3f1234a0..d8663b1e8fe 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotations.g
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotations.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotationsParser.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotationsParser.java
index 2757c2b5d67..74869fe8421 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotationsParser.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/annotations/ide/contentassist/antlr/internal/InternalXbaseWithAnnotationsParser.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXbaseIdeModule.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXbaseIdeModule.java
index 27832220920..f2f704677ea 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXbaseIdeModule.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXbaseIdeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXtypeIdeModule.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXtypeIdeModule.java
index 8fe72b0fb72..7ee5a0e2c06 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXtypeIdeModule.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/AbstractXtypeIdeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XbaseParser.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XbaseParser.java
index f03e5e0e1cf..6eda1ca46d6 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XbaseParser.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XbaseParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XtypeParser.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XtypeParser.java
index f7eab70b7d0..e03c3851f32 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XtypeParser.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/XtypeParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbase.g b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbase.g
index d6ec14da0da..a805a42ad93 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbase.g
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbase.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbaseParser.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbaseParser.java
index 8ff8e202ad3..862fae646e0 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbaseParser.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXbaseParser.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtype.g b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtype.g
index 5ffe067ef08..107d5618886 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtype.g
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtype.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtypeParser.java b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtypeParser.java
index 557360f5c99..6e997724cd6 100644
--- a/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtypeParser.java
+++ b/org.eclipse.xtext.xbase.ide/src-gen/org/eclipse/xtext/xbase/ide/contentassist/antlr/internal/InternalXtypeParser.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/AbstractXbaseWithAnnotationsUiModule.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/AbstractXbaseWithAnnotationsUiModule.java
index 84f251f88f3..bc4e528841d 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/AbstractXbaseWithAnnotationsUiModule.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/AbstractXbaseWithAnnotationsUiModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/XbaseWithAnnotationsExecutableExtensionFactory.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/XbaseWithAnnotationsExecutableExtensionFactory.java
index 1385ee030ca..c5db55505ad 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/XbaseWithAnnotationsExecutableExtensionFactory.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/XbaseWithAnnotationsExecutableExtensionFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/contentassist/AbstractXbaseWithAnnotationsProposalProvider.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/contentassist/AbstractXbaseWithAnnotationsProposalProvider.java
index 07486fa3fe4..1a60da8ec34 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/contentassist/AbstractXbaseWithAnnotationsProposalProvider.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/contentassist/AbstractXbaseWithAnnotationsProposalProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/editor/XbaseWithAnnotationsEditor.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/editor/XbaseWithAnnotationsEditor.java
index 2a9c81f2f1e..421e17906ba 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/editor/XbaseWithAnnotationsEditor.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/editor/XbaseWithAnnotationsEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXbaseUiModule.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXbaseUiModule.java
index abd6c173deb..3d77f9f7473 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXbaseUiModule.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXbaseUiModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXtypeUiModule.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXtypeUiModule.java
index 51c939d18fa..183159c4e3f 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXtypeUiModule.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXtypeUiModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XbaseExecutableExtensionFactory.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XbaseExecutableExtensionFactory.java
index 0cb981d75c9..83248f57804 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XbaseExecutableExtensionFactory.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XbaseExecutableExtensionFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XtypeExecutableExtensionFactory.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XtypeExecutableExtensionFactory.java
index 140e346a36f..844aa247167 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XtypeExecutableExtensionFactory.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/XtypeExecutableExtensionFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXbaseProposalProvider.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXbaseProposalProvider.java
index d9a95dd2fc2..612da101c68 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXbaseProposalProvider.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXbaseProposalProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXtypeProposalProvider.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXtypeProposalProvider.java
index 20682d402e8..8ed416818ec 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXtypeProposalProvider.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/AbstractXtypeProposalProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/internal/XbaseActivator.java b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/internal/XbaseActivator.java
index d992b2872b1..f5b53acd58e 100644
--- a/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/internal/XbaseActivator.java
+++ b/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/internal/XbaseActivator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.xbase.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -40,7 +40,7 @@ public class XbaseActivator extends AbstractUIPlugin {
 	
 	private static XbaseActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java b/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java
index 38d9bee36e5..c81398493ac 100644
--- a/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java
+++ b/org.eclipse.xtext.xbase/generator/org/eclipse/xtext/xbase/GenerateXbase.java
@@ -44,15 +44,15 @@
  * @noreference This class is not intended to be referenced by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
-final class GenerateXbase {
+public final class GenerateXbase {
 	/**
 	 * Can't use MWE2 because of circular dependencies
 	 */
 	public static void main(String[] args) {
-		final String root = "..";
+		final String root = args.length == 0 ? ".." : args[0];
 		final String projectName = "org.eclipse.xtext.xbase";
 		final String runtimeProject = root + "/" + projectName;
-		final String uiProject = System.getProperty("uiProject", root + "/../" + projectName + ".ui");	
+		final String uiProject = System.getProperty("uiProject", root + "/" + projectName + ".ui");	
 		final boolean backtrack = false;
 		final boolean memoize = false;
 		final String lineDelimiter = "\n";
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXbaseRuntimeModule.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXbaseRuntimeModule.java
index 169b2a90754..3d55f24e0c1 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXbaseRuntimeModule.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXbaseRuntimeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXtypeRuntimeModule.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXtypeRuntimeModule.java
index 51670102ab3..024b276a0dc 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXtypeRuntimeModule.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/AbstractXtypeRuntimeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XbaseStandaloneSetupGenerated.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XbaseStandaloneSetupGenerated.java
index 725e7ef08a0..088c81af922 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XbaseStandaloneSetupGenerated.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XbaseStandaloneSetupGenerated.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XtypeStandaloneSetupGenerated.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XtypeStandaloneSetupGenerated.java
index 9dda66415cf..141a616335b 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XtypeStandaloneSetupGenerated.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/XtypeStandaloneSetupGenerated.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/AbstractXbaseWithAnnotationsRuntimeModule.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/AbstractXbaseWithAnnotationsRuntimeModule.java
index 83c5039ad30..8d52462f9f3 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/AbstractXbaseWithAnnotationsRuntimeModule.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/AbstractXbaseWithAnnotationsRuntimeModule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/XbaseWithAnnotationsStandaloneSetupGenerated.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/XbaseWithAnnotationsStandaloneSetupGenerated.java
index 58d28edf481..69fdf31fb90 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/XbaseWithAnnotationsStandaloneSetupGenerated.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/XbaseWithAnnotationsStandaloneSetupGenerated.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsAntlrTokenFileProvider.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsAntlrTokenFileProvider.java
index af1d14603c7..17b066416fa 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsAntlrTokenFileProvider.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsAntlrTokenFileProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsParser.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsParser.java
index 97491e4c0cc..44d1404ea60 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsParser.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/XbaseWithAnnotationsParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/DebugInternalXbaseWithAnnotations.g b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/DebugInternalXbaseWithAnnotations.g
index 6ce92595a6b..772e2c9540f 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/DebugInternalXbaseWithAnnotations.g
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/DebugInternalXbaseWithAnnotations.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotations.g b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotations.g
index 81956fcaa5a..420cce86c62 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotations.g
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotations.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotationsParser.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotationsParser.java
index 6d1c0312f99..4a14e3abd68 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotationsParser.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotationsParser.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/scoping/AbstractXbaseWithAnnotationsScopeProvider.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/scoping/AbstractXbaseWithAnnotationsScopeProvider.java
index 2860453bf4b..72dc9f96565 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/scoping/AbstractXbaseWithAnnotationsScopeProvider.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/scoping/AbstractXbaseWithAnnotationsScopeProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSemanticSequencer.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSemanticSequencer.java
index 811d68ec686..3943e46a950 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSemanticSequencer.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSemanticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSyntacticSequencer.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSyntacticSequencer.java
index 5fbdc905954..d705a687374 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSyntacticSequencer.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/serializer/AbstractXbaseWithAnnotationsSyntacticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/services/XbaseWithAnnotationsGrammarAccess.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/services/XbaseWithAnnotationsGrammarAccess.java
index a7b61f65c33..5d8a3098da8 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/services/XbaseWithAnnotationsGrammarAccess.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/services/XbaseWithAnnotationsGrammarAccess.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/validation/AbstractXbaseWithAnnotationsValidator.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/validation/AbstractXbaseWithAnnotationsValidator.java
index 74f301c23c4..e5bd232525f 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/validation/AbstractXbaseWithAnnotationsValidator.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/validation/AbstractXbaseWithAnnotationsValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseAntlrTokenFileProvider.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseAntlrTokenFileProvider.java
index d0aef1e79c8..976bde9fc1f 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseAntlrTokenFileProvider.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseAntlrTokenFileProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseParser.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseParser.java
index e1974c91039..e59fed41ce7 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseParser.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XbaseParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeAntlrTokenFileProvider.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeAntlrTokenFileProvider.java
index 52f4d374c8e..66f307e4d26 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeAntlrTokenFileProvider.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeAntlrTokenFileProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeParser.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeParser.java
index bce2523e551..b303ac926c7 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeParser.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/XtypeParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/DebugInternalXbase.g b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/DebugInternalXbase.g
index d26dd3d4857..f1101995342 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/DebugInternalXbase.g
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/DebugInternalXbase.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbase.g b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbase.g
index 56514da36ae..5852dd4afaf 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbase.g
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbase.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbaseParser.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbaseParser.java
index 2bafc61fec8..faf347f90eb 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbaseParser.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbaseParser.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtype.g b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtype.g
index 2e2f550e8c1..30651b2f07b 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtype.g
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtype.g
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtypeParser.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtypeParser.java
index ce919417124..407f5cf59bc 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtypeParser.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXtypeParser.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.HashMap;
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/scoping/AbstractXbaseScopeProvider.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/scoping/AbstractXbaseScopeProvider.java
index 58b1a1f1b0a..8090fd1e427 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/scoping/AbstractXbaseScopeProvider.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/scoping/AbstractXbaseScopeProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSemanticSequencer.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSemanticSequencer.java
index f8072a6717a..766bee50c3f 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSemanticSequencer.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSemanticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSyntacticSequencer.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSyntacticSequencer.java
index c36cd40a212..0dbfcf8b9f2 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSyntacticSequencer.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXbaseSyntacticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSemanticSequencer.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSemanticSequencer.java
index 87d248ee7ba..23a6223b1f7 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSemanticSequencer.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSemanticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSyntacticSequencer.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSyntacticSequencer.java
index fea944d3a0a..2c1e4b5eb7c 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSyntacticSequencer.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/serializer/AbstractXtypeSyntacticSequencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XbaseGrammarAccess.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XbaseGrammarAccess.java
index 637aa32f897..ab7c0dcd0de 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XbaseGrammarAccess.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XbaseGrammarAccess.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XtypeGrammarAccess.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XtypeGrammarAccess.java
index 3c00959c010..4ea643e45ae 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XtypeGrammarAccess.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XtypeGrammarAccess.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
diff --git a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/validation/AbstractXbaseValidator.java b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/validation/AbstractXbaseValidator.java
index e7caf66d513..dca0e97965e 100644
--- a/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/validation/AbstractXbaseValidator.java
+++ b/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/validation/AbstractXbaseValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2023 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2010, 2024 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.
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 b556d5024b1..b66ee103735 100644
--- a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@ Require-Bundle: de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optiona
  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.26";visibility:=reexport
+ org.apache.log4j;bundle-version="1.2.26";visibility:=reexport,
+ org.aopalliance;bundle-version="1.0.0"
 Automatic-Module-Name: org.eclipse.xtext.xtext.generator.dependencies
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/src-gen/org/eclipse/xtext/example/arithmetics/ui/internal/ArithmeticsActivator.java b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/src-gen/org/eclipse/xtext/example/arithmetics/ui/internal/ArithmeticsActivator.java
index 74d22b65a18..79be06f3336 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/src-gen/org/eclipse/xtext/example/arithmetics/ui/internal/ArithmeticsActivator.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ui/src-gen/org/eclipse/xtext/example/arithmetics/ui/internal/ArithmeticsActivator.java
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.example.arithmetics.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class ArithmeticsActivator extends AbstractUIPlugin {
 	
 	private static ArithmeticsActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/src-gen/org/eclipse/xtext/example/arithmetics/arithmetics/impl/ArithmeticsPackageImpl.java b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/src-gen/org/eclipse/xtext/example/arithmetics/arithmetics/impl/ArithmeticsPackageImpl.java
index d8bedcdf161..acd608c0e02 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/src-gen/org/eclipse/xtext/example/arithmetics/arithmetics/impl/ArithmeticsPackageImpl.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/src-gen/org/eclipse/xtext/example/arithmetics/arithmetics/impl/ArithmeticsPackageImpl.java
@@ -156,7 +156,6 @@ private ArithmeticsPackageImpl()
   {
     super(eNS_URI, ArithmeticsFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/domainmodel/ui/internal/DomainmodelActivator.java b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/domainmodel/ui/internal/DomainmodelActivator.java
index c5f2ed7e9ff..c6fff48810c 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/domainmodel/ui/internal/DomainmodelActivator.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/domainmodel/ui/internal/DomainmodelActivator.java
@@ -8,10 +8,10 @@
  */
 package org.eclipse.xtext.example.domainmodel.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class DomainmodelActivator extends AbstractUIPlugin {
 	
 	private static DomainmodelActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/domainmodel/impl/DomainmodelPackageImpl.java b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/domainmodel/impl/DomainmodelPackageImpl.java
index 21a04869568..318f72b9338 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/domainmodel/impl/DomainmodelPackageImpl.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/domainmodel/impl/DomainmodelPackageImpl.java
@@ -107,7 +107,6 @@ private DomainmodelPackageImpl()
   {
     super(eNS_URI, DomainmodelFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/fowlerdsl/ui/internal/FowlerdslActivator.java b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/fowlerdsl/ui/internal/FowlerdslActivator.java
index a2c36b352e6..802a569aa44 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/fowlerdsl/ui/internal/FowlerdslActivator.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/fowlerdsl/ui/internal/FowlerdslActivator.java
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.example.fowlerdsl.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class FowlerdslActivator extends AbstractUIPlugin {
 	
 	private static FowlerdslActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/statemachine/impl/StatemachinePackageImpl.java b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/statemachine/impl/StatemachinePackageImpl.java
index a346964b196..f866eb8c111 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/statemachine/impl/StatemachinePackageImpl.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/fowlerdsl/statemachine/impl/StatemachinePackageImpl.java
@@ -85,7 +85,6 @@ private StatemachinePackageImpl()
   {
     super(eNS_URI, StatemachineFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/src-gen/org/eclipse/xtext/example/homeautomation/ui/internal/HomeautomationActivator.java b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/src-gen/org/eclipse/xtext/example/homeautomation/ui/internal/HomeautomationActivator.java
index 95a89d3529a..5b8aca73a3b 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/src-gen/org/eclipse/xtext/example/homeautomation/ui/internal/HomeautomationActivator.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ui/src-gen/org/eclipse/xtext/example/homeautomation/ui/internal/HomeautomationActivator.java
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.example.homeautomation.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class HomeautomationActivator extends AbstractUIPlugin {
 	
 	private static HomeautomationActivator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/src-gen/org/eclipse/xtext/example/homeautomation/ruleEngine/impl/RuleEnginePackageImpl.java b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/src-gen/org/eclipse/xtext/example/homeautomation/ruleEngine/impl/RuleEnginePackageImpl.java
index 132fbf8d1d4..75f1531efd3 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/src-gen/org/eclipse/xtext/example/homeautomation/ruleEngine/impl/RuleEnginePackageImpl.java
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/src-gen/org/eclipse/xtext/example/homeautomation/ruleEngine/impl/RuleEnginePackageImpl.java
@@ -89,7 +89,6 @@ private RuleEnginePackageImpl()
   {
     super(eNS_URI, RuleEngineFactory.eINSTANCE);
   }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/org.eclipse.xtext.xtext.ui/src-gen/org/eclipse/xtext/xtext/ui/internal/Activator.java b/org.eclipse.xtext.xtext.ui/src-gen/org/eclipse/xtext/xtext/ui/internal/Activator.java
index 6ebdd2fb257..70f6646f6bc 100644
--- a/org.eclipse.xtext.xtext.ui/src-gen/org/eclipse/xtext/xtext/ui/internal/Activator.java
+++ b/org.eclipse.xtext.xtext.ui/src-gen/org/eclipse/xtext/xtext/ui/internal/Activator.java
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.xtext.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class Activator extends AbstractUIPlugin {
 	
 	private static Activator INSTANCE;
 	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 	
 	@Override
 	public void start(BundleContext context) throws Exception {