[507474] Update Guava range to [15.0,22.0)

This includes v15 which was in Neon, and v21 which will be in Oxygen,
the two Eclipse versions we support in Sirius 5.0.

Also normalize the way we depend on Guava to use Require-Bundle
everywhere. It's not the OSGi-recommended way, but it means we don't
depend on Orbit to have all the package versions right every time and
makes things simpler to manage by being consistent.

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

45 files changed, 64 insertions, 69 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 ddb56192eb..5e448647ff 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 23122eb47d..87e25662c8 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 71ebc52bfc..06c5a38b76 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 0ef5ef191b..75b225ad6a 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,16.0)"
+ com.google.guava;bundle-version="[15.0,22.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
@@ -20,7 +20,6 @@ Export-Package: org.eclipse.sirius.common.acceleo.mtl;version="3.0.0",
  org.eclipse.sirius.common.acceleo.mtl.business.internal.extension;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.common.acceleo.mtl.business.internal.interpreter;x-internal:=true;version="2.1.0"
 Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.collect;version="2.0.0",
- org.eclipse.sirius.ext.base;version="2.1.0",
+Import-Package: org.eclipse.sirius.ext.base;version="2.1.0",
  org.eclipse.sirius.ext.base.cache;version="2.0.0"
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.sirius.common.interpreter.aql/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.interpreter.aql/META-INF/MANIFEST.MF
index 065b44242f..d7f48721fe 100644
--- a/plugins/org.eclipse.sirius.common.interpreter.aql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.interpreter.aql/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Export-Package: org.eclipse.sirius.common.interpreter.aql;version="5.0.0"
 Require-Bundle: org.eclipse.acceleo.query;bundle-version="5.0.0",
  org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.sirius.common.interpreter;bundle-version="[5.0.0,6.0.0)"
-Import-Package: com.google.common.cache;version="15.0.0"
+ org.eclipse.sirius.common.interpreter;bundle-version="[5.0.0,6.0.0)",
+ com.google.guava;bundle-version="[15.0,22.0)"
diff --git a/plugins/org.eclipse.sirius.common.interpreter/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.interpreter/META-INF/MANIFEST.MF
index 22baab07c5..d86f60bb67 100644
--- a/plugins/org.eclipse.sirius.common.interpreter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.interpreter/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
+ com.google.guava;bundle-version="[15.0,22.0)"
 Export-Package: org.eclipse.sirius.common.interpreter.api;version="1.0.0"
-Import-Package: com.google.common.collect;version="15.0.0"
+
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 c0fed420b7..99b3df5578 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 a6416f8441..5675897af5 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,16.0)"
+ com.google.guava;bundle-version="[15.0,22.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 88e5ae2fff..6fd4fdde13 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,16.0)",
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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 67caf497c0..2b06dff725 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 338494dac0..8f3f726aa3 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,16.0)",
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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 80ac0ef539..916b21268f 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,16.0)",
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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 4bf642f419..91489a979f 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,16.0)"
+ com.google.guava;bundle-version="[15.0,22.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 1a82283613..192dbc261f 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,16.0)", 
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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 9f848dbfd4..aebd32c91a 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,16.0)",
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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 d2d41d898f..f410186efc 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 b4724730a1..9ace63a278 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ext.base/META-INF/MANIFEST.MF
index 1dfe38cafc..abff532379 100644
--- a/plugins/org.eclipse.sirius.ext.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ext.base/META-INF/MANIFEST.MF
@@ -6,12 +6,11 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
-Import-Package: com.google.common.base;version="[11.0.2,16.0)",
- com.google.common.collect;version="[11.0.2,16.0)"
 Export-Package: org.eclipse.sirius.ext.base;version="2.1.0",
  org.eclipse.sirius.ext.base.cache;version="2.0.4",
  org.eclipse.sirius.ext.base.collect;version="2.0.4",
  org.eclipse.sirius.ext.base.relations;version="2.0.4"
 Bundle-Activator: org.eclipse.sirius.ext.base.BasePlugin$Implementation
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.8.0"
+Require-Bundle: org.eclipse.emf.common;bundle-version="2.8.0",
+ com.google.guava;bundle-version="[15.0,22.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.ext.draw2d/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ext.draw2d/META-INF/MANIFEST.MF
index 2c7232fe31..124f5e2580 100644
--- a/plugins/org.eclipse.sirius.ext.draw2d/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ext.draw2d/META-INF/MANIFEST.MF
@@ -6,15 +6,15 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
-Import-Package: org.eclipse.draw2d,
- org.eclipse.draw2d.geometry,
- org.eclipse.draw2d.graph,
- org.eclipse.draw2d.images,
- org.eclipse.draw2d.internal,
- org.eclipse.draw2d.parts,
- org.eclipse.draw2d.text,
- org.eclipse.draw2d.widgets,
- org.eclipse.swt.graphics
+Import-Package: org.eclipse.draw2d;version="0.0.0",
+ org.eclipse.draw2d.geometry;version="0.0.0",
+ org.eclipse.draw2d.graph;version="0.0.0",
+ org.eclipse.draw2d.images;version="0.0.0",
+ org.eclipse.draw2d.internal;version="0.0.0",
+ org.eclipse.draw2d.parts;version="0.0.0",
+ org.eclipse.draw2d.text;version="0.0.0",
+ org.eclipse.draw2d.widgets;version="0.0.0",
+ org.eclipse.swt.graphics;version="0.0.0"
 Export-Package: org.eclipse.sirius.ext.draw2d;version="3.1.0",
  org.eclipse.sirius.ext.draw2d.figure;version="2.0.4"
 Bundle-Activator: org.eclipse.sirius.ext.draw2d.Draw2DExtPlugin$Implementation
