[507474] Partially revert the move to Guava 21

This reverts the parts of commit
804aafa0862320435715b22100054bc4ddbfd8ed which opened the Guava range,
but keeps the actual code changes that remove usage of Guava APIs that
have disappeared in Guava 21 (so the code is still ready to switch).

Until all our dependencies have moved to Guava 21 too (AQL, Acceleo,
EMF Compare, Xtext), opening our version ranges to allow Guava 21
causes more issues that it solves, as it allows Sirius plug-ins to
resolve using Guava 21 (or 18) while Acceleo & AQL plug-ins (for
example) resolve with Guava 15.

Bug: 507474
Change-Id: I120216e34d466b09309c1ba253da7d103c21c8a7
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

33 files changed, 33 insertions, 33 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF
index 2da4ea9d50..ddb56192eb 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.sirius.common.acceleo.aql.ide;singleton:=true
 Bundle-Version: 5.0.0.qualifier
 Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.sirius.common.acceleo.aql;bundle-version="2.0.0",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.emf.ecore;bundle-version="2.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF
index 27fea7417e..23122eb47d 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.sirius.common.acceleo.aql.business.AQLSiriusPlugin
 Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.core.resources;bundle-version="3.4.0",
  org.eclipse.core.runtime;bundle-version="3.4.0",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.ecore.extender;bundle-version="2.0.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
  org.eclipse.sirius.ext.base;bundle-version="3.1.0"
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/META-INF/MANIFEST.MF
index 70ea620f25..71ebc52bfc 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.sirius.common.acceleo.mtl;bundle-version="2.0.0",
  org.eclipse.jface.text;bundle-version="3.5.0",
  org.eclipse.acceleo.ide.ui;bundle-version="3.4.1",
  org.eclipse.acceleo.parser;bundle-version="3.4.1",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.core.filebuffers;bundle-version="3.5.200",
  org.eclipse.swt;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF
index c36d81d361..0ef5ef191b 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.acceleo.parser;bundle-version="3.4.1",
  org.eclipse.core.resources;bundle-version="3.4.0",
  org.eclipse.core.runtime;bundle-version="3.4.0",
- com.google.guava;bundle-version="[11.0.2,22.0)"
+ com.google.guava;bundle-version="[11.0.2,16.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.sirius.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.ui/META-INF/MANIFEST.MF
index 4ee8e1f5f0..c0fed420b7 100644
--- a/plugins/org.eclipse.sirius.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.8.0",
  org.eclipse.jface.text;bundle-version="3.8.2",
  org.eclipse.ui.ide;bundle-version="3.8.2",
  org.eclipse.emf.workspace;bundle-version="1.5.1",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.core.expressions;bundle-version="3.3.0",
  org.eclipse.sirius.ecore.extender;bundle-version="2.0.0"
 Export-Package: org.eclipse.sirius.common.ui;version="2.1.0",
diff --git a/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF
index bede6a137e..a6416f8441 100644
--- a/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.sirius.ecore.extender;bundle-version="2.0.0",
  org.eclipse.emf.workspace;bundle-version="1.5.1",
- com.google.guava;bundle-version="[11.0.2,22.0)"
+ com.google.guava;bundle-version="[11.0.2,16.0)"
 Export-Package: org.eclipse.sirius.common.tools;version="3.0.0",
  org.eclipse.sirius.common.tools.api.constant;version="2.0.4",
  org.eclipse.sirius.common.tools.api.contentassist;version="2.1.0",
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.sequence.ui/META-INF/MANIFEST.MF
index 40ff62348f..88e5ae2fff 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.sirius.diagram.sequence.ui;singleton:=true
 Bundle-Version: 5.0.0.qualifier
 Bundle-Activator: org.eclipse.sirius.diagram.sequence.ui.SequenceDiagramUIPlugin$Implementation
 Bundle-Vendor: %providerName
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)",
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.sirius.diagram.sequence.edit;bundle-version="2.0.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
index b9230852c5..67caf497c0 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@ Export-Package: org.eclipse.sirius.diagram.sequence;version="2.1.0",
  org.eclipse.sirius.diagram.sequence.util;version="3.0.0"
 Require-Bundle: org.eclipse.sirius.common;bundle-version="4.0.0",
  org.eclipse.sirius.ecore.extender;bundle-version="4.0.0",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
  org.eclipse.draw2d;bundle-version="3.9.0",
  org.eclipse.sirius.diagram;bundle-version="4.0.0";visibility:=reexport,
