[#2056] experiments with guice 6 rc

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
eclipse · May 2, 2023 · 04045aa · 04045aa
1 parent 26cd577
commit 04045aa
Show file tree

Hide file tree

Showing 30 changed files with 112 additions and 48 deletions.
diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.xtend.core,
  org.eclipse.core.runtime;bundle-version="3.24.100",
  org.eclipse.equinox.common;bundle-version="3.16.0",
  org.eclipse.emf.codegen.ecore;bundle-version="2.29.0",
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
- com.google.inject;bundle-version="5.0.1",
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
+ com.google.inject;bundle-version="6.0.0",
  org.eclipse.core.resources;bundle-version="3.16.100",
  org.eclipse.emf.ecore,
  org.eclipse.xtext.builder,
@@ -27,6 +27,7 @@ Require-Bundle: org.eclipse.xtend.core,
  org.eclipse.xtext.builder.standalone,
  org.eclipse.xtext.java
 Import-Package: javax.inject;version="1.0.0",
+ jakarta.inject;version="2.0.1",
  org.apache.log4j;version="1.2.24",
  org.apache.log4j.spi;version="1.2.24",
  org.junit;version="4.13.2",

diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples-client
 Bundle-Version: 2.31.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtend.lib,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.31.0",
  xtend-annotation-examples;bundle-version="2.4.3"
 Bundle-Vendor: Eclipse Xtext

diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples
 Bundle-Version: 2.31.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtend.lib,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.31.0",
  org.junit;bundle-version="4.13.2",
  org.eclipse.xtend.core,

diff --git a/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.swtbot.tests/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="2.6.0",
  org.eclipse.xtend.ide,
  org.eclipse.ui;bundle-version="3.201.0",
  org.eclipse.jdt.ui;bundle-version="3.26.0",
- com.google.inject;bundle-version="5.0.1",
+ com.google.inject;bundle-version="6.0.0",
  org.eclipse.xtext.ui,
  org.hamcrest.library;bundle-version="1.3.0",
  org.eclipse.xtend.core,

diff --git a/org.eclipse.xtend.lib.gwt.test/pom.xml b/org.eclipse.xtend.lib.gwt.test/pom.xml
@@ -15,7 +15,7 @@
 	<description>A test that ensures our GWT compatibility.</description>
 
 	<properties>
-		<gwt.version>2.8.2</gwt.version>
+		<gwt.version>2.10.0</gwt.version>
 	</properties>
 
 	<dependencies>

diff --git a/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml b/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml
@@ -16,7 +16,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>30.1-jre</version>
+				<version>31.1-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.xtext</groupId>

diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.31.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Eclipse Xtext
 Bundle-ClassPath: .
-Require-Bundle: com.google.inject;bundle-version="5.0.1",
+Require-Bundle: com.google.inject;bundle-version="6.0.0",
  org.eclipse.emf.ecore;bundle-version="2.26.0",
  org.eclipse.emf.mwe2.lib;bundle-version="2.14.0",
  org.eclipse.emf.mwe2.runtime;bundle-version="2.14.0",

diff --git a/org.eclipse.xtend.sdk.feature/feature.xml b/org.eclipse.xtend.sdk.feature/feature.xml
@@ -33,7 +33,7 @@ SPDX-License-Identifier: EPL-2.0
    <requires>
       <import feature="org.eclipse.xtext.ui" version="2.31.0" match="equivalent"/>
       <import feature="org.eclipse.xtext.xbase.lib" version="2.31.0" match="equivalent"/>
-      <import plugin="com.google.guava" version="30.1.0" match="compatible"/>
+      <import plugin="com.google.guava" version="31.1.0" match="compatible"/>
       <import plugin="io.github.classgraph" version="4.8.149" match="compatible"/>
       <import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
    </requires>

diff --git a/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF b/org.eclipse.xtend.standalone/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.31.0.qualifier
 Require-Bundle: org.eclipse.xtend.core;visibility:=reexport,
- com.google.inject;bundle-version="5.0.1";visibility:=reexport,
+ com.google.inject;bundle-version="6.0.0";visibility:=reexport,
  org.eclipse.jdt.core;bundle-version="3.29.0";visibility:=reexport,
  org.eclipse.emf.codegen;bundle-version="2.22.0";visibility:=reexport
 Import-Package: org.apache.log4j;version="1.2.24"
diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF
@@ -48,8 +48,8 @@ Export-Package: org.eclipse.xtext.builder,
 Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
- com.google.inject;bundle-version="5.0.1",
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
+ com.google.inject;bundle-version="6.0.0",
  org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy,
  org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy,

diff --git a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.xtext.common.types;visibility:=reexport,
  org.eclipse.ui;bundle-version="3.201.0",
  org.eclipse.emf.ecore;bundle-version="2.26.0",
  org.eclipse.jdt.core;bundle-version="3.29.0",
- com.google.inject;bundle-version="5.0.1",
+ com.google.inject;bundle-version="6.0.0",
  org.eclipse.xtext,
  org.eclipse.core.runtime;bundle-version="3.24.100",
  org.eclipse.core.resources;bundle-version="3.16.100",
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext.common.types;visibility:=reexport,
  org.eclipse.jdt.core.manipulation;bundle-version="1.16.0",
  org.eclipse.xtext.smap;resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.common.types.edit;resolution:=optional;visibility:=reexport;x-installation:=greedy,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
  org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional
 Import-Package: org.apache.log4j;version="1.2.24"
 Bundle-RequiredExecutionEnvironment: JavaSE-11

diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: 
  org.eclipse.emf.ecore;bundle-version="2.26.0",
  org.eclipse.emf.common;bundle-version="2.24.0",
- com.google.inject;bundle-version="5.0.1",
+ com.google.inject;bundle-version="6.0.0",
  org.eclipse.xtext,
  org.objectweb.asm;bundle-version="[9.5.0,9.6.0)",
  org.eclipse.xtend.lib,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
  io.github.classgraph;bundle-version="4.8.149"
 Import-Package: org.apache.commons.logging;version="1.0.4";resolution:=optional,
  org.apache.log4j;version="1.2.24"

diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
@@ -147,27 +147,27 @@
 			<dependency>
 				<groupId>com.google.errorprone</groupId>
 				<artifactId>error_prone_annotations</artifactId>
-				<version>2.3.4</version>
+				<version>2.18.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava-gwt</artifactId>
-				<version>30.1-jre</version>
+				<version>31.1-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava-testlib</artifactId>
-				<version>30.1-jre</version>
+				<version>31.1-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>30.1-jre</version>
+				<version>31.1-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.inject</groupId>
 				<artifactId>guice</artifactId>
-				<version>5.0.1</version>
+				<version>6.0.0-rc1</version>
 			</dependency>
 			<dependency>
 				<groupId>io.github.classgraph</groupId>

diff --git a/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.31.0.qualifier
 Require-Bundle: org.junit,
  org.eclipse.xtext.junit4,
- com.google.inject;bundle-version="5.0.1",
+ com.google.inject;bundle-version="6.0.0",
  org.eclipse.xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.xtext.junit4.tests

diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml
@@ -20,10 +20,10 @@
    <bundle id="org.eclipse.xtend.typesystem.emf" version="2.2.0.qualifier"/>
    <bundle id="org.eclipse.xtend.typesystem.emf.source" version="2.2.0.qualifier"/>
 
-   <bundle id="com.google.guava" version="30.1.0.qualifier"/>
-   <bundle id="com.google.guava.source" version="30.1.0.qualifier"/>
-   <bundle id="com.google.inject" version="5.0.1.qualifier"/>
-   <bundle id="com.google.inject.source" version="5.0.1.qualifier"/>
+   <bundle id="com.google.guava" version="31.1.0.qualifier"/>
+   <bundle id="com.google.guava.source" version="31.1.0.qualifier"/>
+   <bundle id="com.google.inject" version="6.0.0.qualifier"/>
+   <bundle id="com.google.inject.source" version="6.0.0.qualifier"/>
    <bundle id="javax.inject" version="1.0.0.qualifier"/>
    <bundle id="javax.inject.source" version="1.0.0.qualifier"/>
    <bundle id="org.antlr.runtime" version="3.2.0.qualifier"/>

diff --git a/org.eclipse.xtext.redist.feature/feature.xml b/org.eclipse.xtext.redist.feature/feature.xml
@@ -28,8 +28,8 @@ SPDX-License-Identifier: EPL-2.0
          version="0.0.0"/>
 
    <requires>
-      <import plugin="com.google.guava" version="30.1.0" match="compatible"/>
-      <import plugin="com.google.inject" version="5.0.1" match="compatible"/>
+      <import plugin="com.google.guava" version="31.1.0" match="compatible"/>
+      <import plugin="com.google.inject" version="6.0.0" match="compatible"/>
       <import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
       <import plugin="org.objectweb.asm" version="9.5.0" match="compatible"/>
       <import plugin="javax.inject" version="1.0.0" match="compatible"/>

diff --git a/org.eclipse.xtext.runtime.feature/feature.xml b/org.eclipse.xtext.runtime.feature/feature.xml
@@ -24,9 +24,9 @@ SPDX-License-Identifier: EPL-2.0
       %license
    </license>
    <requires>
-      <import plugin="com.google.guava" version="30.1.0" match="compatible"/>
+      <import plugin="com.google.guava" version="31.1.0" match="compatible"/>
       <import plugin="javax.inject" version="1.0.0" match="compatible"/>
-      <import plugin="com.google.inject" version="5.0.1" match="compatible"/>
+      <import plugin="com.google.inject" version="6.0.0" match="compatible"/>
       <import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
       <import plugin="org.objectweb.asm" version="9.5.0" match="compatible"/>
       <import plugin="io.github.classgraph" version="4.8.149" match="compatible"/>

diff --git a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF
@@ -11,8 +11,11 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.lsp4j;resolution:=optional,
  org.eclipse.lsp4j.jsonrpc;resolution:=optional,
  org.eclipse.xtend.lib,
- org.eclipse.xtext.testing
-Import-Package: org.apache.log4j;version="1.2.24",
+ org.eclipse.xtext.testing,
+ com.google.inject;bundle-version="6.0.0";visibility:=reexport
+Import-Package: javax.inject;version="1.0.0",
+ jakarta.inject;version="2.0.1",
+ org.apache.log4j;version="1.2.24",
  org.apache.log4j.spi;version="1.2.24",
  org.junit.jupiter.api;version="[5.1.0,6.0.0)",
  org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",

diff --git a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.testlanguages;visibility:=reexport,
  org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.compare;bundle-version="3.8.300",
  org.eclipse.xtend.lib;resolution:=optional,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.core.runtime;bundle-version="3.24.100",
  org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional,

diff --git a/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xtext.ui.codetemplates.tests
 Bundle-Version: 2.31.0.qualifier
 Bundle-Localization: plugin
-Require-Bundle: com.google.inject;bundle-version="5.0.1",
+Require-Bundle: com.google.inject;bundle-version="6.0.0",
  org.eclipse.xtext.ui.codetemplates,
  org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.ui;bundle-version="3.201.0",

diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF
@@ -47,9 +47,10 @@ Export-Package: org.eclipse.xtext.util;
    org.eclipse.xtext.xbase,
    org.eclipse.xtext.xbase.tests"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
- com.google.guava;bundle-version="[30.1.0,31.0.0)";visibility:=reexport,
- com.google.inject;bundle-version="5.0.1";visibility:=reexport,
+ com.google.guava;bundle-version="[31.1.0,32.0.0)";visibility:=reexport,
+ com.google.inject;bundle-version="6.0.0";visibility:=reexport,
  javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
+ jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtend.lib
 Import-Package: org.apache.log4j;version="1.2.24"
 Automatic-Module-Name: org.eclipse.xtext.util

diff --git a/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-Version: 2.31.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
- com.google.inject;bundle-version="5.0.1";visibility:=reexport,
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
+ com.google.inject;bundle-version="6.0.0";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="2.26.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtext;resolution:=optional;visibility:=reexport;x-installation:=greedy,

diff --git a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.31.0.qualifier
 Export-Package: org.eclipse.xtend2.lib,
  org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)"
