Merge branch 'streams/0.10-maintenance' of ssh://vlorenzo@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git into streams/0.10-maintenance

24 files changed, 105 insertions, 23 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index 995b2f7e7aa..89006069e72 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.papyrus.infra.core.sasheditor;bundle-version="0.10.1
  org.eclipse.gef;bundle-version="3.8.1",

  org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",

  org.eclipse.emf.workspace;bundle-version="1.5.1",

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

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

  org.eclipse.papyrus.infra.tools;bundle-version="0.10.1",

  org.eclipse.core.filesystem

 Export-Package: org.eclipse.papyrus.infra.core,

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
index e5ae04fe7ad..0fff208e64d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- com.google.guava;bundle-version="10.0.1"

+ com.google.guava;bundle-version="11.0.0"

 Export-Package: org.eclipse.papyrus.infra.emf,

  org.eclipse.papyrus.infra.emf.commands,

  org.eclipse.papyrus.infra.emf.databinding,

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 3b967543fb7..fc2108c3278 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -43,7 +43,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",

  org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.infra.tools;bundle-version="0.10.1",

  org.eclipse.emf.databinding;bundle-version="1.3.0",

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

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index b5fba0c0c87..02b9468613e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

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

  org.eclipse.papyrus.views.modelexplorer;bundle-version="0.10.1",

  org.eclipse.emf.facet.infra.query.core,

  org.eclipse.emf.facet.infra.browser.custom.core,

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..19f3e33ae63
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

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

+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

+ org.eclipse.gmf.runtime.emf.commands.core,

+ org.eclipse.emf.facet.widgets.nattable.instance,

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.0",

+ org.eclipse.uml2.uml,

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

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

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.0"

+Export-Package: org.eclipse.papyrus.infra.nattable.controlmode,

+ org.eclipse.papyrus.infra.nattable.controlmode.commands,

+ org.eclipse.papyrus.infra.nattable.controlmode.helpers

+Bundle-Vendor: %Bundle-Vendor

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.0.0.qualifier

+Bundle-Name: %Bundle-Name

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activ

+ ator

+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;si

+ ngleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..0c3ff4c6a4f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -0,0 +1,54 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

+ org.eclipse.core.runtime,

+ org.eclipse.emf.transaction,

+ org.eclipse.emf.ecore,

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

+ org.eclipse.emf.edit,

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

+ org.eclipse.swt,

+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.0",

+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

+ org.eclipse.emf.edit.ui,

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

+ org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",

+ org.eclipse.core.expressions,

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

+ org.apache.commons.lang,

+ com.google.guava;bundle-version="11.0.0"

+Export-Package: org.eclipse.papyrus.infra.nattable,

+ org.eclipse.papyrus.infra.nattable.celleditor,

+ org.eclipse.papyrus.infra.nattable.celleditor.config,

+ org.eclipse.papyrus.infra.nattable.command,

+ org.eclipse.papyrus.infra.nattable.configuration,

+ org.eclipse.papyrus.infra.nattable.dataprovider,

+ org.eclipse.papyrus.infra.nattable.handler,

+ org.eclipse.papyrus.infra.nattable.layerstack,

+ org.eclipse.papyrus.infra.nattable.listener,

+ org.eclipse.papyrus.infra.nattable.manager.axis,

+ org.eclipse.papyrus.infra.nattable.manager.cell,

+ org.eclipse.papyrus.infra.nattable.manager.table,

+ org.eclipse.papyrus.infra.nattable.messages,

+ org.eclipse.papyrus.infra.nattable.nattableconfiguration,

+ org.eclipse.papyrus.infra.nattable.painter,

+ org.eclipse.papyrus.infra.nattable.paste,

+ org.eclipse.papyrus.infra.nattable.provider,

+ org.eclipse.papyrus.infra.nattable.reorder,

+ org.eclipse.papyrus.infra.nattable.tester,

+ org.eclipse.papyrus.infra.nattable.utils,

+ org.eclipse.papyrus.infra.nattable.widget

+Bundle-Vendor: %Bundle-Vendor

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.0.0.qualifier

+Bundle-Name: %Bundle-Name

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=tru

+ e

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index a71706264ac..0950a706508 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.emf.edit.ui,
  org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

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

  org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

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

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

  org.eclipse.equinox.registry,

  org.eclipse.emf.workspace,

  org.eclipse.gmf.runtime.common.core,

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
index 09fae40af34..841d8e0ee2f 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.emf.facet.widgets.nattable.instance,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel;bundle-version="0.10.1",

- com.google.guava;bundle-version="10.0.1"

+ com.google.guava;bundle-version="11.0.0"

 Export-Package: org.eclipse.papyrus.infra.table.common,

  org.eclipse.papyrus.infra.table.common.advice,

  org.eclipse.papyrus.infra.table.common.dialog,

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF
index 8ff4e1eed6b..749aa0c92cd 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="0
  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.emf.facet.widgets.nattable.instance,

  org.eclipse.papyrus.infra.table.instance;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

  org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