diff --git a/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF
index 68ad96d73d..338494dac0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)",
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.apache.batik.bridge;bundle-version="[1.6.0,1.8.0)",
  org.apache.batik.dom;bundle-version="[1.6.0,1.8.0)",
  org.apache.batik.dom.svg;bundle-version="[1.6.0,1.8.0)",
diff --git a/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF
index 17f8c32ada..80ac0ef539 100644
--- a/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.sirius.diagram.DiagramPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)",
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.6.1",
  org.eclipse.sirius.common;bundle-version="4.0.0",
  org.eclipse.sirius.ecore.extender;bundle-version="4.0.0",
diff --git a/plugins/org.eclipse.sirius.ecore.extender/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ecore.extender/META-INF/MANIFEST.MF
index 536431b05c..4bf642f419 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ecore.extender/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.8.1",
  org.eclipse.emf.edit;bundle-version="2.8.0",
- com.google.guava;bundle-version="[11.0.2,22.0)"
+ com.google.guava;bundle-version="[11.0.2,16.0)"
 Export-Package: org.eclipse.sirius.ecore.extender.business.api.accessor;version="3.0.0",
  org.eclipse.sirius.ecore.extender.business.api.accessor.exception;version="3.0.0",
  org.eclipse.sirius.ecore.extender.business.api.permission;version="2.0.4",
diff --git a/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
index 691f2d34a3..1a82283613 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.sirius.editor.diagram;singleton:=true
 Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)", 
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)", 
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.edit.ui;bundle-version="2.3.1",
  org.eclipse.sirius.common;bundle-version="2.0.0",
diff --git a/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF
index 22132ab724..8d3cfbdb36 100644
--- a/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.sirius.editor.properties;singleton:=true
 Bundle-Version: 5.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)",
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.edit.ui;bundle-version="2.3.1",
  org.eclipse.sirius.common;bundle-version="2.0.0",
diff --git a/plugins/org.eclipse.sirius.editor.tree/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.tree/META-INF/MANIFEST.MF
index 09d5b99391..d2d41d898f 100644
--- a/plugins/org.eclipse.sirius.editor.tree/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor.tree/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.emf.edit.ui;bundle-version="2.3.1",
  org.eclipse.sirius.common;bundle-version="2.0.0",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
index e6fdbb9bd4..1d9fbf9889 100644
--- a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.sirius.ui;bundle-version="2.0.0",
  org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.sirius.common.ui;bundle-version="2.0.0",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="3.8.0",
  org.eclipse.emf.validation;bundle-version="1.4.0",
  org.eclipse.ui.navigator;bundle-version="3.5.200",
diff --git a/plugins/org.eclipse.sirius.ext.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ext.emf/META-INF/MANIFEST.MF
index d827b5cec2..c54170c157 100644
--- a/plugins/org.eclipse.sirius.ext.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ext.emf/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.sirius.ext.emf
 Bundle-Version: 5.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)",
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.emf;bundle-version="2.6.0",
  org.eclipse.emf.common;bundle-version="2.8.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
