Permalink
Browse files

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

This reverts commit 09fb0eb.
  • Loading branch information...
1 parent e38b84b commit 2885145d12e47fb4396112cd25daf82d6f057060 @dhuebner dhuebner committed Mar 12, 2013
View
1 devtools/org.eclipse.xtext.bootstrap/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.xpand;bundle-version="1.1.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;x-installation:=greedy,
com.google.inject;bundle-version="2.0.0",
+ com.google.guava;bundle-version="1.0.0",
org.eclipse.xtext.ui;bundle-version="2.0.0",
org.eclipse.emf.mwe.utils;bundle-version="1.0.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.0.0";resolution:=optional;x-installation:=greedy
View
1 devtools/org.eclipse.xtext.language-generator/META-INF/MANIFEST.MF
@@ -16,5 +16,6 @@ Require-Bundle: org.eclipse.xtext.tests;bundle-version="1.0.0",
org.eclipse.xtext.xtext.ui.tests;bundle-version="1.0.0",
org.eclipse.emf.codegen;bundle-version="2.5.0",
org.eclipse.emf.codegen.ecore;bundle-version="2.5.0",
+ com.google.guava;bundle-version="1.0.0",
org.eclipse.emf.mwe2.launch;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy
Import-Package: org.apache.log4j;version="1.2.15"
View
1 ...ext.ui.examples/contents/org.eclipse.xtext.example.arithmetics.tests/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.xtext.example.arithmetics;bundle-version="2.0.0",
org.eclipse.emf.ecore;bundle-version="2.5.0",
org.eclipse.xtext.junit4;bundle-version="2.3.0",
+ com.google.guava;bundle-version="1.0.0",
com.google.inject;bundle-version="2.0.0",
org.eclipse.xtext;bundle-version="2.0.0",
org.eclipse.xtext.example.arithmetics.ui,
View
1 ...xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.css.tests/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.5.0",
org.junit;bundle-version="3.8.2",
org.eclipse.xtext.junit;bundle-version="2.0.0",
+ com.google.guava;bundle-version="1.0.0",
com.google.inject;bundle-version="2.0.0",
org.eclipse.xtext;bundle-version="2.0.0",
org.eclipse.xtext.example.css;bundle-version="1.0.0",
View
2 plugins/org.eclipse.xtend.lib/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Export-Package: org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro.declaration,
org.eclipse.xtend.lib.macro.expression,
org.eclipse.xtend.lib.macro.services
-Import-Package: com.google.common.annotations
+Import-Package: com.google.common.annotations;version="10.0.1"
Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.4.0";visibility:=reexport
View
6 plugins/org.eclipse.xtext.builder/META-INF/MANIFEST.MF
@@ -25,6 +25,7 @@ Export-Package: org.eclipse.xtext.builder,
Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0",
org.eclipse.xtext.util;bundle-version="2.0.0",
org.eclipse.emf.ecore;bundle-version="2.5.0";visibility:=reexport,
+ com.google.guava;bundle-version="1.0.0",
com.google.inject;bundle-version="2.0.0",
org.eclipse.core.resources;bundle-version="3.5.0";resolution:=optional;x-installation:=greedy,
org.eclipse.jdt.core;bundle-version="3.5.0";resolution:=optional;x-installation:=greedy,
@@ -45,8 +46,5 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0",
org.eclipse.jdt.debug;bundle-version="3.5.0";resolution:=optional;x-installation:=greedy,
org.eclipse.jdt.debug.ui;bundle-version="3.5.0";resolution:=optional
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base,
- com.google.common.collect,
- com.google.common.io,
- org.apache.log4j;version="1.2.15"
+Import-Package: org.apache.log4j;version="1.2.15"
Bundle-Activator: org.eclipse.xtext.builder.internal.Activator
View
6 plugins/org.eclipse.xtext.util/.settings/.api_filters
@@ -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
10 plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF
@@ -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"
View
11 plugins/org.eclipse.xtext.xbase.junit/.settings/.api_filters
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.xtext.xbase.junit" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter id="927989779">
- <message_arguments>
- <message_argument value="2.4.0"/>
- <message_argument value="com.google.guava"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
View
8 plugins/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Version: 2.4.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.0.0";visibility:=reexport,
- com.google.guava;resolution:=optional;visibility:=reexport,
+ com.google.guava;bundle-version="1.0.0";visibility:=reexport,
com.google.inject;bundle-version="2.0.0";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.5.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.emf.ecore;bundle-version="2.5.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
@@ -27,9 +27,5 @@ Export-Package: org.eclipse.xtext.xbase.compiler;x-internal:=true,
testdata.ordersensitivity
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
-Import-Package: com.google.common.annotations,
- com.google.common.base,
- com.google.common.collect,
- com.google.common.primitives,
- org.apache.log4j;version="1.2.15",
+Import-Package: org.apache.log4j;version="1.2.15",
org.junit;version="[4.0.0,5.0.0)"
View
5 plugins/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF
@@ -6,6 +6,5 @@ Bundle-Version: 2.4.0.qualifier
Export-Package: org.eclipse.xtend2.lib,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.google.common.annotations,
- com.google.common.base,
- com.google.common.collect
+Require-Bundle: com.google.guava;bundle-version="10.0.1"
+
View
17 plugins/org.eclipse.xtext.xbase.lib/.settings/.api_filters
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.xtext.xbase.lib" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter id="923795461">
- <message_arguments>
- <message_argument value="2.4.0"/>
- <message_argument value="2.3.0"/>
- </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
6 plugins/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF
@@ -8,9 +8,5 @@ Export-Package: org.eclipse.xtend2.lib,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtext.xbase.lib.internal;x-internal:=true,
org.eclipse.xtext.xbase.lib.util
-Require-Bundle: com.google.guava;resolution:=optional;visibility:=reexport
+Require-Bundle: com.google.guava;visibility:=reexport;bundle-version="10.0.1"
Bundle-Vendor: Eclipse Modeling Project
-Import-Package: com.google.common.annotations,
- com.google.common.base,
- com.google.common.collect,
- com.google.common.primitives
View
4 xtext.website.generator/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: xtext.website.generator
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.3.0",
+ com.google.guava,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.bootstrapdoc;bundle-version="1.0.0",
org.eclipse.xtext.xdoc;bundle-version="0.1.0",
@@ -13,6 +14,3 @@ Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.3.0",
org.eclipse.xtend.core;bundle-version="2.3.0";visibility:=reexport
Export-Package: generator,
xdocgen
-Import-Package: com.google.common.base,
- com.google.common.collect,
- com.google.common.io

0 comments on commit 2885145

Please sign in to comment.