Skip to content

Commit b23c473

Browse files
szarnekowszarnekow
committed
Removed redundant require-bundle entries for xtext.util
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 <sebastian.zarnekow@gmail.com>
1 parent c136b1f commit b23c473

File tree

27 files changed

+3
-28
lines changed

27 files changed

+3
-28
lines changed

‎org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.34.0",
99
org.eclipse.xtext.testing;bundle-version="2.34.0",
1010
org.eclipse.xtext.xbase.testing;bundle-version="2.34.0",
1111
org.eclipse.xtext;bundle-version="2.34.0",
12-
org.eclipse.xtext.util;bundle-version="2.34.0",
1312
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
1413
org.eclipse.xtext.xbase.ui;bundle-version="2.34.0",
1514
org.hamcrest.core;bundle-version="1.1.0",

‎org.eclipse.xtend.core/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100",
5454
org.eclipse.xtext.common.types;bundle-version="2.34.0";visibility:=reexport,
5555
org.eclipse.xtext.xbase;bundle-version="2.34.0";visibility:=reexport,
5656
org.eclipse.xtext;bundle-version="2.34.0",
57-
org.eclipse.xtext.util;bundle-version="2.34.0",
5857
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
5958
org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy,
6059
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",

‎org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Require-Bundle: com.google.inject;bundle-version="7.0.0",
1919
org.eclipse.emf.mwe.utils;bundle-version="1.10.0",
2020
org.eclipse.ui.editors;bundle-version="3.14.300",
2121
org.eclipse.xtext.builder;bundle-version="2.34.0",
22-
org.eclipse.xtext.util;bundle-version="2.34.0",
2322
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional,
2423
org.eclipse.xtext.ui.testing;bundle-version="2.34.0"
2524
Automatic-Module-Name: org.eclipse.xtend.performance.tests

‎org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
99
org.eclipse.xtext.builder.standalone;bundle-version="2.34.0",
1010
org.eclipse.xtext.testing;bundle-version="2.34.0",
11-
org.eclipse.xtext.util;bundle-version="2.34.0",
1211
org.eclipse.emf.ecore,
1312
org.eclipse.emf.common,
1413
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",

‎org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Bundle-Vendor: Eclipse Xtext
77
Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
99
org.eclipse.xtext.builder;bundle-version="2.34.0",
10-
org.eclipse.xtext.util;bundle-version="2.34.0",
1110
org.eclipse.emf.ecore;bundle-version="2.26.0",
1211
org.eclipse.emf.common;bundle-version="2.24.0",
1312
org.eclipse.xtext.ui;bundle-version="2.34.0",

‎org.eclipse.xtext.builder/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ Export-Package: org.eclipse.xtext.builder;version="2.34.0",
4646
org.eclipse.xtext.builder.trace.impl;version="2.34.0";x-internal:=true,
4747
org.eclipse.xtext.builder.trace.util;version="2.34.0";x-internal:=true
4848
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
49-
org.eclipse.xtext.util;bundle-version="2.34.0",
5049
org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport,
5150
com.google.inject;bundle-version="7.0.0",
5251
org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy,

‎org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ Bundle-Version: 2.34.0.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Bundle-Localization: plugin
9-
Require-Bundle: org.eclipse.xtext.util;bundle-version="2.34.0",
10-
org.eclipse.xtext.common.types;bundle-version="2.34.0",
9+
Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.34.0",
1110
org.eclipse.emf.ecore;bundle-version="2.26.0",
1211
org.eclipse.emf.mwe2.runtime,
1312
org.eclipse.xtext;bundle-version="2.34.0",

‎org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Bundle-RequiredExecutionEnvironment: JavaSE-11
99
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
10-
org.eclipse.xtext.util;bundle-version="2.34.0",
1110
org.eclipse.emf.ecore;bundle-version="2.26.0",
1211
org.eclipse.emf.common;bundle-version="2.24.0",
1312
org.eclipse.emf.mwe2.runtime,

