[releng] [oxygen] Update guava dependencies to 21.0.0

- Update target definitions to the latest orbit repository and set guava dependecy to 21.0.0
- Update MANIFEST.MF guava version references to 21.0.0 throughout the repository
- regenerate the target platforms
- update the sdk feature.xml to point on guava 21.0.0.v20170206-1425 from guava 15.0.0.v201403281430
- modified manifests and java classes to fit the new API
- ameneded the tests on guava version targets in the manifests

Change-Id: I7d15679cd28585f6ea517466e70bc0848dd3179d
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

27 files changed, 31 insertions, 30 deletions

diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
index c696f0f97c0..4b3edff14b5 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
@@ -219,7 +219,7 @@ public class BundlesTests extends AbstractPapyrusTest {
 
 	@Test
 	public void guavaDependencyVersionText() {
-		testPapyrusDependencies2("com.google.guava", "11.0.0");//$NON-NLS-1$ //$NON-NLS-2$
+		testPapyrusDependencies2("com.google.guava", "21.0.0");//$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	public final static String REGEX_PACKAGE_WORD = "\\w(?:\\w|\\d)*";// match a //$NON-NLS-1$
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
index 0ab3387c0db..f827b91b90e 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui;bundle-version="3.6.0";resolution:=optional,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.core.resources;visibility:=reexport
 Import-Package: com.ibm.icu.text;resolution:=optional,
  org.eclipse.emf.ecore;version="2.10.0"
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
index bbf4199d68b..b21b030ff26 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
@@ -72,7 +72,7 @@ public class ManifestEditorTest {
 		assertThat(one(manifest, "org.eclipse.jface"), not(containsString(";")));
 
 		// And still just the one one Guava with its version
-		assertThat(one(manifest, "com.google.guava"), containsString(";bundle-version=\"15.0.0\""));
+		assertThat(one(manifest, "com.google.guava"), containsString(";bundle-version=\"21.0.0\""));
 	}
 
 	@WithResource("manifest_project/META-INF/MANIFEST.MF")
@@ -434,7 +434,7 @@ public class ManifestEditorTest {
 		assertThat(manifest, hasItem(" org.eclipse.papyrus.eclipse.project.editors;bundle-version=\"[2.0.0,3.0.0)\","));
 
 		// This is now the last one (no trailing comma)
-		assertThat(manifest, hasItem(" com.google.guava;bundle-version=\"15.0.0\""));
+		assertThat(manifest, hasItem(" com.google.guava;bundle-version=\"21.0.0\""));
 	}
 
 	@WithResource("manifest_project/META-INF/MANIFEST.MF")
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index 1ba9ca7d298..f4e4a3a353a 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.navigator;bundle-version="3.5.0",

  org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",

- com.google.guava;bundle-version="15.0.0",

+ com.google.guava;bundle-version="21.0.0",

  org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.2.0",

diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
index c2eefe80cdb..8f709996fef 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
index fec2a248413..4e8d7e99ffa 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
index 779184bd316..b50b6875d07 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

- com.google.guava;bundle-version="15.0.0",

+ com.google.guava;bundle-version="21.0.0",

  org.eclipse.gef;bundle-version="3.10.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
index 8ea57812a98..934fe3397fe 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
index 80a33aacacb..6cca8baab4e 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
index d7a64ad0cf3..9b4b15e1e82 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.core.databinding;bundle-version="1.4.0",

  org.eclipse.core.databinding.beans;bundle-version="1.2.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.0",

- com.google.guava;bundle-version="15.0.0",

+ com.google.guava;bundle-version="21.0.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0"

 Export-Package: org.eclipse.papyrus.infra.tools.databinding,

  org.eclipse.papyrus.infra.tools.tests

diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
index 0e985bc4e56..a477dc913e7 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.ui;bundle-version="3.100.0",
  org.eclipse.core.runtime;bundle-version="3.10.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
index 48b5faa5282..e8a63ac6f24 100644
--- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.junit.utils;bundle-version="2.0.0",
  org.eclipse.papyrus.infra.properties.ui;bundle-version="2.0.0",
  org.eclipse.uml2.uml;bundle-version="5.2.0"
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
index b2f32a896ef..4dc67eee7bd 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.3.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
  org.eclipse.ui.navigator;bundle-version="3.5.500",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0"
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java
index f2d977d579c..f220d1d9088 100644..100755
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java
@@ -79,6 +79,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.google.common.io.ByteSource;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
 import com.google.common.io.Resources;
@@ -453,7 +454,7 @@ public abstract class AbstractModelFixture<T extends EditingDomain> extends Test
 	private Map<IPath, Boolean> parseManifest(IPath baseResourcePath, URL manifestURL) throws IOException {
 		Map<IPath, Boolean> result = Maps.newLinkedHashMap();
 
-		List<String> lines = CharStreams.readLines(CharStreams.newReaderSupplier(Resources.newInputStreamSupplier(manifestURL), Charsets.UTF_8));
+		List<String> lines = Resources.asByteSource(manifestURL).asCharSource(Charsets.UTF_8).readLines();
 		Pattern pattern = Pattern.compile("([^=]+)(?:=(true|false))?");
 		Matcher m = pattern.matcher("");
 		for (String line : lines) {
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
index deae2ec68d0..f4449f63890 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0
  org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.2.0",
  org.eclipse.papyrus.sysml;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
index 43f3f8bde45..6da27c68b97 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.m2m.qvt.oml.ocl;bundle-version="3.3.0",
  org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.3.0",
  org.eclipse.xtend.lib,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend;bundle-version="1.4.0",
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
index 0ff7b9338da..f71f274aed6 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
  com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
  org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
index 5fe236277d5..b1658c00995 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
  com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.8.0"
 Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests
 Bundle-Vendor: %providerName
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
index 810173094a6..a2abaf3d976 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
  com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
  org.eclipse.papyrus.uml.diagram.usecase;bundle-version="2.0.0"
 Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
index 7b0ae05a10a..f77391c593c 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- com.google.guava;bundle-version="15.0.0",

+ com.google.guava;bundle-version="21.0.0",

  org.eclipse.core.expressions;bundle-version="3.4.600",

  org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.decoratormodel.controlmode;bundle-version="1.2.0"

diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
index 20828c11762..a1519fb1968 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- com.google.guava;bundle-version="15.0.0",

+ com.google.guava;bundle-version="21.0.0",

  org.eclipse.core.expressions;bundle-version="3.4.600",

  org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0"

 Export-Package: org.eclipse.papyrus.uml.decoratormodel.helper.tests,

diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
index 34a7a676372..cfc70a75d57 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
@@ -56,7 +56,7 @@ public class ProfileIndexTest {
 		IProfileIndex index = registry.getService(IProfileIndex.class);
 
 		ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("testmodel.uml"));
-		Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+		Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
 
 		Set<URI> expected = ImmutableSet.of(
 				project.getURI("profile/profile1.profile.uml"), // an externally applied profile
@@ -70,7 +70,7 @@ public class ProfileIndexTest {
 		IProfileIndex index = registry.getService(IProfileIndex.class);
 
 		ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("profile/profile1.profile.uml"));
-		Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+		Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
 
 		assertThat(profileURIs, is(Collections.singleton(URI.createURI(UMLResource.ECORE_PROFILE_URI))));
 	}
@@ -80,7 +80,7 @@ public class ProfileIndexTest {
 		IProfileIndex index = registry.getService(IProfileIndex.class);
 
 		ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("package2.decorator.uml"));
-		Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+		Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
 
 		Set<URI> expected = Collections.emptySet(); // We don't index these as user models, but as decorators only
 		assertThat(profileURIs, is(expected));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
index ac00546810f..466e4546913 100755
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions,
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
  org.eclipse.xtend.lib;bundle-version="2.8.3",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.8.3",
  org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
index 4e70533875e..eeaf06cf538 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro,
  org.eclipse.xtext.xbase.lib,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
index fc58b7201c0..f27f34c785e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
  org.eclipse.ui.ide;bundle-version="3.8.1",
  org.eclipse.jface;bundle-version="3.8.101",
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
  org.eclipse.core.resources,
diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
index 4184b7ea145..f71bfa5b082 100644
--- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.papyrus.uml.profile.drafter;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.core.databinding,
  org.eclipse.core.databinding.beans,
  org.eclipse.core.databinding.observable,
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
index 1ac1d3e65bd..b0209208a36 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

- com.google.guava;bundle-version="15.0.0",

+ com.google.guava;bundle-version="21.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

  org.eclipse.jface.text;bundle-version="3.10.0",

  org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"