Removed redundant bundle requirements to com.google.inject

It's re-exported from xtext.util and thereby transitively by xtext Signed-off-by: Sebastian Zarnekow <[email protected]>
eclipse-xtext · Jan 8, 2024 · b43e20e · b43e20e
1 parent 5f48f66
commit b43e20e
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 16 deletions.
diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.34.0",
  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.inject;bundle-version="7.0.0",
  org.eclipse.core.resources;bundle-version="3.16.100",
  org.eclipse.emf.ecore,
  org.eclipse.xtext.builder;bundle-version="2.34.0",

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,6 @@ Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="2.6.0",
  org.eclipse.xtend.ide;bundle-version="2.34.0",
  org.eclipse.ui;bundle-version="3.201.0",
  org.eclipse.jdt.ui;bundle-version="3.26.0",
- com.google.inject;bundle-version="7.0.0",
  org.eclipse.xtext.ui;bundle-version="2.34.0",
  org.hamcrest.library;bundle-version="1.3.0",
  org.eclipse.xtend.core;bundle-version="2.34.0",

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

diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF
@@ -47,7 +47,6 @@ Export-Package: org.eclipse.xtext.builder;version="2.34.0",
  org.eclipse.xtext.builder.trace.util;version="2.34.0";x-internal:=true
 Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
  org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport,
- com.google.inject;bundle-version="7.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,6 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.34.0";visibilit
  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="7.0.0",
  org.eclipse.xtext;bundle-version="2.34.0",
  org.eclipse.core.runtime;bundle-version="3.24.100",
  org.eclipse.core.resources;bundle-version="3.16.100",

diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-SymbolicName: org.eclipse.xtext.common.types;singleton:=true
 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="7.0.0",
  org.eclipse.xtext;bundle-version="2.34.0",
  org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
  org.eclipse.xtend.lib;bundle-version="2.34.0"

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,6 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.34.0.qualifier
 Require-Bundle: org.junit,
  org.eclipse.xtext.junit4;bundle-version="2.34.0",
- com.google.inject;bundle-version="7.0.0",
  org.eclipse.xtext;bundle-version="2.34.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.xtext.junit4.tests

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,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0";visibility:=reexport,
  org.eclipse.lsp4j;resolution:=optional,
  org.eclipse.lsp4j.jsonrpc;resolution:=optional,
  org.eclipse.xtend.lib;bundle-version="2.34.0",
- org.eclipse.xtext.testing;bundle-version="2.34.0",
- com.google.inject;bundle-version="7.0.0";visibility:=reexport
+ org.eclipse.xtext.testing;bundle-version="2.34.0"
 Import-Package: jakarta.inject;version="2.0.1",
  org.apache.log4j;version="1.2.24",
  org.apache.log4j.spi;version="1.2.24",

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,8 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xtext.ui.codetemplates.tests
 Bundle-Version: 2.34.0.qualifier
 Bundle-Localization: plugin
-Require-Bundle: com.google.inject;bundle-version="7.0.0",
- org.eclipse.xtext.ui.codetemplates;bundle-version="2.34.0",
+Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.34.0",
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.34.0",
  org.eclipse.ui;bundle-version="3.201.0",
  org.eclipse.emf.ecore;bundle-version="2.26.0",

diff --git a/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-Version: 2.34.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.34.0";visibility:=reexport,
- com.google.inject;bundle-version="7.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;bundle-version="2.34.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,

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,7 +5,6 @@ Bundle-Version: 2.34.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.34.0";visibility:=reexport,
- com.google.inject;bundle-version="7.0.0";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtext.ui;bundle-version="2.34.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtext.xbase.ui;bundle-version="2.34.0";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,6 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.xtext.xtext.ui.graph;bundle-version="2.34.0",
  org.eclipse.xtext.testing;bundle-version="2.34.0",
- com.google.inject;bundle-version="7.0.0",
  org.eclipse.xtext;bundle-version="2.34.0",
  org.eclipse.draw2d;bundle-version="3.10.100",
  org.eclipse.xtext.xtext.ui;bundle-version="2.34.0"

diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -218,7 +218,6 @@ 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="7.0.0";visibility:=reexport,
  org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional,
  org.eclipse.emf.mwe.core;bundle-version="1.11.0";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.mwe.utils;bundle-version="1.10.0";resolution:=optional;visibility:=reexport,