From e226792fae6be872b85642fe61db273a52f23dc0 Mon Sep 17 00:00:00 2001 From: Dennis Huebner Date: Tue, 17 Feb 2015 10:51:11 +0100 Subject: [PATCH] [osgi] Part of Bug 460001 : Missing "uses"-constraints cause class loader problems with different Guava versions. - Removed guava reexport from bundles which already reexport xbase.lib - Removed "optional" in xtext.util for bundles that are used in public signatures - Added uses directive to xtext.util to track the use of guava packages Change-Id: I79ef3add1befe66c3068b4345a53bab29042b73d Signed-off-by: Dennis Huebner --- .../META-INF/MANIFEST.MF | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF index e6d558552..9e6b0fa2c 100644 --- a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -6,12 +6,20 @@ Bundle-SymbolicName: org.eclipse.xtext.util Bundle-Version: 2.8.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.xtext.util, - org.eclipse.xtext.util.concurrent, +Export-Package: org.eclipse.xtext.util; + uses:="org.eclipse.emf.ecore, + com.google.common.base, + com.google.inject, + org.eclipse.emf.common.notify, + org.eclipse.emf.ecore.resource, + org.apache.log4j, + org.eclipse.xtext.util.concurrent, + org.eclipse.emf.ecore.util", + org.eclipse.xtext.util.concurrent;uses:="org.eclipse.xtext.util", org.eclipse.xtext.util.formallang;x-internal:=true, org.eclipse.xtext.util.internal;x-internal:=true -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.3.2", - com.google.guava;bundle-version="[10.0.1,19.0.0)";resolution:=optional;visibility:=reexport;x-installation:=greedy, - com.google.inject;bundle-version="3.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.11.0", + com.google.guava;bundle-version="[10.0.1,19.0.0)";visibility:=reexport, + com.google.inject;bundle-version="3.0.0";visibility:=reexport, javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy Import-Package: org.apache.log4j;version="1.2.15"