‎org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
3333
org.eclipse.xtext.common.types;bundle-version="2.34.0",
3434
org.eclipse.xtext.ecore;bundle-version="2.34.0",
3535
org.eclipse.xtext.testing;bundle-version="2.34.0",
36-
org.eclipse.xtext.util;bundle-version="2.34.0",
3736
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
3837
org.eclipse.xtend.lib;bundle-version="2.34.0",
3938
org.eclipse.xtext.xtext.generator;bundle-version="2.34.0",

‎org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-Localization: plugin
88
Bundle-RequiredExecutionEnvironment: JavaSE-11
99
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
1010
org.eclipse.emf.mwe.utils;bundle-version="1.10.0",
11-
org.eclipse.xtext.util;bundle-version="2.34.0",
1211
org.eclipse.emf.ecore;bundle-version="2.26.0",
1312
org.eclipse.emf.common;bundle-version="2.24.0",
1413
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy,

‎org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
1111
org.eclipse.emf.ecore,
1212
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
1313
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
14-
org.eclipse.xtext.util;bundle-version="2.34.0",
1514
org.eclipse.xtend.lib;bundle-version="2.34.0",
1615
org.eclipse.emf.common,
1716
org.eclipse.xtext.common.types;bundle-version="2.34.0",

‎org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
1010
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;x-installation:=greedy,
1111
org.eclipse.emf.mwe.utils;bundle-version="1.10.0";resolution:=optional;x-installation:=greedy,
1212
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy,
13-
org.eclipse.xtext.util;bundle-version="2.34.0",
1413
org.eclipse.emf.ecore;bundle-version="2.26.0",
1514
org.eclipse.emf.common;bundle-version="2.24.0",
1615
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",

‎org.eclipse.xtext.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-Localization: plugin
88
Bundle-RequiredExecutionEnvironment: JavaSE-11
99
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
1010
org.eclipse.emf.mwe.utils;bundle-version="1.10.0",
11-
org.eclipse.xtext.util;bundle-version="2.34.0",
1211
org.eclipse.emf.ecore;bundle-version="2.26.0",
1312
org.eclipse.emf.common;bundle-version="2.24.0",
1413
org.eclipse.emf.mwe2.launch;bundle-version="2.17.0";resolution:=optional;x-installation:=greedy,

‎org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Bundle-SymbolicName: org.eclipse.xtext.ui.codetemplates;singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Bundle-Localization: plugin
99
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
10-
org.eclipse.xtext.util;bundle-version="2.34.0",
1110
org.eclipse.emf.ecore;bundle-version="2.26.0",
1211
org.eclipse.emf.common;bundle-version="2.24.0",
1312
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",

‎org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.34.0",
1313
org.eclipse.xtext;bundle-version="2.34.0",
1414
org.eclipse.xtext.testing;bundle-version="2.34.0",
1515
org.eclipse.xtext.xtext.ui;bundle-version="2.34.0",
16-
org.eclipse.xtext.util;bundle-version="2.34.0",
1716
org.eclipse.emf.ecore;bundle-version="2.26.0",
1817
org.eclipse.emf.common;bundle-version="2.24.0",
1918
org.eclipse.ui.editors;bundle-version="3.14.300",

‎org.eclipse.xtext.ui/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100";visibility:=r
1414
org.eclipse.ui.views;bundle-version="3.11.100",
1515
org.eclipse.emf.edit.ui;bundle-version="2.17.0";visibility:=reexport,
1616
org.eclipse.ui.workbench.texteditor;bundle-version="3.16.400",
17-
org.eclipse.xtext.util;bundle-version="2.34.0",
1817
org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy,
1918
org.eclipse.core.expressions;bundle-version="3.8.100",
2019
org.eclipse.search;bundle-version="3.14.100";resolution:=optional;x-installation:=greedy,

‎org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0";visibility:=reexport,
99
org.eclipse.xtext.xbase;bundle-version="2.34.0";resolution:=optional;visibility:=reexport,
1010
org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
11-
org.eclipse.xtext.util;bundle-version="2.34.0",
1211
org.eclipse.emf.ecore;bundle-version="2.26.0",
1312
org.eclipse.emf.common;bundle-version="2.24.0",
1413
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",