diff --git a/plugins/org.eclipse.sirius.ext.e3/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ext.e3/META-INF/MANIFEST.MF
index 643fcfc9a3..4ab90eb136 100644
--- a/plugins/org.eclipse.sirius.ext.e3/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ext.e3/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
-Import-Package: com.google.common.base;version="11.0.2",
- org.eclipse.sirius.ext.base;version="2.0.0"
+Require-Bundler: com.google.guava;bundle-version="[15.0,22.0)"
+Import-Package: org.eclipse.sirius.ext.base;version="2.0.0"
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 c54170c157..c87a79b3db 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,16.0)",
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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.ext.gef/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ext.gef/META-INF/MANIFEST.MF
index bd0b147ca2..75200a1b60 100644
--- a/plugins/org.eclipse.sirius.ext.gef/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ext.gef/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.gef;bundle-version="3.9.0",
- org.eclipse.equinox.common;bundle-version="3.6.100"
+ org.eclipse.equinox.common;bundle-version="3.6.100",
+ com.google.guava;bundle-version="[15.0,22.0)"
 Export-Package: org.eclipse.sirius.ext.gef.editpolicies;version="2.0.4",
  org.eclipse.sirius.ext.gef.query;version="3.1.0"
-Import-Package: com.google.common.base;version="[11.0.2,16.0)",
- com.google.common.collect;version="[11.0.2,16.0)"
diff --git a/plugins/org.eclipse.sirius.ext.gmf.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ext.gmf.runtime/META-INF/MANIFEST.MF
index 84cd161da4..0789b6e783 100644
--- a/plugins/org.eclipse.sirius.ext.gmf.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ext.gmf.runtime/META-INF/MANIFEST.MF
@@ -6,9 +6,8 @@ Bundle-Version: 5.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Import-Package: com.google.common.base;version="10.0.1",
- com.google.common.collect;version="10.0.1",
- org.eclipse.core.runtime,
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.0)"
+Import-Package: org.eclipse.core.runtime,
  org.eclipse.draw2d,
  org.eclipse.draw2d.geometry,
  org.eclipse.emf.ecore,
diff --git a/plugins/org.eclipse.sirius.interpreter/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.interpreter/META-INF/MANIFEST.MF
index 689571ba03..cb54c98deb 100644
--- a/plugins/org.eclipse.sirius.interpreter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.interpreter/META-INF/MANIFEST.MF
@@ -13,12 +13,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.jface;bundle-version="3.8.0",
  org.eclipse.jface.text;bundle-version="3.8.2",
  org.eclipse.ui.editors;bundle-version="3.8.0",