diff --git a/plugins/org.eclipse.sirius.sample.ecore.design/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.sample.ecore.design/META-INF/MANIFEST.MF
index ba897896ac..4f089c7f77 100644
--- a/plugins/org.eclipse.sirius.sample.ecore.design/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.sample.ecore.design/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.8.2",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",
  org.eclipse.ui.navigator;bundle-version="3.5.200",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.diagram.ui;bundle-version="2.0.0"
 Bundle-ManifestVersion: 2
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.sirius.synchronizer/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.synchronizer/META-INF/MANIFEST.MF
index 3d48995735..68b5b6b685 100644
--- a/plugins/org.eclipse.sirius.synchronizer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.synchronizer/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Localization: plugin
 Export-Package: org.eclipse.sirius.synchronizer;version="3.1.0",
  org.eclipse.sirius.synchronizer.internal;x-internal:=true;version="2.1.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.8.3",
- com.google.guava;bundle-version="[11.0.2,22.0)"
+ com.google.guava;bundle-version="[11.0.2,16.0)"
 Import-Package: org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.sirius.ext.base;version="2.1.0"
 Bundle-Activator: org.eclipse.sirius.synchronizer.internal.SynchronizerPlugin$Implementation
diff --git a/plugins/org.eclipse.sirius.table.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.table.ui/META-INF/MANIFEST.MF
index 18187696f9..1584d47d65 100644
--- a/plugins/org.eclipse.sirius.table.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.table.ui/META-INF/MANIFEST.MF
@@ -42,7 +42,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
  org.eclipse.emf.workspace;bundle-version="1.5.1",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.common.ui;bundle-version="2.0.0",
  org.eclipse.jface.text;bundle-version="3.8.2"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.sirius.table/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.table/META-INF/MANIFEST.MF
index bb03cccf84..2087a590e8 100644
--- a/plugins/org.eclipse.sirius.table/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.table/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.sirius.common;bundle-version="4.0.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.8.1",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
- com.google.guava;bundle-version="[11.0.2,22.0)"
+ com.google.guava;bundle-version="[11.0.2,16.0)"
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.sirius.table.tools.internal.TablePlugin$Implementation
diff --git a/plugins/org.eclipse.sirius.tests.junit.support/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.junit.support/META-INF/MANIFEST.MF
index d3b90eb986..2d01e8cb33 100644
--- a/plugins/org.eclipse.sirius.tests.junit.support/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.junit.support/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.sirius.ecore.extender,
  org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.core.filebuffers,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.emf.common.ui;bundle-version="2.3.1",
  org.eclipse.ui.ide,
  org.eclipse.sirius.diagram.ui,
diff --git a/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF
index 85321e89f0..c50cf73857 100644
--- a/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF
@@ -36,7 +36,7 @@ Require-Bundle: org.eclipse.sirius.tests.sample.benchmark,
  org.eclipse.sirius.sample.ecore.design,
  org.eclipse.sirius.tests.sample.docbook.design,
  org.apache.xerces,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="1.0.101",
  org.eclipse.sirius.table,
  org.eclipse.sirius.table.ui,
diff --git a/plugins/org.eclipse.sirius.tests.sample.migration.design/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.sample.migration.design/META-INF/MANIFEST.MF
index 57da9916a4..5a1eefcc59 100644
--- a/plugins/org.eclipse.sirius.tests.sample.migration.design/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.sample.migration.design/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.sirius,
  org.eclipse.sirius.common.acceleo.mtl,
  org.eclipse.sirius.common.acceleo.aql,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.diagram.ui;bundle-version="1.0.0",
  org.eclipse.emf.common.ui;bundle-version="2.7.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF
index be23277d79..5ecc364792 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.sirius.ui,
  org.eclipse.sirius.tree.ui,
  org.eclipse.sirius.table.ui,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.2.1",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
  org.eclipse.gmf.runtime.diagram.ui,
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF
index 9e9efe8ddb..a1c021ae22 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.sirius.diagram.layoutdata,
  org.eclipse.sirius.tree.ui,
  org.eclipse.sirius.tree.ui.ext,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.ecore.extender,
  org.eclipse.sirius.sample.interactions.design;bundle-version="1.0.0",
  org.eclipse.core.expressions,
