Skip to content

Commit

Permalink
Removed redundant require-bundle entries for xtext.util
Browse files Browse the repository at this point in the history 
It's re-exported from org.eclipse.xtext and thus the additional
bundle requirement makes it harder for the OSGI resolver to find
solutions (as counter-intuitive as it sounds)

Signed-off-by: Sebastian Zarnekow <[email protected]>
  • Loading branch information
@szarnekow
szarnekow committed Jan 7, 2024
1 parent c136b1f commit b23c473
Show file tree
Hide file tree
Showing 27 changed files with 3 additions and 28 deletions.
1 change: 0 additions & 1 deletion org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.34.0",
org.eclipse.xtext.testing;bundle-version="2.34.0",
org.eclipse.xtext.xbase.testing;bundle-version="2.34.0",
org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
org.eclipse.xtext.xbase.ui;bundle-version="2.34.0",
org.hamcrest.core;bundle-version="1.1.0",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtend.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100",
org.eclipse.xtext.common.types;bundle-version="2.34.0";visibility:=reexport,
org.eclipse.xtext.xbase;bundle-version="2.34.0";visibility:=reexport,
org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Require-Bundle: com.google.inject;bundle-version="7.0.0",
org.eclipse.emf.mwe.utils;bundle-version="1.10.0",
org.eclipse.ui.editors;bundle-version="3.14.300",
org.eclipse.xtext.builder;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional,
org.eclipse.xtext.ui.testing;bundle-version="2.34.0"
Automatic-Module-Name: org.eclipse.xtend.performance.tests
1 change: 0 additions & 1 deletion org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.builder.standalone;bundle-version="2.34.0",
org.eclipse.xtext.testing;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Bundle-Vendor: Eclipse Xtext
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.builder;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.xtext.ui;bundle-version="2.34.0",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.builder/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Export-Package: org.eclipse.xtext.builder;version="2.34.0",
org.eclipse.xtext.builder.trace.impl;version="2.34.0";x-internal:=true,
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.xtext.util;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,
Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ Bundle-Version: 2.34.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Require-Bundle: org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.xtext.common.types;bundle-version="2.34.0",
Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.mwe2.runtime,
org.eclipse.xtext;bundle-version="2.34.0",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.emf.mwe2.runtime,
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.common.types;bundle-version="2.34.0",
org.eclipse.xtext.ecore;bundle-version="2.34.0",
org.eclipse.xtext.testing;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
org.eclipse.xtend.lib;bundle-version="2.34.0",
org.eclipse.xtext.xtext.generator;bundle-version="2.34.0",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.emf.mwe.utils;bundle-version="1.10.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy,
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.emf.ecore,
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.xtend.lib;bundle-version="2.34.0",
org.eclipse.emf.common,
org.eclipse.xtext.common.types;bundle-version="2.34.0",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe.utils;bundle-version="1.10.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.emf.mwe.utils;bundle-version="1.10.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy,
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Bundle-SymbolicName: org.eclipse.xtext.ui.codetemplates;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.34.0",
org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.testing;bundle-version="2.34.0",
org.eclipse.xtext.xtext.ui;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.ui.editors;bundle-version="3.14.300",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100";visibility:=r
org.eclipse.ui.views;bundle-version="3.11.100",
org.eclipse.emf.edit.ui;bundle-version="2.17.0";visibility:=reexport,
org.eclipse.ui.workbench.texteditor;bundle-version="3.16.400",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy,
org.eclipse.core.expressions;bundle-version="3.8.100",
org.eclipse.search;bundle-version="3.14.100";resolution:=optional;x-installation:=greedy,
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0";visibility:=reexport,
org.eclipse.xtext.xbase;bundle-version="2.34.0";resolution:=optional;visibility:=reexport,
org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.34.0",
org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.testing;bundle-version="2.34.0",
org.eclipse.xtext.xbase.testing;bundle-version="2.34.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.xtext.common.types;bundle-version="2.34.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.xbase/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.common.types;bundle-version="2.34.0";visibility:=reexport,
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Bundle-Name: Xtext Generator 2
Bundle-Vendor: Eclipse Xtext
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0";x-installation:=greedy,
org.eclipse.xtext.util;bundle-version="2.34.0";x-installation:=greedy,
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0";visibility:=reexport;x-installation:=greedy,
org.eclipse.xtend.lib;bundle-version="2.34.0",
org.eclipse.xtext.ecore;bundle-version="2.34.0",
Expand Down
2 changes: 1 addition & 1 deletion ...clipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ImplicitFragment.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ package class ImplicitFragment extends AbstractStubGeneratingFragment {
override generate() {
if (projectConfig.runtime.manifest !== null) {
projectConfig.runtime.manifest.requiredBundles.addAll(#[
'org.eclipse.xtext', 'org.eclipse.xtext.util'
'org.eclipse.xtext'
])

if (generateXtendStub) {
Expand Down
2 changes: 1 addition & 1 deletion ...e.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ImplicitFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void generate() {
boolean _tripleNotEquals = (_manifest != null);
if (_tripleNotEquals) {
this.getProjectConfig().getRuntime().getManifest().getRequiredBundles().addAll(
Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("org.eclipse.xtext", "org.eclipse.xtext.util")));
Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("org.eclipse.xtext")));
boolean _isGenerateXtendStub = this.isGenerateXtendStub();
if (_isGenerateXtendStub) {
Set<String> _requiredBundles = this.getProjectConfig().getRuntime().getManifest().getRequiredBundles();
Expand Down
1 change: 0 additions & 1 deletion ....examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.equinox.common;bundle-version="3.16.0",
org.eclipse.xtend.lib;bundle-version="2.14.0",
org.eclipse.xtext,
org.eclipse.xtext.util,
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
1 change: 0 additions & 1 deletion ....examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtend.lib;bundle-version="2.14.0",
org.eclipse.xtext,
org.eclipse.xtext.common.types,
org.eclipse.xtext.util,
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional
Expand Down
1 change: 0 additions & 1 deletion ...t.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.equinox.common;bundle-version="3.16.0",
org.eclipse.xtend.lib;bundle-version="2.14.0",
org.eclipse.xtext,
org.eclipse.xtext.util,
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
Import-Package: org.apache.log4j
Expand Down
1 change: 0 additions & 1 deletion ...les/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtend.lib;bundle-version="2.14.0",
org.eclipse.xtext,
org.eclipse.xtext.common.types,
org.eclipse.xtext.util,
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Bundle-Version: 2.34.0.qualifier
Bundle-Vendor: Eclipse Xtext
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.xtext.util;bundle-version="2.34.0",
org.eclipse.xtext;bundle-version="2.34.0",
org.eclipse.xtext.ui;bundle-version="2.34.0",
org.eclipse.ui.editors;bundle-version="3.14.300",
Expand Down

0 comments on commit b23c473

Please sign in to comment.