Revert "[deps][bug 401285] use package-import to depend on guava"

This reverts commit 09fb0ebc257aad2a3c0dbec1abf5227dbb2b7f31.
This commit is contained in:
Dennis Huebner 2013-03-12 12:07:40 +01:00
parent 2b2f0c968e
commit 1d7ac0d17a
2 changed files with 4 additions and 12 deletions

View file

@ -7,11 +7,5 @@
<message_argument value="2.2.1"/>
</message_arguments>
</filter>
<filter id="927989779">
<message_arguments>
<message_argument value="2.4.0"/>
<message_argument value="com.google.guava"/>
</message_arguments>
</filter>
</resource>
</component>

View file

@ -11,10 +11,8 @@ 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;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,
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,
org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Import-Package: com.google.common.base,
com.google.common.collect,
org.apache.log4j;version="1.2.15"
Import-Package: org.apache.log4j;version="1.2.15"