diff --git a/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF
index 4d2b954b1f..0e63e2934f 100644
--- a/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.sirius,
  org.eclipse.gmf.runtime.diagram.ui.render,
  org.eclipse.gmf.runtime.diagram.ui.resources.editor,
  org.eclipse.sirius.common.ui,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.ecore.extender,
  org.eclipse.ui.ide,
  org.eclipse.sirius.editor.table,
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF
index e20cbf2888..1eb256c692 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.sirius.ui.properties;bundle-version="4.1.0",
  org.eclipse.emf.ecore.xmi,
  org.eclipse.sirius.properties,
  org.eclipse.emf.compare,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.common.acceleo.aql,
  org.eclipse.sirius.common,
  org.eclipse.sirius.properties.core,
diff --git a/plugins/org.eclipse.sirius.tree.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tree.ui/META-INF/MANIFEST.MF
index 1af5d28ce2..cfa182daf1 100644
--- a/plugins/org.eclipse.sirius.tree.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tree.ui/META-INF/MANIFEST.MF
@@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.sirius;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.sirius.ui;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.ecore.extender;bundle-version="2.0.0",
  org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
diff --git a/plugins/org.eclipse.sirius.tree/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tree/META-INF/MANIFEST.MF
index 5aa7e4d68c..91e65bb45b 100644
--- a/plugins/org.eclipse.sirius.tree/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tree/META-INF/MANIFEST.MF
@@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.sirius.synchronizer;bundle-version="4.0.0";visibility:=reexport,
  org.eclipse.sirius.ecore.extender;bundle-version="4.0.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
- com.google.guava;bundle-version="[11.0.2,22.0)"
+ com.google.guava;bundle-version="[11.0.2,16.0)"
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.sirius.ext.base;version="2.1.0",
diff --git a/plugins/org.eclipse.sirius.ui.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui.debug/META-INF/MANIFEST.MF
index fe8dc95833..fdb5bc0595 100644
--- a/plugins/org.eclipse.sirius.ui.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui.debug/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
  org.eclipse.sirius.diagram.ui,
  org.eclipse.sirius.diagram.sequence.edit,
  org.eclipse.sirius.diagram.sequence.ui,
- com.google.guava;bundle-version="[11.0.2,22.0)",
+ com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.sirius.editor,
  org.eclipse.sirius.tests.sample.component;bundle-version="0.1.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.ui.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui.editor/META-INF/MANIFEST.MF
index 76443fa39e..6dd73e1272 100644
--- a/plugins/org.eclipse.sirius.ui.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui.editor/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)",
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.sirius;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="2.8.0";visibility:=reexport,
diff --git a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index bb9b746165..66f8457d5f 100644
--- a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
@@ -97,7 +97,7 @@ Export-Package: org.eclipse.sirius.description.contribution.provider;version="2.
  org.eclipse.sirius.viewpoint.description.tool.provider;version="3.0.0",
  org.eclipse.sirius.viewpoint.description.validation.provider;version="2.1.0",
  org.eclipse.sirius.viewpoint.provider;version="3.2.0"
-Require-Bundle: com.google.guava;bundle-version="[11.0.2,22.0)",
+Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.sirius;bundle-version="2.0.0";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="2.8.0";visibility:=reexport,
diff --git a/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
index edc96251d2..f3c71e36b6 100644
--- a/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
@@ -124,7 +124,7 @@ Require-Bundle: org.eclipse.sirius.common;bundle-version="4.0.0",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.ecore;bundle-version="2.8.3";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="2.8.1";visibility:=reexport,
- com.google.guava;bundle-version="[11.0.2,22.0)"
+ com.google.guava;bundle-version="[11.0.2,16.0)"
 Import-Package: org.eclipse.sirius.ext.base;version="2.0.0",
  org.eclipse.sirius.ext.base.cache;version="2.0.0",
  org.eclipse.sirius.ext.base.collect;version="2.0.0",