[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>

6 files changed, 7 insertions, 5 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
index cf700faecae..431d632fa29 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
@@ -36,7 +36,7 @@ public class VersionRules {
 			new CurrentVersionRule(), // The default behaviour
 			new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.6.0,1.7.0)"), //$NON-NLS-1$//$NON-NLS-2$
 			new SkipRule("com.ibm.icu"), //$NON-NLS-1$
-			new FixedRangeRule("com.google.guava", "11.0.0") //$NON-NLS-1$
+			new FixedRangeRule("com.google.guava", "21.0.0") //$NON-NLS-1$
 	);
 
 	public VersionRules() {
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
index 51ed057b920..46e3c4a8b6a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.papyrus.dev.tests.framework;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
index 2d08ad4a6cb..d8939b1eab5 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.10.0,4.0.0)"
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
index f4e1d4ae2ea..484f599f05b 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
  org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ com.google.guava;bundle-version="21.0.0"
 Export-Package: org.eclipse.papyrus.mwe2.utils,
  org.eclipse.papyrus.mwe2.utils.components,
  org.eclipse.papyrus.mwe2.utils.messages
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java b/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
index ed376e5fbcf..66276e05b71 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.mwe2.runtime.workflow.Workflow;
 
 import com.google.common.collect.Lists;
 
+
 /**
  * A workflow for Xtend transformations. Primarily, it provides Xtend-compatible access to
  * the collections manipulated by the inherited {@link Workflow#addBean(Object)} and
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index 200d6270381..d28ea9d4442 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.oomph.setup.targlets;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
  org.eclipse.oomph.setup.workingsets;bundle-version="[1.3.0,2.0.0)",
  fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional,
  org.eclipse.cbi.p2repo.aggregator;bundle-version="1.0.0",