index 58d4986fd1f..843f08a9fb4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.custom;visibility:=reexport,

  org.eclipse.ui.workbench,

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

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

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

 Bundle-Vendor: %providerName

 Bundle-Version: 0.10.1.qualifier

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index e0da6b06497..7b673ed791b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -57,7 +57,7 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.papyrus.uml.appearance;bundle-version="0.10.1",

  org.eclipse.papyrus.uml.service.types;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.10.1",

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

  org.eclipse.papyrus.editor;bundle-version="0.10.1",

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java
index 27c99972600..71312c66842 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.uml.diagram.activity.activitygroup.groupcontainment.S
 import org.eclipse.papyrus.uml.diagram.activity.activitygroup.groupcontainment.StructuredActivityNodeContainment;

 import org.eclipse.uml2.uml.UMLPackage;

 

-import com.google.common.collect.Iterables;

 import com.google.common.collect.Lists;

 

 /**

@@ -79,7 +78,7 @@ public final class ContainerNodeDescriptorRegistry {
 			IContainerNodeDescriptor result = registry.get(eclass);

 			if(result == null) {

 				ArrayList<EClass> superTypes = Lists.newArrayList(eclass.getEAllSuperTypes());

-				for(EClass aux : Iterables.reverse(superTypes)) {

+				for(EClass aux : Lists.reverse(superTypes)) {

 					result = registry.get(aux);

 					if(result != null) {

 						return result;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 86920c2372f..edf32c7b2d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -58,7 +58,7 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.1",

  org.eclipse.papyrus.uml.service.types;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.emf.appearance;bundle-version="0.10.1",

  org.eclipse.papyrus.uml.appearance;bundle-version="0.10.1",

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
index c1613f3e597..d8468e920c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="0.10.1",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.ui.forms;bundle-version="3.5.100",

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

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

  org.eclipse.emf.ecore;bundle-version="2.8.0",

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

  org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 69bff024bda..447aeee0079 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -71,7 +71,7 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.10.1",
  org.eclipse.papyrus.infra.services.decoration;bundle-version="0.10.1",
  org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.10.1",
  org.eclipse.papyrus.uml.tools;bundle-version="0.10.1",
- com.google.guava;bundle-version="10.0.1",
+ com.google.guava;bundle-version="11.0.0",
  org.eclipse.papyrus.uml.profile;bundle-version="0.10.1",
  org.eclipse.papyrus.infra.emf.appearance;bundle-version="0.10.1",
  org.eclipse.papyrus.uml.appearance;bundle-version="0.10.1",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index 325012d59da..7f468a4c957 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.timing;bundle-version="0.10.1",

  org.eclipse.ui.navigator;bundle-version="3.5.200",

  org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.sysml.diagram.common;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.10.1",

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

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
index 187e6a8504f..09680daa7e9 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.1",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
index 020fcac3ef0..74bbbece761 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.commands,
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="0.10.1",

  org.eclipse.emf.workspace,

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

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

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

  org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.emf.readonly;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.10.1",

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
index b2f8d3e1022..f490fddd435 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",
  org.eclipse.emf.edit;bundle-version="2.9.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
- com.google.guava,
+ com.google.guava;bundle-version="11.0.0",
  org.eclipse.uml2.uml;bundle-version="4.1.0",
  org.eclipse.papyrus.uml.tools;bundle-version="0.10.1",
  org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
index 1c24f24ffd1..9111617d594 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0
  org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

- com.google.guava;bundle-version="10.0.1"

+ com.google.guava;bundle-version="11.0.0"

 Export-Package: org.eclipse.papyrus.uml.profile,

  org.eclipse.papyrus.uml.profile.constraints,

  org.eclipse.papyrus.uml.profile.definition,

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index 31ee5318ebd..479a93ecb7d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="0.10.1",
  org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.1",

  org.eclipse.uml2.uml.profile.l2;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

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

diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF b/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF
index 3e4c11bd72c..e90f2c62f08 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF
+++ b/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.1",

  org.eclipse.emf.facet.widgets.nattable.instance,

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

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

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

  org.eclipse.papyrus.infra.table.controlmode;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0"

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index b6976beaabf..ad8a19d5a7c 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -40,7 +40,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.emf.facet.infra.query.core,

  org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

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

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

  org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.1",

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
index a43f3514b76..967d4151861 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
@@ -910,7 +910,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 					tmp = tmp.eContainer();

 				}

 

-				Iterable<EObject> reverseParents = Iterables.reverse(parents);

+				Iterable<EObject> reverseParents = Lists.reverse(parents);

 

 				// reveal the resource if necessary

 				Resource r = null;