- org.eclipse.emf.common.ui;bundle-version="2.7.0"
+ org.eclipse.emf.common.ui;bundle-version="2.7.0",
+ com.google.guava;bundle-version="[15.0,22.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Import-Package: com.google.common.base;version="2.0.0",
- com.google.common.collect;version="2.0.0",
- org.eclipse.sirius.ext.base;version="2.1.0"
+Import-Package: org.eclipse.sirius.ext.base;version="2.1.0"
 Export-Package: org.eclipse.sirius.common.acceleo.interpreter;version="3.0.0"
diff --git a/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF
index ba6c1414aa..f9f61cdc01 100644
--- a/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF
@@ -28,8 +28,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0",
  org.eclipse.eef.ide;bundle-version="2.0.0",
  org.eclipse.emf.transaction;bundle-version="1.8.0",
  org.eclipse.sirius.ext.emf.edit;bundle-version="5.0.0",
- org.eclipse.sirius.properties.defaultrules;bundle-version="5.0.0"
-Import-Package: com.google.common.base;version="[15.0.0,16.0.0)",
- com.google.common.collect;version="[15.0.0,16.0.0)"
+ org.eclipse.sirius.properties.defaultrules;bundle-version="5.0.0",
+ com.google.guava;bundle-version="[15.0,22.0)"
 Bundle-Activator: org.eclipse.sirius.properties.core.internal.SiriusPropertiesCorePlugin$Implementation
 
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 4f089c7f77..06276d4070 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.0)",
  org.eclipse.sirius.diagram.ui;bundle-version="2.0.0"
 Bundle-ManifestVersion: 2
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.sirius.sample.interactions.design/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.sample.interactions.design/META-INF/MANIFEST.MF
index 7787840a29..0f990160f2 100644
--- a/plugins/org.eclipse.sirius.sample.interactions.design/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.sample.interactions.design/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.help,
  org.eclipse.sirius.diagram.sequence,
  org.eclipse.sirius.common.acceleo.aql,
- com.google.guava;bundle-version="11.0.2",
+ com.google.guava;bundle-version="[15.0,22.0)",
  org.eclipse.sirius.ext.base;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.sirius.synchronizer/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.synchronizer/META-INF/MANIFEST.MF
index 68b5b6b685..a8a7177e1b 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,16.0)"
+ com.google.guava;bundle-version="[15.0,22.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 1584d47d65..35990f0e7c 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 2087a590e8..c58439e110 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,16.0)"
+ com.google.guava;bundle-version="[15.0,22.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 2d01e8cb33..558e1f15ea 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 c50cf73857..e071547d4a 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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.component/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.sample.component/META-INF/MANIFEST.MF
index 1554015850..a1093f6fcf 100644
--- a/plugins/org.eclipse.sirius.tests.sample.component/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.sample.component/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Export-Package: org.eclipse.sirius.tests.sample.component,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
- com.google.guava;bundle-version="[11.0.2,16.0.0)"
+ com.google.guava;bundle-version="[15.0,22.0)"
 Bundle-ActivationPolicy: lazy
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 5a1eefcc59..7792e58310 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 5ecc364792..e16628a934 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 a1c021ae22..d7fb85fa6f 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 0e63e2934f..13223267a4 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 082d71db31..2942c5619d 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 cfa182daf1..9f5dacd6ee 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 91e65bb45b..af6792a62d 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,16.0)"
+ com.google.guava;bundle-version="[15.0,22.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 fdb5bc0595..f4ceefc572 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,16.0)",
+ com.google.guava;bundle-version="[15.0,22.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 35f2ccce43..c707372c57 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,16.0)",
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
index 4b8d798a27..f92dc7cece 100644
--- a/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.eef;bundle-version="1.8.0",
  org.eclipse.sirius;bundle-version="4.1.0",
  org.eclipse.sirius.ext.emf;bundle-version="3.1.2",
  org.eclipse.sirius.properties;bundle-version="4.1.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="[15.0,22.0)",
  org.eclipse.eef.core;bundle-version="1.8.0",
  org.eclipse.eef.ide.ui;bundle-version="1.8.0",
  org.eclipse.sirius.common;bundle-version="4.1.0",
diff --git a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index 66f8457d5f..82e224e04e 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,16.0)",
+Require-Bundle: com.google.guava;bundle-version="[15.0,22.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 2608a5ee9b..c8764239e7 100644
--- a/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius/META-INF/MANIFEST.MF
@@ -125,7 +125,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,16.0)"
+ com.google.guava;bundle-version="[15.0,22.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",