From bf5fc00e091a4465742731af154d935dde85f463 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Thu, 21 Feb 2013 20:24:18 +0100 Subject: [PATCH] [deps][bug 401285] use package-import to depend on guava Xtext and Xtend should use Package-Import declarations to depend on Guava rather than Require-Bundle declarations. The reason for this is that the user may want to use a different bundle than the standard com.google.guava bundle; e.g. com.google.guava.jdk5. Also Xtext and Xtend should when possible omit the version qualifier from the dependencies on Guava. The reason being that if Xtext depends upon a specific Guava version, e.g. version="10.0.1", then users would not really be able to use any other Guava version, since the major version is incremented with every release. So if a specific minimum version of Guava is required it is be best to test against all current Guava versions and then specify a version range as in e.g. version="[10.0.1,14.0.0)". These dependencies should then be updated when new versions of Guava become available. This change corrects all Xtext and Xtend Guava dependencies and adds API filters where necessary. Bundle re-exports remain, but are optional. Change-Id: Iae2140ce606f697d9f5300f39b2e161dd5e02047 --- plugins/org.eclipse.xtext.util/.settings/.api_filters | 6 ++++++ plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/org.eclipse.xtext.util/.settings/.api_filters b/plugins/org.eclipse.xtext.util/.settings/.api_filters index 51ff61143..a97ce9939 100644 --- a/plugins/org.eclipse.xtext.util/.settings/.api_filters +++ b/plugins/org.eclipse.xtext.util/.settings/.api_filters @@ -7,5 +7,11 @@ + + + + + + diff --git a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 56c3ac713..b8e15c599 100644 --- a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -11,8 +11,10 @@ Export-Package: 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";resolution:=optional;x-installation:=greedy;visibility:=reexport, - com.google.inject;bundle-version="2.0.0";resolution:=optional;x-installation:=greedy;visibility:=reexport, - javax.inject;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy;visibility:=reexport, + com.google.guava;resolution:=optional;visibility:=reexport;x-installation:=greedy, + com.google.inject;bundle-version="2.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, + javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy -Import-Package: org.apache.log4j;version="1.2.15" +Import-Package: com.google.common.base, + com.google.common.collect, + org.apache.log4j;version="1.2.15"