[507474] Make sure Sirius 5.0 is compatible with Guava 21

Eclipse Oxygen may switch to Guava 21 as the default (only?) version
in the SimRel, so we need to make sure we're compatible with it.

* Open the version ranges to include Guava 21.
* Remove all usages of Objects.firstNonNull(), which does not exist
  anymore in Guava 21.

Not that at this point, other dependencies of Sirius have different
version constraints, so it's not enough to ensure v21 is the one
resolved:
* org.eclipse.xtext.xbase.lib 2.11.0.v20170124-1424: [14.0.0,19.0.0)
* org.eclipse.xtext.util 2.11.0.v20170130-0808: [14.0.0,19.0.0)

Xtext considers moving to Guava 21 for v2.12, see
https://github.com/eclipse/xtext-lib/issues/30.

In the meantime, the build still resolves to Guava 15, but a test was
made by removing Xtext from the build, and Sirius builds fine when
forcing Guava 21 to be really used.

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

43 files changed, 64 insertions, 65 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..2da4ea9d50 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="[11.0.2,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..27fea7417e 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="[11.0.2,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..70ea620f25 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="[11.0.2,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..c36d81d361 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="[11.0.2,22.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java
index 04c4f75632..b9426ef4d3 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/src/org/eclipse/sirius/common/acceleo/mtl/business/internal/interpreter/DynamicAcceleoModule.java
@@ -1,5 +1,5 @@
 /*****************************************************************************************
- * Copyright (c) 2010, 2012 Obeo and others.
+ * Copyright (c) 2010, 2017 Obeo and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
@@ -59,7 +60,6 @@ import org.eclipse.sirius.common.acceleo.mtl.AcceleoMTLInterpreterPlugin;
 import org.eclipse.sirius.common.acceleo.mtl.Messages;
 import org.eclipse.sirius.ext.base.cache.LRUCache;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -1018,7 +1018,7 @@ public class DynamicAcceleoModule {
          *            The body of our query.
          */
         public QueryIdentifier(String target, Map<String, String> queryVariables, String expression) {
-            this.targetType = Objects.firstNonNull(target, QueryIdentifier.DEFAULT_TARGET_TYPE);
+            this.targetType = Optional.ofNullable(target).orElse(QueryIdentifier.DEFAULT_TARGET_TYPE);
             this.queryVariables = queryVariables;
             this.body = expression;
         }
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..4ee8e1f5f0 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="[11.0.2,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..bede6a137e 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="[11.0.2,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.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java
index f839633215..2fb183baa9 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -31,7 +32,6 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
 import org.eclipse.sirius.common.tools.Messages;
 
-import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
@@ -189,7 +189,7 @@ public final class EclipseUtil {
                                 if (keyAttributeName != null) {
                                     key = element.getAttribute(keyAttributeName);
                                 }
-                                key = Objects.firstNonNull(key, ""); //$NON-NLS-1$
+                                key = Optional.ofNullable(key).orElse(""); //$NON-NLS-1$
                                 Collection<T> val = contributors.get(key);
                                 if (val == null) {
                                     val = Lists.newArrayList();
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..40ff62348f 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="[11.0.2,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..b9230852c5 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="[11.0.2,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..68ad96d73d 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="[11.0.2,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.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java
index 1cce84108d..0126c6a564 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2016 Borland Software Corporation and others.
+ * Copyright (c) 2008, 2017 Borland Software Corporation and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,6 +15,7 @@ package org.eclipse.sirius.diagram.ui.tools.api.figure;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.Collection;
+import java.util.Optional;
 import java.util.WeakHashMap;
 
 import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
@@ -34,7 +35,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.w3c.dom.Document;
 
-import com.google.common.base.Objects;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalListener;
@@ -259,7 +259,7 @@ public class SVGFigure extends Figure implements StyledFigure, ITransparentFigur
     }
 
     private Document createDocument() {
-        String parser = Objects.firstNonNull(XMLResourceDescriptor.getXMLParserClassName(), "org.apache.xerces.parsers.SAXParser"); //$NON-NLS-1$
+        String parser = Optional.ofNullable(XMLResourceDescriptor.getXMLParserClassName()).orElse("org.apache.xerces.parsers.SAXParser"); //$NON-NLS-1$
         SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(parser);
         return createDocument(factory, false);
     }
diff --git a/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram/META-INF/MANIFEST.MF
index 80ac0ef539..17f8c32ada 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="[11.0.2,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..536431b05c 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="[11.0.2,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..691f2d34a3 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="[11.0.2,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 8d3cfbdb36..22132ab724 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="[11.0.2,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..09d5b99391 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="[11.0.2,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 1d9fbf9889..e6fdbb9bd4 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="[11.0.2,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.editor/src/org/eclipse/sirius/editor/tools/api/menu/AbstractMenuBuilder.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/api/menu/AbstractMenuBuilder.java
index fed7c28469..7dec5d31b0 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/api/menu/AbstractMenuBuilder.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/api/menu/AbstractMenuBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2009, 2017 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.MissingResourceException;
+import java.util.Optional;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -43,7 +44,6 @@ import org.eclipse.sirius.ext.base.Options;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.ui.IEditorPart;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -526,7 +526,7 @@ public abstract class AbstractMenuBuilder {
             }
             priorityMap.put(key, priority);
         }
-        return Objects.firstNonNull(priorityMap.get(key), DEFAULT_PRIORITY);
+        return Optional.ofNullable(priorityMap.get(key)).orElse(DEFAULT_PRIORITY);
     }
 
     /**
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..d827b5cec2 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="[11.0.2,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.sample.ecore.design/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.sample.ecore.design/META-INF/MANIFEST.MF
index 4f089c7f77..ba897896ac 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="[11.0.2,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.synchronizer/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.synchronizer/META-INF/MANIFEST.MF
index 68b5b6b685..3d48995735 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="[11.0.2,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 7e7db0cf7b..41ca23dd9f 100644
--- a/plugins/org.eclipse.sirius.table.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.table.ui/META-INF/MANIFEST.MF
@@ -41,7 +41,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="[11.0.2,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..bb03cccf84 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="[11.0.2,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.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java
index 2db2dbffae..f7aa54173e 100644
--- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java
+++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008, 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2008, 2017 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.sirius.table.business.internal.refresh;
 
+import java.util.Optional;
+
 import org.eclipse.sirius.common.tools.api.util.RefreshIdsHolder;
 import org.eclipse.sirius.table.metamodel.table.DFeatureColumn;
 import org.eclipse.sirius.table.metamodel.table.description.ColumnMapping;
 
-import com.google.common.base.Objects;
-
 /**
  * This class represents a candidate for a DColumn, a candidate is a "possible"
  * DColumn which has not been confirmed yet by validation and preconditions.
@@ -104,7 +104,7 @@ public class DFeatureColumnCandidate {
     private int computeHashCode() {
         final int[] parts = new int[2];
         parts[0] = (mapping == null) ? 0 : getMappingID();
-        parts[1] = Objects.firstNonNull(featureName, "").hashCode(); //$NON-NLS-1$
+        parts[1] = Optional.ofNullable(featureName).orElse("").hashCode(); //$NON-NLS-1$
         final String sep = "/"; //$NON-NLS-1$
         return KeyCache.DEFAULT.getKey(parts[0] + sep + parts[1]);
     }
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..d3b90eb986 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="[11.0.2,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..85321e89f0 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="[11.0.2,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.migration.design/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.sample.migration.design/META-INF/MANIFEST.MF
index 5a1eefcc59..57da9916a4 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="[11.0.2,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..be23277d79 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="[11.0.2,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.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
index 9533625174..d17ab9d8d5 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
@@ -121,7 +122,6 @@ import org.hamcrest.Matcher;
 import org.junit.Assert;
 
 import com.google.common.base.Function;
-import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.LinkedHashMultimap;
@@ -1150,7 +1150,7 @@ public abstract class AbstractSiriusSwtBotGefTestCase extends SWTBotGefTestCase
         // looking for.
         String expectedTitle = editorPart.getTitle();
         if (TestsUtil.isLunaPlatform()) {
-            expectedTitle = Objects.firstNonNull(expectedTitle, "").trim();
+            expectedTitle = Optional.ofNullable(expectedTitle).orElse("").trim();
         }
         if (DDiagram.class.isAssignableFrom(expectedRepresentationClass)) {
             swtBotEditor = SWTBotSiriusHelper.getSiriusDiagramEditor(expectedTitle);
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/business/UIDiagramRepresentation.java b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/business/UIDiagramRepresentation.java
index eb39039245..81556a7b82 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/business/UIDiagramRepresentation.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/business/UIDiagramRepresentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, 2016 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2009, 2017 THALES GLOBAL SERVICES and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,8 @@
  */
 package org.eclipse.sirius.tests.swtbot.support.api.business;
 
+import java.util.Optional;
+
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.IPreferencesService;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
@@ -26,8 +28,6 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarDropDownButton;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
 import org.hamcrest.Matcher;
 
-import com.google.common.base.Objects;
-
 /**
  * Object to manage diagram representations.
  * 
@@ -250,7 +250,7 @@ public class UIDiagramRepresentation extends AbstractUIRepresentation<SWTBotSiri
     public SWTBotSiriusDiagramEditor getEditor() {
         String expectedTitle = getRepresentationName();
         if (TestsUtil.isLunaPlatform()) {
-            expectedTitle = Objects.firstNonNull(getRepresentationName(), "").trim();
+            expectedTitle = Optional.ofNullable(getRepresentationName()).orElse("").trim();
         }
         return SWTBotSiriusHelper.getDesignerEditorContainingName(expectedTitle);
     }
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..9e9efe8ddb 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="[11.0.2,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..4d2b954b1f 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="[11.0.2,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 1eb256c692..e20cbf2888 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="[11.0.2,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..1af5d28ce2 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="[11.0.2,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..5aa7e4d68c 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="[11.0.2,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.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeRefreshContext.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeRefreshContext.java
index 86f1ae3a94..5c01c84f43 100644
--- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeRefreshContext.java
+++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeRefreshContext.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2017 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@ package org.eclipse.sirius.tree.business.internal.dialect.common.tree;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Optional;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -23,8 +24,6 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.tree.business.internal.dialect.common.viewpoint.GlobalContext;
 
-import com.google.common.base.Objects;
-
 /**
  * Custom refresh context for tree refresh, which caches costly information
  * about the global result of the refresh that will be needed in all individual
@@ -68,6 +67,6 @@ public class TreeRefreshContext extends GlobalContext {
                 createdObjects = changeDescription.getObjectsToDetach();
             }
         }
-        return Objects.firstNonNull(createdObjects, Collections.<EObject> emptySet());
+        return Optional.ofNullable(createdObjects).orElse(Collections.<EObject> emptySet());
     }
 }
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..fe8dc95833 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="[11.0.2,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.debug/src/org/eclipse/sirius/ui/debug/SiriusDebugView.java b/plugins/org.eclipse.sirius.ui.debug/src/org/eclipse/sirius/ui/debug/SiriusDebugView.java
index 51d400f43f..c3b3240122 100644
--- a/plugins/org.eclipse.sirius.ui.debug/src/org/eclipse/sirius/ui/debug/SiriusDebugView.java
+++ b/plugins/org.eclipse.sirius.ui.debug/src/org/eclipse/sirius/ui/debug/SiriusDebugView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import org.eclipse.core.commands.operations.IOperationHistory;
@@ -126,7 +127,6 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.team.internal.core.streams.ProgressMonitorInputStream;
 
 import com.google.common.base.Functions;
-import com.google.common.base.Objects;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -698,7 +698,7 @@ public class SiriusDebugView extends AbstractDebugView {
                             EClass klass = obj.eClass();
                             for (EAttribute attr : klass.getEAllAttributes()) {
                                 if (attr.getEType() == DescriptionPackage.Literals.INTERPRETED_EXPRESSION) {
-                                    String value = Objects.firstNonNull((String) obj.eGet(attr), "").trim();
+                                    String value = Optional.ofNullable((String) obj.eGet(attr)).orElse("").trim();
                                     if (value.length() > 100) {
                                         value = value.substring(0, 97) + "...";
                                     }
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 6dd73e1272..76443fa39e 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="[11.0.2,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/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index 66f8457d5f..bb9b746165 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="[11.0.2,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 f3c71e36b6..edc96251d2 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,16.0)"
+ com.google.guava;bundle-version="[11.0.2,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",
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/DefaultInterpretedExpressionTargetSwitch.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/DefaultInterpretedExpressionTargetSwitch.java
index d5ee8e1af2..68194f6ebd 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/DefaultInterpretedExpressionTargetSwitch.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/DefaultInterpretedExpressionTargetSwitch.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2011, 2017 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
 package org.eclipse.sirius.business.api.dialect.description;
 
 import java.util.Collection;
+import java.util.Optional;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -24,7 +25,6 @@ import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
 import org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.Sets;
 
 /**
@@ -54,7 +54,7 @@ public class DefaultInterpretedExpressionTargetSwitch implements IInterpretedExp
      *            the global switch to use
      */
     public DefaultInterpretedExpressionTargetSwitch(EStructuralFeature feature, IInterpretedExpressionTargetSwitch globalSwitch) {
-        IInterpretedExpressionTargetSwitch theGlobalSwitch = Objects.firstNonNull(globalSwitch, this);
+        IInterpretedExpressionTargetSwitch theGlobalSwitch = Optional.ofNullable(globalSwitch).orElse(this);
         this.descriptionSwitch = new DescriptionInterpretedExpressionTargetSwitch(feature, theGlobalSwitch);
         this.styleSwitch = new StyleInterpretedExpressionTargetSwitch(feature, theGlobalSwitch);
         this.toolSwitch = new ToolInterpretedExpressionTargetSwitch(feature, theGlobalSwitch);