+Require-Bundle: com.google.guava;bundle-version="[31.1.0,32.0.0)"
 Bundle-Vendor: %Vendor-Name
 Automatic-Module-Name: org.eclipse.xtext.xbase.lib.gwt
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Export-Package: org.eclipse.xtend2.lib;version="2.31.0",
  org.eclipse.xtext.xbase.lib;version="2.31.0",
  org.eclipse.xtext.xbase.lib.internal;x-internal:="true",
  org.eclipse.xtext.xbase.lib.util;version="2.31.0"
-Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)";visibility:=reexport
+Require-Bundle: com.google.guava;bundle-version="[31.1.0,32.0.0)";visibility:=reexport
 Bundle-Vendor: Eclipse Xtext
 Automatic-Module-Name: org.eclipse.xtext.xbase.lib
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@ Bundle-Vendor: Eclipse Xtext
 Export-Package: org.eclipse.xtext.xbase.tests,
  org.eclipse.xtext.xbase.tests.interpreter
 Import-Package: javax.inject;version="1.0.0",
+ jakarta.inject;version="2.0.0",
  org.apache.log4j;version="1.2.24",
  org.junit;version="4.13.2",
  org.junit.rules;version="4.13.2",

diff --git a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-Version: 2.31.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport,
- com.google.guava;bundle-version="[30.1.0,31.0.0)",
- com.google.inject;bundle-version="5.0.1";visibility:=reexport,
+ com.google.guava;bundle-version="[31.1.0,32.0.0)",
+ com.google.inject;bundle-version="6.0.0";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtext.ui;resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtext.xbase.ui;resolution:=optional;visibility:=reexport;x-installation:=greedy,

