From 59e440fe30f76ff237740a5b0f7ef426ae1ffe2c Mon Sep 17 00:00:00 2001 From: Sven Efftinge Date: Mon, 28 Nov 2011 16:05:34 +0100 Subject: [PATCH] Migration to Guice 3 and Guava Part II --- plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF | 4 ++-- plugins/org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 0c9dcf9d0..ade51541b 100644 --- a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Export-Package: org.eclipse.xtext.util, org.eclipse.xtext.util.formallang;x-friends:="org.eclipse.xtext,org.eclipse.xtext.tests", org.eclipse.xtext.util.internal;x-friends:="org.eclipse.xtext,org.eclipse.xtext.tests,org.eclipse.xtext.junit4" Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.3.2", - com.google.collect;bundle-version="1.0.0";visibility:=reexport, - com.google.inject;bundle-version="2.0.0";visibility:=reexport + com.google.guava;resolution:=optional;visibility:=reexport, + com.google.inject;bundle-version="2.0.0";resolution:=optional;visibility:=reexport Import-Package: org.apache.log4j;version="1.2.15" diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF index 1abf9962a..4c6b8472c 100644 --- a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -118,7 +118,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;visibility:=reexport, org.eclipse.emf.ecore;bundle-version="2.5.0";visibility:=reexport, org.eclipse.xtext.util;bundle-version="2.0.0";visibility:=reexport, org.antlr.runtime;bundle-version="3.2.0";visibility:=reexport, - com.google.inject;bundle-version="2.0.0";visibility:=reexport, + com.google.inject;bundle-version="2.0.0";resolution:=optional;visibility:=reexport, org.eclipse.emf.codegen;bundle-version="2.5.0";resolution:=optional, org.eclipse.emf.codegen.ecore;bundle-version="2.5.0";resolution:=optional, org.eclipse.emf.mwe.core;bundle-version="1.2.0";resolution:=optional;visibility:=reexport,