‎org.eclipse.xtext.xbase.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.34.0",
88
org.eclipse.xtext;bundle-version="2.34.0",
99
org.eclipse.xtext.testing;bundle-version="2.34.0",
1010
org.eclipse.xtext.xbase.testing;bundle-version="2.34.0",
11-
org.eclipse.xtext.util;bundle-version="2.34.0",
1211
org.eclipse.xtext.common.types;bundle-version="2.34.0",
1312
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
1413
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0",

‎org.eclipse.xtext.xbase/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase;singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
99
org.eclipse.xtext.common.types;bundle-version="2.34.0";visibility:=reexport,
10-
org.eclipse.xtext.util;bundle-version="2.34.0",
1110
org.eclipse.emf.ecore;bundle-version="2.26.0",
1211
org.eclipse.emf.common;bundle-version="2.24.0",
1312
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",

‎org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Bundle-Name: Xtext Generator 2
77
Bundle-Vendor: Eclipse Xtext
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0";x-installation:=greedy,
10-
org.eclipse.xtext.util;bundle-version="2.34.0";x-installation:=greedy,
1110
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0";visibility:=reexport;x-installation:=greedy,
1211
org.eclipse.xtend.lib;bundle-version="2.34.0",
1312
org.eclipse.xtext.ecore;bundle-version="2.34.0",

‎org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ImplicitFragment.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ package class ImplicitFragment extends AbstractStubGeneratingFragment {
3030
override generate() {
3131
if (projectConfig.runtime.manifest !== null) {
3232
projectConfig.runtime.manifest.requiredBundles.addAll(#[
33-
'org.eclipse.xtext', 'org.eclipse.xtext.util'
33+
'org.eclipse.xtext'
3434
])
3535

3636
if (generateXtendStub) {

‎org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ImplicitFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void generate() {
4545
boolean _tripleNotEquals = (_manifest != null);
4646
if (_tripleNotEquals) {
4747
this.getProjectConfig().getRuntime().getManifest().getRequiredBundles().addAll(
48-
Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("org.eclipse.xtext", "org.eclipse.xtext.util")));
48+
Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("org.eclipse.xtext")));
4949
boolean _isGenerateXtendStub = this.isGenerateXtendStub();
5050
if (_isGenerateXtendStub) {
5151
Set<String> _requiredBundles = this.getProjectConfig().getRuntime().getManifest().getRequiredBundles();

‎org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
1111
org.eclipse.equinox.common;bundle-version="3.16.0",
1212
org.eclipse.xtend.lib;bundle-version="2.14.0",
1313
org.eclipse.xtext,
14-
org.eclipse.xtext.util,
1514
org.eclipse.xtext.xbase,
1615
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
1716
Bundle-RequiredExecutionEnvironment: JavaSE-11

‎org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
1212
org.eclipse.xtend.lib;bundle-version="2.14.0",
1313
org.eclipse.xtext,
1414
org.eclipse.xtext.common.types,
15-
org.eclipse.xtext.util,
1615
org.eclipse.xtext.xbase,
1716
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
1817
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional

‎org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
1111
org.eclipse.equinox.common;bundle-version="3.16.0",
1212
org.eclipse.xtend.lib;bundle-version="2.14.0",
1313
org.eclipse.xtext,
14-
org.eclipse.xtext.util,
1514
org.eclipse.xtext.xbase,
1615
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
1716
Import-Package: org.apache.log4j

‎org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
1212
org.eclipse.xtend.lib;bundle-version="2.14.0",
1313
org.eclipse.xtext,
1414
org.eclipse.xtext.common.types,
15-
org.eclipse.xtext.util,
1615
org.eclipse.xtext.xbase,
1716
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
1817
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional

‎org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Bundle-Version: 2.34.0.qualifier
66
Bundle-Vendor: Eclipse Xtext
77
Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
9-
org.eclipse.xtext.util;bundle-version="2.34.0",
109
org.eclipse.xtext;bundle-version="2.34.0",
1110
org.eclipse.xtext.ui;bundle-version="2.34.0",
1211
org.eclipse.ui.editors;bundle-version="3.14.300",

0 commit comments

Comments
 (0)