diff --git a/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.graph.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtext.xtext.ui.graph,
  org.eclipse.xtext.testing,
- com.google.inject;bundle-version="5.0.1",
+ com.google.inject;bundle-version="6.0.0",
  org.eclipse.xtext,
  org.eclipse.draw2d;bundle-version="3.10.100",
  org.eclipse.xtext.xtext.ui

diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -218,7 +218,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=re
  org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport,
  org.eclipse.emf.common;bundle-version="2.24.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport,
- com.google.inject;bundle-version="5.0.1";visibility:=reexport,
+ com.google.inject;bundle-version="6.0.0";visibility:=reexport,
  org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional,
  org.eclipse.emf.mwe.core;bundle-version="1.8.0";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.mwe.utils;bundle-version="1.8.0";resolution:=optional;visibility:=reexport,

diff --git a/xtext-latest.target b/xtext-latest.target
@@ -52,8 +52,6 @@
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
-			<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
-			<unit id="com.google.inject" version="5.0.1.v20221112-0806" />
 			<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
 			<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
 			<unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
@@ -79,5 +77,36 @@
 			<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
 			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
 		</location>
+		<location type="Maven" includeSource="true" missingManifest="error" includeDependencyScopes="compile">
+			<dependencies>
+				<dependency>
+				<groupId>com.google.inject</groupId>
+				<artifactId>guice</artifactId>
+				<version>6.0.0-rc1</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>31.1-jre</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+    <version>2.0.1</version>
+    <type>jar</type>
+</dependency>
+</dependencies>
+		</location>
+
+		<location type="Maven" includeSource="true" missingManifest="generate">
+			<groupId>com.google.errorprone</groupId>
+			<artifactId>error_prone_annotations</artifactId>
+			<version>2.18.0</version>
+			<type>jar</type>
+		</location>
+
+
 	</locations>
 </target>