137 files changed, 1899 insertions, 822 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index 65e88f1fe15..31fea950b99 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
@@ -1,42 +1,42 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
  org.eclipse.ui.ide;bundle-version="3.9.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
  org.eclipse.ui.navigator;bundle-version="3.5.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.service.validation;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.validation;bundle-version="1.1.0",
  com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.editor.integration.tests,
  org.eclipse.papyrus.editor.integration.tests.tests
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Papyrus Editor Integration Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.editor.integration.tests.Activat
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml
index 9e5537a1340..c1f966d1a08 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.editor.integration.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
index ce0c2c79d2a..e53469cd4b0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
  org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,
  org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query,
@@ -8,7 +8,7 @@ Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,
 Bundle-Vendor: %Bundle-Vendor
 Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor.di;bundle-ver
  sion="0.10.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.test
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml
index 13603ecf9ff..ecb56880398 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.core.sasheditor.di.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
index 297ae3167ec..6709526f209 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui.editors;bundle-version="3.8.0",
  org.eclipse.ui.ide;bundle-version="3.8.0",
  org.eclipse.core.resources;bundle-version="3.8.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.eclipse.ui;bundle-version="3.106.0",
  org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.10.0"
@@ -22,7 +22,7 @@ Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider,
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor;bundle-versio
  n="1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: fragment
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml
index 5ab566b2962..3b06f85c422 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.core.sasheditor.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
index 0acec0ed360..d2ea9abc80e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.core.lifecycleevents,
  org.eclipse.papyrus.infra.core.resource,
  org.eclipse.papyrus.infra.core.services,
  org.eclipse.papyrus.infra.core.tests
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.core;bundle-version="1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: fragment
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
index ebb525a3f93..98aeb9f099e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.core.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF
index beb5e7fdf81..c444a23cd8e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.newchild;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
  org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.extendedtypes.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %fragmentName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml
index f7ec11403a6..afe7ac7c747 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.extendedtypes.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 1282f1e38c4..c8befe8748b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -1,68 +1,68 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.bundles.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.diagram.blockdefinition;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.diagram.requirement.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.0.1",
- org.eclipse.papyrus.customization.properties.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.editor.integration.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.search.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.bundles.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.diagram.blockdefinition;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.diagram.requirement.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.papyrus.customization.properties.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.search.tests;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.tools.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.tools.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.nattable.allocation.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.0.1"
+ org.eclipse.papyrus.uml.tools.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.tools.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.nattable.allocation.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
index 69b863f5bfe..828946c08c0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
index 150deb9c60c..c14c84f0a4c 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.0.1",
- org.eclipse.papyrus.customization.properties.generation;bundle-version="1.0.1",
+ org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.1.0",
+ org.eclipse.papyrus.customization.properties.generation;bundle-version="1.1.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.views.properties;bundle-version="1.0.1",
- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.properties;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.properties;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
  org.eclipse.m2m.qvt.oml;bundle-version="3.2.0",
  org.eclipse.core.resources;bundle-version="3.8.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
  org.junit;bundle-version="4.10.0",
  org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.customization.properties.tests,
  org.eclipse.papyrus.customization.properties.tests.qvt
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Properties view customization Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.customization.properties.tests.A
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml
index 96f421e83e1..8f4b5322c74 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.customization.properties.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
index b9d28e7473a..e01efa9ebb2 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.pde.core,
  org.eclipse.update.configurator,
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.bundles.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
index a01495357e9..c9d8bd1d6d8 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.bundles.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
index 1e4ae79f92f..6d42c1a3b91 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
@@ -16,7 +16,7 @@ import org.osgi.framework.BundleContext;
 public class BundleTestsUtils {
 
 	// This version number should be changed at each release
-	public static final String PAPYRUS_VERSION = "1.0.1"; //$NON-NLS-1$
+	public static final String PAPYRUS_VERSION = "1.1.0"; //$NON-NLS-1$
 
 	public static final String INCUBATION = "(Incubation)"; //$NON-NLS-1$
 
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 a72cd10d3d9..ab8a126b8ac 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
@@ -2,16 +2,16 @@ 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="11.0.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.emf.readonly,
  org.eclipse.papyrus.infra.emf.readonly.tests
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.emf.readonly;bundle-version="
  1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: fragment
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml
index bb0be999a12..902fd00cef7 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.emf.readonly.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
index e937424eb33..bc238a57750 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Export-Package: org.eclipse.papyrus.infra.emf.advice,
 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
  org.junit;bundle-version="4.10.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml
index 108d416cb42..897f372a7fd 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.emf.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 14d3b397eda..24609527084 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,13 +1,13 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
  com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.commands.tests
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-versi
  on="1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: fragment
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml
index 378d4d32270..36cdb3b375a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.gmfdiag.commands.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
index fd498a03eee..11ac88dcbd1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests,
  org.eclipse.papyrus.infra.gmfdiag.common.utils
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version
  ="1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: fragment
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml
index 0d70eac72c2..b8a50bae3c8 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.gmfdiag.common.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
index 0191c2c52ad..0650c2472fd 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.core.resources;bundle-version="3.8.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
  org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests,
  org.eclipse.papyrus.infra.gmfdiag.css.tests.tests
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: CSS Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activato
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml
index ac05e24dd3b..4092a5abb93 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.gmfdiag.css.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
index e884bb671bf..e4598cb97f2 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.model.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model.editor;bundle-version="1.1.0",
  org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.emf.transaction,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.tests,
  org.eclipse.papyrus.infra.nattable.model.editor.tests.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.editor.test
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml
index 1b71f4a88a1..5cbf306f9ef 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.nattable.model.editor.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
index 268f0e1ccac..e0643f5b39a 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit,
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.emf.ecore,
  org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.nattable.tests.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.tests.Activator
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
index bff19f32cc7..6ba3078eb09 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.nattable.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
index b798debb2a6..98a11e9e8cf 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
  org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
  org.junit,
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.eclipse.emf.transaction;bundle-version="1.8.0",
  org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.7.0",
- org.eclipse.papyrus.editor.integration.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.nattable.views.tests,
  org.eclipse.papyrus.infra.nattable.views.tests.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.tests.Activ
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
index b5df7188bff..cbfefafbd28 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.nattable.views.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 b2f40a539b9..a1ac50f1990 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
@@ -1,19 +1,19 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
  org.eclipse.swt;bundle-version="3.100.0",
  org.eclipse.core.runtime;bundle-version="3.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="11.0.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.tools.databinding,
  org.eclipse.papyrus.infra.tools.tests,
  org.eclipse.papyrus.infra.tools.util
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Papyrus Infrastructure Tools Tests
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools.tests;singleton:=
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
index ea6903917af..bb7c1cba2f8 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.tools.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 656d96bfec7..702a6564696 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
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
  org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",
  org.eclipse.swtbot.eclipse.finder;bundle-version="2.2.1",
  org.eclipse.swtbot.junit4_x;bundle-version="2.2.1",
  org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.services.controlmode.tests,
  org.eclipse.papyrus.infra.services.controlmode.tests.control,
  org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
index adb1e11b7cb..ba1f5312163 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.controlmode.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
index 3adb7bf75d5..fe0120bbe9a 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui.ide;bundle-version="3.8.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.services.edit.tests,
  org.eclipse.papyrus.infra.services.edit.tests.commands,
  org.eclipse.papyrus.infra.services.edit.tests.context,
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.papyrus.infra.services.edit.tests,
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.services.edit;bundle-version=
  "0.10.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml
index 1553fc46204..a840665b23e 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.edit.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF
index 616f7a895fe..6797c84beef 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
  org.eclipse.emf.ecore;bundle-version="2.8.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.services.labelprovider.tests
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: LabelProvider Service Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.tes
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml
index c8fb7f1d793..aa86eeedf9f 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.labelprovider.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
index 503b40c826a..622718f7ed3 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.infra.services.resourceloading.tests,
  org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1,
  org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.infra.services.resourceloading;bund
  le-version="0.10.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %fragmentName
 Bundle-Localization: fragment
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml
index 69457ccb78f..0c595316703 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.infra.services.resourceloading.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
index 73f8e609f79..31c43c5ac6d 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Export-Package: org.eclipse.papyrus.junit.framework.classification,
  org.eclipse.papyrus.junit.framework.classification.rules,
  org.eclipse.papyrus.junit.framework.classification.tests
 Require-Bundle: org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
  org.eclipse.emf.edit;bundle-version="2.10.0",
  org.eclipse.ui;bundle-version="3.106.0",
  com.google.guava;bundle-version="11.0.0",
  org.eclipse.core.runtime;bundle-version="3.10.0"
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Conditional Junit Annotations
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.junit.framework
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml
index c8aca2f233c..76f4bd9db0d 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.junit.framework</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
index 6eb1c7cca93..687f52dd874 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
@@ -3,26 +3,26 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.8.0",
  org.eclipse.jdt.ui,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
  org.eclipse.ui.navigator,
  org.eclipse.ui.views.properties.tabbed,
  org.eclipse.ui.ide;bundle-version="3.8.0",
  org.eclipse.emf.edit;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
  com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
  org.eclipse.e4.ui.workbench;bundle-version="1.1.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
  org.eclipse.e4.core.contexts;bundle-version="1.3.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.junit.matchers,
  org.eclipse.papyrus.junit.utils,
  org.eclipse.papyrus.junit.utils.resources,
@@ -30,7 +30,7 @@ Export-Package: org.eclipse.papyrus.junit.matchers,
  org.eclipse.papyrus.junit.utils.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml
index cdd3e86fb61..19f8c23fc24 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.junit.utils</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
index 6dd81faaf54..5478dbbba5b 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition.test
  s.suites
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.sysml.diagram.blockdefinition;bundl
  e-version="0.10.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml
index de885049d4a..fb90b172282 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.blockdefinition.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 b6c478a00c3..e886af9fe89 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
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock.tests.
  suites
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.sysml.diagram.internalblock;bundle-
  version="1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml
index 200a6d4f533..83c7c080c09 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.internalblock.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
index f917380a340..df3540db67b 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.diagram.parametric.tests.sui
  tes
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.sysml.diagram.parametric;bundle-ver
  sion="0.10.1"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml
index f225fac218e..cf2cc6c0572 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.parametric.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
index 03cf71cf3b1..34b47b47a96 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.sysml.diagram.requirement;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.sysml.diagram.requirement;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime;bundle-version="3.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1"
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.diagram.requirement.test,
  org.eclipse.papyrus.sysml.diagram.requirement.test.canonical,
  org.eclipse.papyrus.sysml.diagram.requirement.test.load
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: SysML Requirements Diagram Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.test.A
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml
index 4b29b9609f2..1f4021ae451 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.diagram.requirement.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
index cc71393e5b8..11c4b19023a 100755
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
  org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.eclipse.emf.transaction;bundle-version="1.8.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.nattable.allocation.tests,
  org.eclipse.papyrus.sysml.nattable.allocation.tests.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
index aaaa84f910b..f1c82e515f7 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.nattable.allocation.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
index cab7d35d2f4..3011c2d8154 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
@@ -1,34 +1,34 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.junit,
  org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
  org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.nattable.requirement;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.nattable.requirement;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.nattable.requirement.config;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
  org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.editor.integration.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.nattable.requirement.tests,
  org.eclipse.papyrus.sysml.nattable.requirement.tests.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml
index d2001bd9288..a873d647d68 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.nattable.requirement.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
index a638ccb6780..74692a46632 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -5,21 +5,21 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="3.8.0",
  org.eclipse.core.expressions;bundle-version="3.4.300",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.modelexplorer.tests,
  org.eclipse.papyrus.sysml.modelexplorer.tests.common,
  org.eclipse.papyrus.sysml.modelexplorer.tests.copypaste,
@@ -28,7 +28,7 @@ Export-Package: org.eclipse.papyrus.sysml.modelexplorer.tests,
  org.eclipse.papyrus.sysml.modelexplorer.tests.utils
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml
index 482db1605e4..541f454f426 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.modelexplorer.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
index f13e14e22ec..2d0e89e61e3 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.sysml.service.types.tests.suites
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.sysml.service.types;bundle-version=
  "1.0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml
index 1d27790f211..f0dc0c9b2bb 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.service.types.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
index 1dce67060a6..1db17f873ad 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
@@ -6,18 +6,18 @@ Export-Package: org.eclipse.papyrus.sysml.allocations.tests,
  org.eclipse.papyrus.sysml.tests,
  org.eclipse.papyrus.sysml.utils
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.sysml;bundle-version="1.0.1",
+ org.eclipse.papyrus.sysml;bundle-version="1.1.0",
  org.eclipse.emf.ecore,
  org.eclipse.uml2.uml,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml
index 03a8f72ac0a..8e2a25c83d1 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.sysml.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
index 50870692d90..94c8b3f53ae 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
  org.eclipse.uml2.uml.editor,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml
index 14d0547e210..6d7225e42ee 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.activity.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
index 8991c541710..e9d34866f20 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/AllCanonicalTests.java
@@ -25,7 +25,8 @@ import org.junit.runners.Suite.SuiteClasses;
 TestActivityDiagramChildNode.class, 
 // TestActivityDiagramChildWithOtherCreationNode.class, 
 TestActivityChildNodeInStructuredActivity.class,
-TestActivityGroup.class
+TestActivityGroup.class,
+TestDropObjects.class
 })
 public class AllCanonicalTests {
 
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java
new file mode 100644
index 00000000000..398e1ace59c
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestDropObjects.java
@@ -0,0 +1,193 @@
+package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionNodeAsInEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionStructuredActivityNodeContentCompartmentEditPart;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
+import org.junit.Test;
+
+/**
+ * Testing drop action.
+ */
+public class TestDropObjects extends AbstractPapyrusTestCase {
+
+	@Override
+	protected String getProjectName() {
+		return IActivityDiagramTestsConstants.PROJECT_NAME;
+	}
+
+	@Override
+	protected String getFileName() {
+		return IActivityDiagramTestsConstants.FILE_NAME;
+	}
+
+	public DiagramUpdater getDiagramUpdater() {
+		return UMLDiagramUpdater.TYPED_INSTANCE;
+	}
+
+	/**
+	 * create childNodeEditPart in parentEditPart
+	 */
+	protected IGraphicalEditPart createChild(int childVID, IGraphicalEditPart container) {
+		final IElementType childType = UMLElementTypes.getElementType(childVID);
+		final CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(childType, container.getDiagramPreferencesHint());
+		requestcreation.setSize(new Dimension(1, 1));
+		requestcreation.setLocation(new Point(10, 10));
+		Command cmd = container.getCommand(requestcreation);
+		executeOnUIThread(cmd);
+		return findChildBySemanticHint(container, childVID);
+	}
+
+	private IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, int vid) {
+		IGraphicalEditPart childEP = parent.getChildBySemanticHint(Integer.toString(vid));
+		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);
+		return childEP;
+	}
+
+	protected IGraphicalEditPart getActivityCompartmentEditPart() {
+		IGraphicalEditPart activityEP = findChildBySemanticHint(getDiagramEditPart(), ActivityEditPart.VISUAL_ID);
+		return findChildBySemanticHint(activityEP, ActivityActivityContentCompartmentEditPart.VISUAL_ID);
+	}
+	
+	@Test
+	public void testExpansionNodeInExpansionRegionCompartment() throws Exception {
+		IGraphicalEditPart regionEP = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
+		IGraphicalEditPart regionCompartmentEP = findChildBySemanticHint(regionEP, ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
+		IGraphicalEditPart expansionNode = createChild(ExpansionNodeAsInEditPart.VISUAL_ID, regionEP);
+	
+		DropObjectSequence dropSeq = new DropObjectSequence(expansionNode, regionEP, regionCompartmentEP);
+		dropSeq.doSequence();
+	}
+	
+	/**
+	 * Sequence for manage and testing drop object action
+	 *
+	 */
+	public class DropObjectSequence {
+		
+		private final IGraphicalEditPart myChild;
+		
+		private final IGraphicalEditPart myParent;
+		
+		private final IGraphicalEditPart myDropParent;
+		
+		public DropObjectSequence(IGraphicalEditPart childEP, IGraphicalEditPart parentEP, IGraphicalEditPart dropParent) {
+			assertNotNull(childEP);
+			assertNotNull(parentEP);
+			assertNotNull(dropParent);
+			
+			myChild = childEP;
+			myParent = parentEP;
+			myDropParent = dropParent;
+			
+			assertNotEquals(myChild, myParent);
+			assertNotEquals(myChild, myDropParent);
+		}
+		
+		public void doSequence() {
+			testBeforeRemoveView();
+			EObject objectToDrop = doHideChild();
+			testHide();
+			IGraphicalEditPart newGrapticalChild = doDrop(objectToDrop);
+			testDrop(newGrapticalChild);
+		}
+		
+		protected void testBeforeRemoveView() {
+			testGraphicalEditParts((IGraphicalEditPart)getChildEP().getParent(), getParentEP());
+			
+			EObject childObject = getChildEP().resolveSemanticElement();
+			EObject parentObject = getParentEP().resolveSemanticElement();
+			
+			testSemantic(parentObject, childObject.eContainer());
+		}
+		
+		protected EObject doHideChild() {
+			EObject result = getChildEP().resolveSemanticElement();
+			Command deleteChild = getChildEP().getCommand(new GroupRequest(RequestConstants.REQ_DELETE));
+			assertTrue(deleteChild.canExecute());
+			executeOnUIThread(deleteChild);
+			return result;
+		}
+		
+		protected void testHide() {
+			List<?> childrenAfterHide = getParentEP().getChildren();
+			for (Object child : childrenAfterHide) {
+				assertNotEquals(child, getChildEP());
+			}
+		}
+		
+		private int getChildVID() {
+			return UMLVisualIDRegistry.getVisualID(getChildEP().getNotationView());
+		}
+		
+		protected IGraphicalEditPart doDrop(EObject objectToDrop) {
+			DropObjectsRequest req = createRequest(objectToDrop);
+			Command dropCommand = myDropParent.getCommand(req);
+			assertTrue(dropCommand.canExecute());
+			executeOnUIThread(dropCommand);
+			return findChildBySemanticHint(getParentEP(), getChildVID());
+		}
+		
+		private DropObjectsRequest createRequest(EObject objectToDrop) {
+			DropObjectsRequest result = new DropObjectsRequest();
+			result.setObjects(Arrays.asList(objectToDrop));
+			result.setType(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DROP_OBJECTS);
+			result.setLocation(new Point(1, 1));
+			return result;
+		}
+		
+		protected void testDrop(IGraphicalEditPart childEP) {
+			testGraphicalEditParts((IGraphicalEditPart)childEP.getParent(), getParentEP());
+			
+			EObject childObject = childEP.resolveSemanticElement();
+			EObject parentObject = getParentEP().resolveSemanticElement();
+			
+			testSemantic(parentObject, childObject.eContainer());
+		}
+		
+		public final IGraphicalEditPart getChildEP() {
+			return myChild;
+		}
+		
+		public final IGraphicalEditPart getParentEP() {
+			return myParent;
+		}
+		
+		public final IGraphicalEditPart getDropParentEP() {
+			return myDropParent;
+		}
+		
+		protected void testSemantic(EObject parent, EObject expected) {
+			assertEquals(parent, expected);
+		}
+		
+		protected void testGraphicalEditParts(IGraphicalEditPart parent, IGraphicalEditPart expected) {
+			assertEquals(parent, 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 73cc49306e5..5b36dc60a6b 100644
--- 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
@@ -1,31 +1,31 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
  org.eclipse.ui.ide;bundle-version="3.10.0",
  org.eclipse.emf.common.ui;bundle-version="2.9.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.diagram.clazz.test.createFromPalette,
  org.eclipse.papyrus.uml.diagram.clazz.test,
  org.eclipse.papyrus.uml.diagram.clazz.test.canonical,
  org.eclipse.papyrus.uml.diagram.clazz.test.load
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml
index ba275d0fdc8..cc5bba06570 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.clazz.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
index caf1d69bdef..98bc603c03a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
@@ -4,24 +4,24 @@ Require-Bundle: org.eclipse.ui,
  org.junit,
  org.eclipse.emf.transaction,
  org.eclipse.ui.ide,
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.common.tests,
  org.eclipse.papyrus.uml.diagram.common.tests.css,
  org.eclipse.papyrus.uml.diagram.common.tests.parser,
  org.eclipse.papyrus.uml.diagram.common.tests.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.tests.Activat
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml
index 374779af7f5..2ad1330f511 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.common.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF
index 493ea5f1a07..68e24c2517b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.communication.tests,
  org.eclipse.papyrus.uml.diagram.communication.tests.canonical
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
index 4ddc5e0f1ae..ab477222030 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.communication.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF
index 7df25fe3271..f7da0373cd8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.diagram.component;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.component;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.component.test,
  org.eclipse.papyrus.uml.diagram.component.test.canonical,
  org.eclipse.papyrus.uml.diagram.component.test.load
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml
index de58ab6c13e..f52982947b8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.component.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
index 3f013619993..8f4561b94eb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.composite.test,
  org.eclipse.papyrus.uml.diagram.composite.test.canonical
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml
index b918528873a..6f60d1e3e55 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.composite.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
index 2aab6971123..f621b8d3b70 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.deployment.test,
  org.eclipse.papyrus.uml.diagram.deployment.test.canonical,
  org.eclipse.papyrus.uml.diagram.deployment.test.load
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml
index ad940120431..af4d671e54e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.deployment.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF
index 41579608e8a..1768e73d1f6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.eclipse.ui,
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.dnd;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.dnd;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.dnd.tests.tests
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: DND Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.tests.Activator
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml
index ed90c50bcfc..5c1c73ed5e4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.dnd.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF
index 3c9269f6050..cff9a9910ac 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.2",
  org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.gmf.runtime.diagram.ui,
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview.te
  sts
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: IODiagram Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml
index 2fb4501cd3c..a380b01172a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.interactionoverview.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF
index dcc57c606b2..bb2cc4e1a0b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.1",
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.profile.tests
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Profile Diagram Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.tests.Activa
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml
index ca6b0df3c3e..aa2281fb034 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.profile.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
index 8da42f8bb61..2a3caa7714a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
  org.eclipse.ui.ide;bundle-version="3.9.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.views.properties;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.properties;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.sequence.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.tests.Activ
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml
index c2949900e98..fc09ac72925 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.sequence.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
index 84e335e8d1b..bd8f2f30168 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.statemachine.tests,
  org.eclipse.papyrus.uml.diagram.statemachine.tests.canonical
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
index dd03a8e5a93..f18083adbef 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.statemachine.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
index ba540b5d453..593004408bc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
  org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.stereotypeproperty
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml
index d8fb97f9190..8503bb8ee32 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF
index a53e9bd51e4..d0bcb193259 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
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 04d3f377579..71b0f1db975 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
@@ -1,35 +1,35 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.common.core,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime,
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.tests.appearance,
  org.eclipse.papyrus.uml.diagram.tests.canonical,
  org.eclipse.papyrus.uml.diagram.tests.createFromPalette,
  org.eclipse.papyrus.uml.diagram.tests.edition
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml
index 812facbf39b..6760aa2a03b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF
index 7e28f48f0b1..1ce54a0efec 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
  org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.timing.tests
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Papyrus Timing Diagram Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.tests.Activat
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml
index c17dfa80fb4..bc972a515c3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.timing.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
index e1543c40cd4..080d0e2d885 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java
@@ -74,6 +74,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
 import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
@@ -82,7 +83,6 @@ import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.uml.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
 import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
 import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
 import org.eclipse.swt.SWT;
@@ -142,7 +142,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 
 			@Override
 			public void historyNotification(final OperationHistoryEvent event) {
-				if(event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK) {
+				if (event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK) {
 					AbstractPapyrusTestCase.this.operationFailed = true;
 				}
 			}
@@ -172,9 +172,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}
 
 	/**
-	 * Asserts that no Command executed on the {@link IOperationHistory} since the last call to
-	 * {@link AbstractPapyrusTestCase#resetLastOperationFailedState resetLastOperationFailedState} returned
-	 * {@link OperationHistoryEvent#OPERATION_NOT_OK}.
+	 * Asserts that no Command executed on the {@link IOperationHistory} since the last call to {@link AbstractPapyrusTestCase#resetLastOperationFailedState resetLastOperationFailedState} returned {@link OperationHistoryEvent#OPERATION_NOT_OK}.
 	 *
 	 */
 	protected void assertLastOperationSuccessful() {
@@ -186,7 +184,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}
 
 	protected Element getRootSemanticModel() {
-		return (Element)getRootView().getElement();
+		return (Element) getRootView().getElement();
 	}
 
 	protected UmlGmfDiagramEditor getDiagramEditor() {
@@ -202,9 +200,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}
 
 	protected DiagramEditPart getDiagramEditPart() {
-		if(this.diagramEditPart == null) {
-			this.diagramEditor = (UmlGmfDiagramEditor)this.papyrusEditor.getActiveEditor();
-			this.diagramEditPart = (DiagramEditPart)this.papyrusEditor.getAdapter(DiagramEditPart.class);
+		if (this.diagramEditPart == null) {
+			this.diagramEditor = (UmlGmfDiagramEditor) this.papyrusEditor.getActiveEditor();
+			this.diagramEditPart = (DiagramEditPart) this.papyrusEditor.getAdapter(DiagramEditPart.class);
 
 			Assert.assertNotNull("Cannot find the diagram editor", diagramEditor);
 			Assert.assertNotNull("Cannot find the Diagram edit part", diagramEditPart);
@@ -221,11 +219,11 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 		this.diResourceSet = new DiResourceSet();
 
 		// at this point, no resources have been created
-		if(this.file.exists()) {
+		if (this.file.exists()) {
 			this.file.delete(true, new NullProgressMonitor());
 		}
 
-		if(!this.file.exists()) {
+		if (!this.file.exists()) {
 			// Don't create a zero-byte file. Create an empty XMI document
 			Resource diResource = diResourceSet.createResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true));
 			diResource.save(null);
@@ -234,10 +232,10 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 			new CreateUMLModelCommand().createModel(this.diResourceSet);
 			ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
 			try {
-				registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); //High priority to override all contributions
+				registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); // High priority to override all contributions
 				registry.startRegistry();
 			} catch (ServiceException ex) {
-				//Ignore exceptions
+				// Ignore exceptions
 			}
 			// diResourceSet.createsModels(file);
 			final ICreationCommand command = getDiagramCommandCreation();
@@ -247,26 +245,26 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 		}
 		IEditorPart _editor = houseKeeper.openPapyrusEditor(file);
 		assertTrue("The editor must be a " + PapyrusMultiDiagramEditor.class.getSimpleName() + " (Actual type: " + _editor.getClass().getSimpleName() + ")", _editor instanceof PapyrusMultiDiagramEditor);
-		this.papyrusEditor = ((PapyrusMultiDiagramEditor)_editor);
+		this.papyrusEditor = ((PapyrusMultiDiagramEditor) _editor);
 		flushEventLoop();
 	}
 
 	protected static void maximize() {
-		//		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setMaximized(true);
+		// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setMaximized(true);
 	}
 
 	protected static void closeAllViewsAndEditors() {
-		//		final IWorkbench workbench = PlatformUI.getWorkbench();
-		//		for(final IWorkbenchWindow workbenchWindow : workbench.getWorkbenchWindows()) {
-		//			final IWorkbenchPage[] pages = workbenchWindow.getPages();
-		//			for(final IWorkbenchPage page : pages) {
-		//				final IViewReference[] viewReferences = page.getViewReferences();
-		//				for(final IViewReference viewReference : viewReferences) {
-		//					page.hideView(viewReference);
-		//				}
-		//				page.closeAllEditors(false);
-		//			}
-		//		}
+		// final IWorkbench workbench = PlatformUI.getWorkbench();
+		// for(final IWorkbenchWindow workbenchWindow : workbench.getWorkbenchWindows()) {
+		// final IWorkbenchPage[] pages = workbenchWindow.getPages();
+		// for(final IWorkbenchPage page : pages) {
+		// final IViewReference[] viewReferences = page.getViewReferences();
+		// for(final IViewReference viewReference : viewReferences) {
+		// page.hideView(viewReference);
+		// }
+		// page.closeAllEditors(false);
+		// }
+		// }
 	}
 
 	/**
@@ -279,9 +277,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * </ul>
 	 *
 	 * @param elementType
-	 *        the type for which to create a view (and possibly a model element)
+	 *            the type for which to create a view (and possibly a model element)
 	 * @param parentEditPart
-	 *        the edit part to which the creation request must be sent
+	 *            the edit part to which the creation request must be sent
 	 * @return the created View
 	 */
 	protected View createView(final IElementType elementType, final EditPart parentEditPart) {
@@ -298,13 +296,13 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * </ul>
 	 *
 	 * @param elementType
-	 *        the type for which to create a view (and possibly a model element)
+	 *            the type for which to create a view (and possibly a model element)
 	 * @param location
-	 *        the position of the new view (may be <code>null</code>)
+	 *            the position of the new view (may be <code>null</code>)
 	 * @param size
-	 *        the size of the new view (may be <code>null</code>)
+	 *            the size of the new view (may be <code>null</code>)
 	 * @param parentEditPart
-	 *        the edit part to which the creation request must be sent
+	 *            the edit part to which the creation request must be sent
 	 * @return the created View
 	 */
 	protected View createView(final IElementType elementType, final Point location, final Dimension size, final EditPart parentEditPart) {
@@ -314,10 +312,10 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 			@Override
 			public void run() {
 				final CreateViewRequest createRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType, getDiagramEditPart().getDiagramPreferencesHint());
-				if(size != null) {
+				if (size != null) {
 					createRequest.setSize(size);
 				}
-				if(location != null) {
+				if (location != null) {
 					createRequest.setLocation(location);
 				}
 				final Command command = parentEditPart.getCommand(createRequest);
@@ -335,10 +333,10 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 		findNestedCreateCommands(command, createCommands);
 		assertEquals("There should be one CreateCommand inside the command", 1, createCommands.size());
 		final Object returnValue = createCommands.get(0).getCommandResult().getReturnValue();
-		if(returnValue instanceof IAdaptable) {
-			final IAdaptable adaptableResult = (IAdaptable)returnValue;
-			final View view = (View)adaptableResult.getAdapter(View.class);
-			if(view != null) {
+		if (returnValue instanceof IAdaptable) {
+			final IAdaptable adaptableResult = (IAdaptable) returnValue;
+			final View view = (View) adaptableResult.getAdapter(View.class);
+			if (view != null) {
 				return view;
 			}
 		}
@@ -347,37 +345,37 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}
 
 	private static void findNestedCreateCommands(final Command gefCommand, final List<CreateCommand> createCommands) {
-		if(gefCommand instanceof CompoundCommand) {
-			final CompoundCommand compoundCommand = (CompoundCommand)gefCommand;
+		if (gefCommand instanceof CompoundCommand) {
+			final CompoundCommand compoundCommand = (CompoundCommand) gefCommand;
 			@SuppressWarnings("unchecked")
 			final List<Command> commands = compoundCommand.getCommands();
-			for(final Command childCommand : commands) {
+			for (final Command childCommand : commands) {
 				findNestedCreateCommands(childCommand, createCommands);
 			}
-		} else if(gefCommand instanceof ICommandProxy) {
-			final ICommandProxy commandProxy = (ICommandProxy)gefCommand;
+		} else if (gefCommand instanceof ICommandProxy) {
+			final ICommandProxy commandProxy = (ICommandProxy) gefCommand;
 			final ICommand iCommand = commandProxy.getICommand();
 			findNestedCreateCommands(iCommand, createCommands);
 		}
 	}
 
 	private static void findNestedCreateCommands(final ICommand gmfCommand, final List<CreateCommand> createCommands) {
-		if(gmfCommand instanceof CompositeCommand) {
-			final CompositeCommand compositeCommand = (CompositeCommand)gmfCommand;
+		if (gmfCommand instanceof CompositeCommand) {
+			final CompositeCommand compositeCommand = (CompositeCommand) gmfCommand;
 			final Iterator<?> iterator = compositeCommand.iterator();
-			while(iterator.hasNext()) {
+			while (iterator.hasNext()) {
 				final Object element = iterator.next();
-				if(element instanceof ICommand) {
-					final ICommand subCommand = (ICommand)element;
+				if (element instanceof ICommand) {
+					final ICommand subCommand = (ICommand) element;
 					findNestedCreateCommands(subCommand, createCommands);
 				} else {
 					fail("error");
 				}
 			}
-		} else if(gmfCommand instanceof CreateCommand) {
-			createCommands.add((CreateCommand)gmfCommand);
-		} else if(gmfCommand instanceof CommandProxy) {
-			final CommandProxy commandProxy = (CommandProxy)gmfCommand;
+		} else if (gmfCommand instanceof CreateCommand) {
+			createCommands.add((CreateCommand) gmfCommand);
+		} else if (gmfCommand instanceof CommandProxy) {
+			final CommandProxy commandProxy = (CommandProxy) gmfCommand;
 			findNestedCreateCommands(commandProxy.getCommand(), createCommands);
 		}
 	}
@@ -389,7 +387,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	protected void testHide(final GraphicalEditPart editPart) {
 		final EditPart parent = editPart.getParent();
 		final int sizeBefore = parent.getChildren().size();
-		final EObject semanticElement = ((View)editPart.getModel()).getElement();
+		final EObject semanticElement = ((View) editPart.getModel()).getElement();
 		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));
 
 		executeHideCommand(editPart);
@@ -407,7 +405,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Send the given EditPart a "delete" request (which only deletes the View), and execute the returned command.
 	 *
 	 * @param editPart
-	 *        the EditPart to hide
+	 *            the EditPart to hide
 	 */
 	protected void executeHideCommand(final GraphicalEditPart editPart) {
 		final GroupRequest deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
@@ -421,7 +419,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	protected void testDelete(final GraphicalEditPart editPart) {
 		final EditPart parent = editPart.getParent();
 		final int sizeBefore = parent.getChildren().size();
-		final EObject semanticElement = ((View)editPart.getModel()).getElement();
+		final EObject semanticElement = ((View) editPart.getModel()).getElement();
 		assertTrue("The semantic element should be in a Model", isInModel(semanticElement));
 
 		executeDestroyCommand(editPart);
@@ -439,7 +437,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Send the given EditPart a {@link DestroyElementRequest}, and execute the returned command.
 	 *
 	 * @param editPart
-	 *        the EditPart to destroy
+	 *            the EditPart to destroy
 	 */
 	protected void executeDestroyCommand(final GraphicalEditPart editPart) {
 		final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
@@ -450,12 +448,12 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 
 	/**
 	 * @param targetEditPart
-	 *        the EditPart on top of which the drop will happen. This will determine the coordinates of the drop.
+	 *            the EditPart on top of which the drop will happen. This will determine the coordinates of the drop.
 	 * @param parentEditPart
-	 *        the EditPart in which the element will really be added. Often the same EditPart as targetEditPart,
-	 *        unless dropping on top of the first EditPart puts the element in another edit part.
+	 *            the EditPart in which the element will really be added. Often the same EditPart as targetEditPart,
+	 *            unless dropping on top of the first EditPart puts the element in another edit part.
 	 * @param droppedElement
-	 *        the element to drop
+	 *            the element to drop
 	 */
 	public void testDrop(final GraphicalEditPart targetEditPart, final GraphicalEditPart parentEditPart, final EObject droppedElement) {
 		final int sizeBefore = parentEditPart.getChildren().size();
@@ -483,8 +481,8 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 */
 	protected static boolean isInModel(final EObject semanticElement) {
 		EObject parent = semanticElement.eContainer();
-		while(parent != null) {
-			if(parent instanceof Model) {
+		while (parent != null) {
+			if (parent instanceof Model) {
 				return true;
 			}
 			parent = parent.eContainer();
@@ -636,9 +634,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * accept the changes.
 	 *
 	 * @param editPart
-	 *        the edit part on which to perform the DirectEditRequest.
+	 *            the edit part on which to perform the DirectEditRequest.
 	 * @param newName
-	 *        the name to set
+	 *            the name to set
 	 */
 	protected void setNameWithDirectEditRequest(final GraphicalEditPart editPart, final String newName) {
 		final IFigure nameFigure = editPart.getFigure();
@@ -686,9 +684,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Click the palette tool with the given id on the center of the given EditPart's Figure.
 	 *
 	 * @param toolId
-	 *        the id of the tool to click
+	 *            the id of the tool to click
 	 * @param target
-	 *        what to click
+	 *            what to click
 	 */
 	protected void clickTool(final String toolId, final GraphicalEditPart target) {
 		final Point point = getCenterPoint(target);
@@ -699,9 +697,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Click the palette tool with the given id at the given location.
 	 *
 	 * @param toolId
-	 *        the id of the tool to click
+	 *            the id of the tool to click
 	 * @param point
-	 *        where to click
+	 *            where to click
 	 */
 	protected void clickTool(final String toolId, final Point point) {
 		final Tool tool = createTool(toolId);
@@ -737,7 +735,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	}
 
 	private Tool createTool(final String toolId) {
-		final PaletteViewer paletteViewer = ((EditDomain)this.diagramEditor.getDiagramEditDomain()).getPaletteViewer();
+		final PaletteViewer paletteViewer = ((EditDomain) this.diagramEditor.getDiagramEditDomain()).getPaletteViewer();
 		final ToolEntry toolEntry = findToolEntry(toolId, paletteViewer.getPaletteRoot());
 		assertNotNull("The tool with id " + toolId + " was not found in the palette", toolEntry); //$NON-NLS-2$
 		final Tool tool = toolEntry.createTool();
@@ -754,30 +752,30 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 
 	protected void initializeTool(final Tool tool) {
 		tool.setViewer(this.diagramEditor.getDiagramGraphicalViewer());
-		tool.setEditDomain((EditDomain)this.diagramEditor.getDiagramEditDomain());
+		tool.setEditDomain((EditDomain) this.diagramEditor.getDiagramEditDomain());
 	}
 
 	/**
 	 * Find a tool with the given id in the given palette container.
 	 *
 	 * @param toolId
-	 *        the id of the tool to return
+	 *            the id of the tool to return
 	 * @param paletteContainer
-	 *        the palette root
+	 *            the palette root
 	 * @return the tool entry, from which a new instance of the tool can be created
 	 */
 	protected ToolEntry findToolEntry(final String toolId, final PaletteContainer paletteContainer) {
 		final List<?> children = paletteContainer.getChildren();
-		for(final Object child : children) {
-			if(child instanceof PaletteContainer) {
-				final PaletteContainer childContainer = (PaletteContainer)child;
+		for (final Object child : children) {
+			if (child instanceof PaletteContainer) {
+				final PaletteContainer childContainer = (PaletteContainer) child;
 				final ToolEntry subresult = findToolEntry(toolId, childContainer);
-				if(subresult != null) {
+				if (subresult != null) {
 					return subresult;
 				}
-			} else if(child instanceof ToolEntry) {
-				final ToolEntry toolEntry = (ToolEntry)child;
-				if(toolId.equals(toolEntry.getId())) {
+			} else if (child instanceof ToolEntry) {
+				final ToolEntry toolEntry = (ToolEntry) child;
+				if (toolId.equals(toolEntry.getId())) {
 					return toolEntry;
 				}
 			}
@@ -823,7 +821,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 
 			@Override
 			public void run() {
-				final Composite composite = (Composite)getDiagramEditor().getDiagramGraphicalViewer().getControl();
+				final Composite composite = (Composite) getDiagramEditor().getDiagramGraphicalViewer().getControl();
 				result[0] = findVisibleTextWidget(composite);
 			}
 		});
@@ -833,16 +831,16 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	/** Finds a {@link Text} widget inside the given composite, recursively. */
 	protected Text findVisibleTextWidget(final Composite composite) {
 		final Control[] children = composite.getChildren();
-		for(final Control child : children) {
-			if(child instanceof Text) {
-				final Text text = (Text)child;
-				if(text.isVisible()) {
+		for (final Control child : children) {
+			if (child instanceof Text) {
+				final Text text = (Text) child;
+				if (text.isVisible()) {
 					return text;
 				}
-			} else if(child instanceof Composite) {
-				final Composite childComposite = (Composite)child;
+			} else if (child instanceof Composite) {
+				final Composite childComposite = (Composite) child;
 				final Text subresult = findVisibleTextWidget(childComposite);
-				if(subresult != null) {
+				if (subresult != null) {
 					return subresult;
 				}
 			}
@@ -855,13 +853,13 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * in the viewer's visual part map.
 	 *
 	 * @param view
-	 *        the view for which to find a corresponding EditPart
+	 *            the view for which to find a corresponding EditPart
 	 * @return the EditPart corresponding to the View
 	 */
 	protected EditPart findEditPart(final View view) {
 		final Object result = this.diagramEditPart.getRoot().getViewer().getVisualPartMap().get(view);
 		assertTrue("The EditPart corresponding to the View was not found", result instanceof EditPart);
-		return (EditPart)result;
+		return (EditPart) result;
 	}
 
 	/** Processes all events waiting in the Display's event loop and then returns. */
@@ -872,11 +870,11 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 			@Override
 			public void run() {
 				try {
-					while(display.readAndDispatch()) {
+					while (display.readAndDispatch()) {
 						// nothing
 					}
 				} catch (Exception ex) {
-					//Do not fail the test for invalid runnables
+					// Do not fail the test for invalid runnables
 				}
 			}
 		});
@@ -886,11 +884,11 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Move the given EditPart in its parent.
 	 *
 	 * @param editPartToMove
-	 *        the EditPart to move
+	 *            the EditPart to move
 	 * @param parentEditPart
-	 *        the parent
+	 *            the parent
 	 * @param moveDelta
-	 *        the offset
+	 *            the offset
 	 */
 	protected void moveEditPart(final GraphicalEditPart editPartToMove, final GraphicalEditPart parentEditPart, final Point moveDelta) {
 		moveEditParts(Collections.singletonList(editPartToMove), parentEditPart, moveDelta);
@@ -900,13 +898,13 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Resize the given EditPart in its parent.
 	 *
 	 * @param editPartToResize
-	 *        the EditPart to resize
+	 *            the EditPart to resize
 	 * @param parentEditPart
-	 *        the parent
+	 *            the parent
 	 * @param resizeDelta
-	 *        the size offset
+	 *            the size offset
 	 * @param direction
-	 *        the direction to resize (cf {@link PositionConstants})
+	 *            the direction to resize (cf {@link PositionConstants})
 	 */
 	protected void resizeEditPart(final GraphicalEditPart editPartToResize, final GraphicalEditPart parentEditPart, final Dimension resizeDelta, final int direction) {
 		resizeEditParts(Collections.singletonList(editPartToResize), parentEditPart, resizeDelta, direction);
@@ -916,14 +914,14 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Move the given EditParts in their parent.
 	 *
 	 * @param editPartsToMove
-	 *        the EditParts to move
+	 *            the EditParts to move
 	 * @param parentEditPart
-	 *        the parent
+	 *            the parent
 	 * @param moveDelta
-	 *        the location offset
+	 *            the location offset
 	 */
 	protected void moveEditParts(final List<? extends GraphicalEditPart> editPartsToMove, final GraphicalEditPart parentEditPart, final Point moveDelta) {
-		if(editPartsToMove.size() < 1 || parentEditPart == null || moveDelta == null) {
+		if (editPartsToMove.size() < 1 || parentEditPart == null || moveDelta == null) {
 			throw new IllegalArgumentException();
 		}
 		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();
@@ -942,16 +940,16 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Resize the given EditParts in their parent.
 	 *
 	 * @param editPartsToMove
-	 *        the EditParts to resize
+	 *            the EditParts to resize
 	 * @param parentEditPart
-	 *        the parent
+	 *            the parent
 	 * @param resizeDelta
-	 *        the size offset
+	 *            the size offset
 	 * @param direction
-	 *        the direction to resize (cf {@link PositionConstants})
+	 *            the direction to resize (cf {@link PositionConstants})
 	 */
 	protected void resizeEditParts(final List<? extends GraphicalEditPart> editPartsToResize, final GraphicalEditPart parentEditPart, final Dimension resizeDelta, final int direction) {
-		if(editPartsToResize.size() < 1 || parentEditPart == null || resizeDelta == null) {
+		if (editPartsToResize.size() < 1 || parentEditPart == null || resizeDelta == null) {
 			throw new IllegalArgumentException();
 		}
 		final ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest();
@@ -972,9 +970,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * given translation vector.
 	 *
 	 * @param graphicalEditPart
-	 *        the EditPart being dragged
+	 *            the EditPart being dragged
 	 * @param moveDelta
-	 *        the offset (the translation vector)
+	 *            the offset (the translation vector)
 	 * @return the target Location
 	 */
 	private static Point computeLocationWithDelta(final GraphicalEditPart graphicalEditPart, final Point moveDelta) {
@@ -1004,9 +1002,9 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * moved/resized before calling this method).
 	 *
 	 * @param editPart
-	 *        an EditPart that was just moved/resized
+	 *            an EditPart that was just moved/resized
 	 * @param boundsBefore
-	 *        the bounds of this EditPart before it was moved/resized
+	 *            the bounds of this EditPart before it was moved/resized
 	 */
 	protected void testUndoRedoChangeBoundsEditPart(final GraphicalEditPart editPart, final Rectangle boundsBefore) {
 		final Rectangle boundsAfter = getBounds(editPart);
@@ -1028,19 +1026,19 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Check the bounds of the given GraphicalEditPart's Figure
 	 *
 	 * @param graphicalEditPart
-	 *        The EditPart whose Figure's bounds to check
+	 *            The EditPart whose Figure's bounds to check
 	 * @param expectedPosition
-	 *        the expected position (-1 for any of the coordinates means not to check this coordinate)
+	 *            the expected position (-1 for any of the coordinates means not to check this coordinate)
 	 * @param expectedSize
-	 *        the expected size (-1 for any of the coordinates means not to check this coordinate)
+	 *            the expected size (-1 for any of the coordinates means not to check this coordinate)
 	 * @param xErrorMargin
-	 *        an error margin for the horizontal position
+	 *            an error margin for the horizontal position
 	 * @param yErrorMargin
-	 *        an error margin for the vertical position
+	 *            an error margin for the vertical position
 	 * @param widthErrorMargin
-	 *        an error margin for the width
+	 *            an error margin for the width
 	 * @param heightErrorMargin
-	 *        an error margin for the height
+	 *            an error margin for the height
 	 */
 	protected static void assertBounds(final GraphicalEditPart graphicalEditPart, final Point expectedPosition, final Dimension expectedSize, final int xErrorMargin, final int yErrorMargin, final int widthErrorMargin, final int heightErrorMargin) {
 		assertBounds(graphicalEditPart, new Rectangle(expectedPosition, expectedSize), xErrorMargin, yErrorMargin, widthErrorMargin, heightErrorMargin);
@@ -1050,32 +1048,32 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Check the bounds of the given GraphicalEditPart's Figure
 	 *
 	 * @param graphicalEditPart
-	 *        The EditPart whose Figure's bounds to check
+	 *            The EditPart whose Figure's bounds to check
 	 * @param expectedBounds
-	 *        the expected bounds (-1 for any of the coordinates means not to check this coordinate)
+	 *            the expected bounds (-1 for any of the coordinates means not to check this coordinate)
 	 * @param xErrorMargin
-	 *        an error margin for the horizontal position
+	 *            an error margin for the horizontal position
 	 * @param yErrorMargin
-	 *        an error margin for the vertical position
+	 *            an error margin for the vertical position
 	 * @param widthErrorMargin
-	 *        an error margin for the width
+	 *            an error margin for the width
 	 * @param heightErrorMargin
-	 *        an error margin for the height
+	 *            an error margin for the height
 	 */
 	protected static void assertBounds(final GraphicalEditPart graphicalEditPart, final Rectangle expectedBounds, final int xErrorMargin, final int yErrorMargin, final int widthErrorMargin, final int heightErrorMargin) {
 		// let GMF do its layout so that the bounds are correct
 		flushEventLoop();
 		final Rectangle bounds = getBounds(graphicalEditPart);
-		if(expectedBounds.width != -1) {
+		if (expectedBounds.width != -1) {
 			assertTrue("The element should be about " + expectedBounds.width + " pixels wide", Math.abs(bounds.width - expectedBounds.width) <= widthErrorMargin);
 		}
-		if(expectedBounds.height != -1) {
+		if (expectedBounds.height != -1) {
 			assertTrue("The element should be about " + expectedBounds.height + " pixels high", Math.abs(bounds.height - expectedBounds.height) <= heightErrorMargin);
 		}
-		if(expectedBounds.x != -1) {
+		if (expectedBounds.x != -1) {
 			assertTrue("The element should have a horizontal position at about " + expectedBounds.x + " pixels", Math.abs(bounds.x - expectedBounds.x) <= xErrorMargin);
 		}
-		if(expectedBounds.y != -1) {
+		if (expectedBounds.y != -1) {
 			assertTrue("The element should have a vertical position at about " + expectedBounds.y + " pixels", Math.abs(bounds.y - expectedBounds.y) <= yErrorMargin);
 		}
 	}
@@ -1084,17 +1082,17 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Find the EditPart corresponding to the given View in the given parent EditPart's children.
 	 *
 	 * @param parentEditPart
-	 *        the EditPart in which the EditPart we are looking for should be found
+	 *            the EditPart in which the EditPart we are looking for should be found
 	 * @param view
-	 *        the View corresponding to the searched EditPart
+	 *            the View corresponding to the searched EditPart
 	 * @return the found EditPart
 	 */
 	protected static EditPart findChildEditPartAssociatedToView(final EditPart parentEditPart, final View view) {
 		EditPart result = null;
 		@SuppressWarnings("unchecked")
 		final List<EditPart> children = parentEditPart.getChildren();
-		for(final EditPart editPart : children) {
-			if(view == editPart.getModel()) {
+		for (final EditPart editPart : children) {
+			if (view == editPart.getModel()) {
 				result = editPart;
 			}
 		}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF
index 5e340135882..d921a6b17cf 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF
@@ -3,26 +3,26 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
  org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.gmf.tooling.runtime
 Export-Package: org.eclipse.papyrus.uml.diagram.usecase.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml
index 69e34307bc2..d7d212680b2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.usecase.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 13a0ed404d3..ea6915851c2 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
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.8.1",
  org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.diagram.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.diagram.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.1.0",
  org.eclipse.ui.workbench;bundle-version="3.103.1",
  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.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
  com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.wizards
 Bundle-Vendor: %providerName
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml
index 528a878aed4..a267ac3ca96 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.diagram.wizards.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
index 160059970f9..fb5cd50b6c3 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
  org.eclipse.emf.ecore,
  org.eclipse.uml2.uml;bundle-version="4.0.0",
  org.eclipse.ui.navigator,
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
  org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.modelexplorer.tests,
  org.eclipse.papyrus.uml.modelexplorer.tests.paste
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml
index 88894018a61..3ecc1bc1bf9 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.modelexplorer.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
index a5501283844..08e0c266f25 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
  org.eclipse.emf.ecore,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
  org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.nebula.widgets.nattable.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
  org.eclipse.emf.common,
- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1"
+ org.eclipse.papyrus.views.properties.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.nattable.generic.tests.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
index dc8a3b1c6b3..68298009939 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.nattable.generic.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
index 9bb88f01a8e..3530cdc8a3f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.11.0",
  org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.nattable;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.nattable;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.nattable.tests,
  org.eclipse.papyrus.uml.nattable.tests.tests
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.nattable.tests.Activator
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml
index dc19dffc366..62340cea640 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.nattable.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF
index ae20df172dd..33575dd7c63 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.8.0",
 Export-Package: org.eclipse.papyrus.search.tests.suites
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml
index c1a303737c4..5885b806c34 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.search.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.search.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
index 5fd82ef164f..317d5219906 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.modelrepair.internal.stereotypes,
  org.eclipse.papyrus.uml.modelrepair.tests
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0
  .0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: fragment
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml
index d9f86ffdc03..4925aa202d8 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.modelrepair.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.notation
new file mode 100644
index 00000000000..571dd203d43
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.notation
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_eU4Q8Tg8EeSUs8U9fXt57A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_fkUfkDg8EeSUs8U9fXt57A" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_fkUfkjg8EeSUs8U9fXt57A" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fkUfkzg8EeSUs8U9fXt57A" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fkUflDg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fkUflTg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fkUfljg8EeSUs8U9fXt57A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUflzg8EeSUs8U9fXt57A"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fkUfmDg8EeSUs8U9fXt57A" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fkUfmTg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fkUfmjg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fkUfmzg8EeSUs8U9fXt57A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUfnDg8EeSUs8U9fXt57A"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_fkUfnTg8EeSUs8U9fXt57A" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_fkUfnjg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_fkUfnzg8EeSUs8U9fXt57A"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_fkUfoDg8EeSUs8U9fXt57A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUfoTg8EeSUs8U9fXt57A"/>
+    </children>
+    <element xmi:type="uml:Class" href="model-with-stylesheet.uml#_fkKukDg8EeSUs8U9fXt57A"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkUfkTg8EeSUs8U9fXt57A" x="450" y="229"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_eU4Q8jg8EeSUs8U9fXt57A" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_eU4Q8zg8EeSUs8U9fXt57A"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_eU4Q9Dg8EeSUs8U9fXt57A">
+    <owner xmi:type="uml:Model" href="model-with-stylesheet.uml#_eU4Q8Dg8EeSUs8U9fXt57A"/>
+  </styles>
+  <element xmi:type="uml:Model" href="model-with-stylesheet.uml#_eU4Q8Dg8EeSUs8U9fXt57A"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.uml
new file mode 100644
index 00000000000..f9d80141fe5
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model-with-stylesheet.uml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <uml:Model xmi:id="_eU4Q8Dg8EeSUs8U9fXt57A" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_fkKukDg8EeSUs8U9fXt57A" name="Class1"/>
+  </uml:Model>
+  <css:ModelStyleSheets xmi:id="_gHbzsDg8EeSUs8U9fXt57A">
+    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_ix7EADg8EeSUs8U9fXt57A" label="Embedded" content="* {&#xD;&#xA;&#x9;bold: true;&#xD;&#xA;}"/>
+  </css:ModelStyleSheets>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.notation
new file mode 100644
index 00000000000..99927e00f11
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.notation
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_iGBGQDf6EeS08JDbYjJccA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_oQr4wDf6EeS08JDbYjJccA" type="1030">
+    <children xmi:type="notation:DecorationNode" xmi:id="_oQtG4Df6EeS08JDbYjJccA" type="1047"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_oQtG4Tf6EeS08JDbYjJccA" type="1042">
+      <children xmi:type="notation:Shape" xmi:id="_pb6VwDf6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_pb680Df6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pb680Tf6EeS08JDbYjJccA" type="1052">
+          <children xmi:type="notation:Node" xmi:id="_S7WmMDg3EeS5ZcmG-RC5ow" type="3002">
+            <element xmi:type="uml:Property" href="model.profile.uml#_S6Py8Dg3EeS5ZcmG-RC5ow"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_S7WmMTg3EeS5ZcmG-RC5ow"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pb680jf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pb680zf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pb681Df6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pb681Tf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pb681jf6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pb681zf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pb682Df6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pb682Tf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pb682jf6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_pb35gDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pb6VwTf6EeS08JDbYjJccA" x="83" y="38"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_phGXwDf6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_phG-0Df6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_phG-0Tf6EeS08JDbYjJccA" type="1052">
+          <children xmi:type="notation:Node" xmi:id="_gKlnoDg3EeS5ZcmG-RC5ow" type="3002">
+            <element xmi:type="uml:Property" href="model.profile.uml#_gKkZgDg3EeS5ZcmG-RC5ow"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_gKlnoTg3EeS5ZcmG-RC5ow"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_phG-0jf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_phG-0zf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_phG-1Df6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phG-1Tf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_phHl4Df6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_phHl4Tf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_phHl4jf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_phHl4zf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phHl5Df6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_phD7gDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phGXwTf6EeS08JDbYjJccA" x="355" y="38"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oQtG4jf6EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oQtG4zf6EeS08JDbYjJccA"/>
+    </children>
+    <element xmi:type="uml:Profile" href="model.profile.uml#_oQSQIDf6EeS08JDbYjJccA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oQr4wTf6EeS08JDbYjJccA" x="753" y="267" width="551" height="248"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ovG6IDf6EeS08JDbYjJccA" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ovHhMDf6EeS08JDbYjJccA" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ovHhMTf6EeS08JDbYjJccA" type="1005">
+      <children xmi:type="notation:Shape" xmi:id="_pMNs4Df6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_pMOT8Df6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pMQwMDf6EeS08JDbYjJccA" type="1052">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pMQwMTf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pMQwMjf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pMQwMzf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMQwNDf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pMQwNTf6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pMQwNjf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pMQwNzf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pMQwODf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMQwOTf6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_pMKpkDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMNs4Tf6EeS08JDbYjJccA" x="51" y="40"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_pV7pkDf6EeS08JDbYjJccA" type="1023">
+        <children xmi:type="notation:DecorationNode" xmi:id="_pV7pkjf6EeS08JDbYjJccA" type="1046"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pV8QoDf6EeS08JDbYjJccA" type="1052">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pV8QoTf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pV8Qojf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pV8Qozf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pV8QpDf6EeS08JDbYjJccA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_pV8QpTf6EeS08JDbYjJccA" type="1053">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_pV8Qpjf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_pV8Qpzf6EeS08JDbYjJccA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_pV8QqDf6EeS08JDbYjJccA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pV8QqTf6EeS08JDbYjJccA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="model.profile.uml#_pV5NUDf6EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pV7pkTf6EeS08JDbYjJccA" x="257" y="53"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ovHhMjf6EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ovHhMzf6EeS08JDbYjJccA"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.profile.uml#_ouPXcDf6EeS08JDbYjJccA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ovG6ITf6EeS08JDbYjJccA" x="145" y="228" width="443" height="251"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_t8jPYDf6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t8lroDf6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8lroTf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8mSsDf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8mSsTf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8mSsjf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8m5wDf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t8j2cDf6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8j2cTf6EeS08JDbYjJccA" x="1137" y="113"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_t8ng0Df6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t8ou8Df6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8pWADf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8pWATf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8p9EDf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8p9ETf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t8p9Ejf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t8oH4Df6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oH4Tf6EeS08JDbYjJccA" x="1137" y="193"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_yIfrYjf6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yIpcYDf6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcYTf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcYjf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcYzf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcZDf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcZTf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_yIfrZDf6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Artifact"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yIfrZTf6EeS08JDbYjJccA" x="736" y="84"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_yIpcZjf6EeS08JDbYjJccA" type="1031">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yIpcajf6EeS08JDbYjJccA" source="Stereotype_Annotation">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcazf6EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbDf6EeS08JDbYjJccA" key="StereotypeList" value="StandardProfile::Metaclass"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbTf6EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbjf6EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yIpcbzf6EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_yIpcaDf6EeS08JDbYjJccA" type="1084"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yIpcaTf6EeS08JDbYjJccA" x="736" y="164"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_iGBGQTf6EeS08JDbYjJccA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_iGBGQjf6EeS08JDbYjJccA"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_iGBGQzf6EeS08JDbYjJccA">
+    <owner xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_qg19gDf6EeS08JDbYjJccA" type="4002" source="_phGXwDf6EeS08JDbYjJccA" target="_pb6VwDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_qg2kkDf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_qg3LoDf6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_qg19gTf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_qeqMMDf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qg19gjf6EeS08JDbYjJccA" points="[-50, -8, 225, 5]$[-325, -8, -50, 5]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_zgxs8Df6EeS08JDbYjJccA" type="1013" source="_pb6VwDf6EeS08JDbYjJccA" target="_t8ng0Df6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_zg7d8Df6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_zgeyATf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zg7d8Tf6EeS08JDbYjJccA" points="[50, -29, -246, 151]$[298, -155, 2, 25]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_z2W7Yzf6EeS08JDbYjJccA" type="1013" source="_phGXwDf6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_z2W7ZDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_z2W7YTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z2W7ZTf6EeS08JDbYjJccA" points="[50, -20, 40, 258]$[300, -120, 290, 158]$[74, -244, 64, 34]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z2gsYDf6EeS08JDbYjJccA" id="(0.36,0.14)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_0ZNJwDf6EeS08JDbYjJccA" type="1013" source="_pb6VwDf6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_0ZNJwTf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_0ZDYwTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0ZNJwjf6EeS08JDbYjJccA" points="[37, -28, -294, 210]$[323, -263, -8, -25]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0ZNJwzf6EeS08JDbYjJccA" id="(0.15,0.28)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_06tUUTf6EeS08JDbYjJccA" type="4002" source="_pMNs4Df6EeS08JDbYjJccA" target="_pb6VwDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_06tUVDf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_06tUVTf6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_06tUUjf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_06tUUDf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_06tUUzf6EeS08JDbYjJccA" points="[19, 10, -602, -26]$[178, 101, -443, 65]$[559, 45, -62, 9]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d0lZkDg3EeS5ZcmG-RC5ow" id="(0.81,0.63)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_1IsF8Df6EeS08JDbYjJccA" type="4002" source="_pV7pkDf6EeS08JDbYjJccA" target="_phGXwDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_1IsF8zf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_1IsF9Df6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_1IsF8Tf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_1IiU8Df6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1IsF8jf6EeS08JDbYjJccA" points="[45, 24, -691, -25]$[559, 293, -177, 244]$[725, 64, -11, 15]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1IsF9Tf6EeS08JDbYjJccA" id="(0.15,0.76)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1IsF9jf6EeS08JDbYjJccA" id="(0.45,0.85)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_10lioTf6EeS08JDbYjJccA" type="4002" source="_pMNs4Df6EeS08JDbYjJccA" target="_pV7pkDf6EeS08JDbYjJccA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_10vToDf6EeS08JDbYjJccA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_10vToTf6EeS08JDbYjJccA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_10liojf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Generalization" href="model.profile.uml#_10lioDf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_10liozf6EeS08JDbYjJccA" points="[50, 3, -194, -16]$[256, 20, 12, 1]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_10vTojf6EeS08JDbYjJccA" id="(0.88,0.56)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_2US9czf6EeS08JDbYjJccA" type="1013" source="_pMNs4Df6EeS08JDbYjJccA" target="_yIfrYjf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_2US9dDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_2US9cTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2US9dTf6EeS08JDbYjJccA" points="[86, -35, -489, 186]$[525, -227, -50, -6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2UcHYDf6EeS08JDbYjJccA" id="(0.1,0.35)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_2hY-Qzf6EeS08JDbYjJccA" type="1013" source="_pMNs4Df6EeS08JDbYjJccA" target="_yIpcZjf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_2hY-RDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_2hY-QTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2hY-RTf6EeS08JDbYjJccA" points="[50, -14, -520, 141]$[590, -155, 20, 0]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2hiIMDf6EeS08JDbYjJccA" id="(0.8095238095238095,0.52)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_2x5fcDf6EeS08JDbYjJccA" type="1013" source="_pMNs4Df6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_2x5fcTf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_2xwVgTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2x5fcjf6EeS08JDbYjJccA" points="[50, -12, -886, 195]$[886, -213, -50, -6]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_3AU9ADf6EeS08JDbYjJccA" type="1013" source="_pV7pkDf6EeS08JDbYjJccA" target="_t8jPYDf6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_3AU9ATf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_3ALzETf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3AU9Ajf6EeS08JDbYjJccA" points="[50, -16, -680, 204]$[734, -245, 4, -25]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_3PNGgzf6EeS08JDbYjJccA" type="1013" source="_pV7pkDf6EeS08JDbYjJccA" target="_t8ng0Df6EeS08JDbYjJccA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_3PNGhDf6EeS08JDbYjJccA"/>
+    <element xmi:type="uml:Extension" href="model.profile.uml#_3PNGgTf6EeS08JDbYjJccA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3PNGhTf6EeS08JDbYjJccA" points="[50, -9, -680, 131]$[780, -133, 50, 7]"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.uml
new file mode 100644
index 00000000000..61091e9e9c9
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model.profile.uml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_h-wAoDf6EeS08JDbYjJccA" name="Profile" metaclassReference="_t8flADf6EeS08JDbYjJccA _t8gMEDf6EeS08JDbYjJccA _yIfrYDf6EeS08JDbYjJccA _yIfrYTf6EeS08JDbYjJccA" metamodelReference="_h-wnsDf6EeS08JDbYjJccA">
+  <eAnnotations xmi:id="__4KgYTf6EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <contents xmi:type="ecore:EPackage" xmi:id="_0ChbYDg3EeS5ZcmG-RC5ow" name="Profile" nsURI="http:///schemas/Profile/_0Cg0UDg3EeS5ZcmG-RC5ow/1" nsPrefix="Profile">
+      <eAnnotations xmi:id="_0ChbYTg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_oQSQIDf6EeS08JDbYjJccA"/>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_0ChbYjg3EeS5ZcmG-RC5ow" name="Profile_Profile1_Stereotype2" eSuperTypes="_0Chbazg3EeS5ZcmG-RC5ow">
+        <eAnnotations xmi:id="_0ChbYzg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_phD7gDf6EeS08JDbYjJccA"/>
+        <eAnnotations xmi:id="_0ChbZDg3EeS5ZcmG-RC5ow" source="duplicates">
+          <contents xmi:type="ecore:EReference" xmi:id="_0ChbZTg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+            <eAnnotations xmi:id="_0ChbZjg3EeS5ZcmG-RC5ow" source="redefines" references="_0Chbbzg3EeS5ZcmG-RC5ow"/>
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+          </contents>
+        </eAnnotations>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0ChbaDg3EeS5ZcmG-RC5ow" name="tag2" ordered="false" defaultValueLiteral="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_0Chbazg3EeS5ZcmG-RC5ow" name="Profile_Profile1_Stereotype1">
+        <eAnnotations xmi:id="_0ChbbDg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pb35gDf6EeS08JDbYjJccA"/>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0ChbbTg3EeS5ZcmG-RC5ow" name="base_Element" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0Chbbzg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        </eStructuralFeatures>
+        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0ChbcTg3EeS5ZcmG-RC5ow" name="tag1" ordered="false">
+          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+        </eStructuralFeatures>
+      </eClassifiers>
+      <eSubpackages xmi:id="_0Chbczg3EeS5ZcmG-RC5ow" name="Package1" nsURI="http:///Profile/Package1.ecore" nsPrefix="Profile.Package1">
+        <eAnnotations xmi:id="_0ChbdDg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/4.0.0/UML" references="_ouPXcDf6EeS08JDbYjJccA"/>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_0ChbdTg3EeS5ZcmG-RC5ow" name="Stereotype1" eSuperTypes="_0ChbgDg3EeS5ZcmG-RC5ow">
+          <eAnnotations xmi:id="_0Chbdjg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pMKpkDf6EeS08JDbYjJccA"/>
+          <eAnnotations xmi:id="_0Chbdzg3EeS5ZcmG-RC5ow" source="duplicates">
+            <contents xmi:type="ecore:EReference" xmi:id="_0ChbeDg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_0ChbeTg3EeS5ZcmG-RC5ow" source="redefines" references="_0Chbbzg3EeS5ZcmG-RC5ow _0ChbZTg3EeS5ZcmG-RC5ow _0Chbgzg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+            </contents>
+          </eAnnotations>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0Chbezg3EeS5ZcmG-RC5ow" name="base_Artifact" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Artifact"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0ChbfTg3EeS5ZcmG-RC5ow" name="base_StructuredClassifier" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_0ChbgDg3EeS5ZcmG-RC5ow" name="Stereotype2" eSuperTypes="_0ChbYjg3EeS5ZcmG-RC5ow">
+          <eAnnotations xmi:id="_0ChbgTg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pV5NUDf6EeS08JDbYjJccA"/>
+          <eAnnotations xmi:id="_0Chbgjg3EeS5ZcmG-RC5ow" source="duplicates">
+            <contents xmi:type="ecore:EReference" xmi:id="_0Chbgzg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_0ChbhDg3EeS5ZcmG-RC5ow" source="redefines" references="_0Chbbzg3EeS5ZcmG-RC5ow _0ChbZTg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+            </contents>
+            <contents xmi:type="ecore:EReference" xmi:id="_0Chbhjg3EeS5ZcmG-RC5ow" name="base_Element" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_0Chbhzg3EeS5ZcmG-RC5ow" source="redefines" references="_0ChbbTg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+            </contents>
+          </eAnnotations>
+        </eClassifiers>
+      </eSubpackages>
+    </contents>
+  </eAnnotations>
+  <elementImport xmi:id="_t8flADf6EeS08JDbYjJccA" alias="Class">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+  </elementImport>
+  <elementImport xmi:id="_t8gMEDf6EeS08JDbYjJccA" alias="Element">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+  </elementImport>
+  <elementImport xmi:id="_yIfrYDf6EeS08JDbYjJccA" alias="Artifact">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Artifact"/>
+  </elementImport>
+  <elementImport xmi:id="_yIfrYTf6EeS08JDbYjJccA" alias="StructuredClassifier">
+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
+  </elementImport>
+  <packageImport xmi:id="_h-wnsDf6EeS08JDbYjJccA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+  </packageImport>
+  <packageImport xmi:id="_h-wnsTf6EeS08JDbYjJccA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Profile" xmi:id="_oQSQIDf6EeS08JDbYjJccA" name="Profile1">
+    <eAnnotations xmi:id="_9DhOgTf6EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <contents xmi:type="ecore:EPackage" xmi:id="_wQvL0Dg3EeS5ZcmG-RC5ow" name="Profile1" nsURI="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1" nsPrefix="Profile1">
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wQvL0Tg3EeS5ZcmG-RC5ow" name="Stereotype1">
+          <eAnnotations xmi:id="_wQvL0jg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_pb35gDf6EeS08JDbYjJccA"/>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wQvL0zg3EeS5ZcmG-RC5ow" name="base_Element" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_wQvL1Tg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+          </eStructuralFeatures>
+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wQvL1zg3EeS5ZcmG-RC5ow" name="tag1" ordered="false">
+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_wQvL2Tg3EeS5ZcmG-RC5ow" name="Stereotype2" eSuperTypes="_wQvL0Tg3EeS5ZcmG-RC5ow">
+          <eAnnotations xmi:id="_wQvL2jg3EeS5ZcmG-RC5ow" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_phD7gDf6EeS08JDbYjJccA"/>
+          <eAnnotations xmi:id="_wQvL2zg3EeS5ZcmG-RC5ow" source="duplicates">
+            <contents xmi:type="ecore:EReference" xmi:id="_wQvL3Dg3EeS5ZcmG-RC5ow" name="base_Class" ordered="false" lowerBound="1">
+              <eAnnotations xmi:id="_wQvL3Tg3EeS5ZcmG-RC5ow" source="redefines" references="_wQvL1Tg3EeS5ZcmG-RC5ow"/>
+              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+            </contents>
+          </eAnnotations>
+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_wQvL3zg3EeS5ZcmG-RC5ow" name="tag2" ordered="false" defaultValueLiteral="false">
+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+          </eStructuralFeatures>
+        </eClassifiers>
+      </contents>
+    </eAnnotations>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_pb35gDf6EeS08JDbYjJccA" name="Stereotype1">
+      <ownedAttribute xmi:id="_zgeyADf6EeS08JDbYjJccA" name="base_Element" association="_zgeyATf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_0ZDYwDf6EeS08JDbYjJccA" name="base_Class" association="_0ZDYwTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_S6Py8Dg3EeS5ZcmG-RC5ow" name="tag1" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wr6GsDg3EeS5ZcmG-RC5ow"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wr-YIDg3EeS5ZcmG-RC5ow" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_phD7gDf6EeS08JDbYjJccA" name="Stereotype2">
+      <generalization xmi:id="_qeqMMDf6EeS08JDbYjJccA" general="_pb35gDf6EeS08JDbYjJccA"/>
+      <ownedAttribute xmi:id="_z2W7YDf6EeS08JDbYjJccA" name="base_Class" association="_z2W7YTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_gKkZgDg3EeS5ZcmG-RC5ow" name="tag2" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i3kyUDg3EeS5ZcmG-RC5ow"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i3mAcDg3EeS5ZcmG-RC5ow" value="1"/>
+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_mSBf8Dg3EeS5ZcmG-RC5ow"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_zgeyATf6EeS08JDbYjJccA" name="E_Stereotype1_Element1" memberEnd="_zgeyAjf6EeS08JDbYjJccA _zgeyADf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_zgeyAjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pb35gDf6EeS08JDbYjJccA" aggregation="composite" association="_zgeyATf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_z2W7YTf6EeS08JDbYjJccA" name="E_Stereotype2_Class1" memberEnd="_z2W7Yjf6EeS08JDbYjJccA _z2W7YDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_z2W7Yjf6EeS08JDbYjJccA" name="extension_Stereotype2" type="_phD7gDf6EeS08JDbYjJccA" aggregation="composite" association="_z2W7YTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_0ZDYwTf6EeS08JDbYjJccA" name="E_Stereotype1_Class1" memberEnd="_0ZDYwjf6EeS08JDbYjJccA _0ZDYwDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_0ZDYwjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pb35gDf6EeS08JDbYjJccA" aggregation="composite" association="_0ZDYwTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_ouPXcDf6EeS08JDbYjJccA" name="Package1">
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_pMKpkDf6EeS08JDbYjJccA" name="Stereotype1">
+      <generalization xmi:id="_10lioDf6EeS08JDbYjJccA" general="_pV5NUDf6EeS08JDbYjJccA"/>
+      <generalization xmi:id="_06tUUDf6EeS08JDbYjJccA" general="_pb35gDf6EeS08JDbYjJccA"/>
+      <ownedAttribute xmi:id="_2US9cDf6EeS08JDbYjJccA" name="base_Artifact" association="_2US9cTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Artifact"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_2hY-QDf6EeS08JDbYjJccA" name="base_StructuredClassifier" association="_2hY-QTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_2xwVgDf6EeS08JDbYjJccA" name="base_Class" association="_2xwVgTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_pV5NUDf6EeS08JDbYjJccA" name="Stereotype2">
+      <generalization xmi:id="_1IiU8Df6EeS08JDbYjJccA" general="_phD7gDf6EeS08JDbYjJccA"/>
+      <ownedAttribute xmi:id="_3ALzEDf6EeS08JDbYjJccA" name="base_Class" association="_3ALzETf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_3PNGgDf6EeS08JDbYjJccA" name="base_Element" association="_3PNGgTf6EeS08JDbYjJccA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_2US9cTf6EeS08JDbYjJccA" name="E_Stereotype1_Artifact1" memberEnd="_2US9cjf6EeS08JDbYjJccA _2US9cDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_2US9cjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pMKpkDf6EeS08JDbYjJccA" aggregation="composite" association="_2US9cTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_2hY-QTf6EeS08JDbYjJccA" name="E_Stereotype1_StructuredClassifier1" memberEnd="_2hY-Qjf6EeS08JDbYjJccA _2hY-QDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_2hY-Qjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pMKpkDf6EeS08JDbYjJccA" aggregation="composite" association="_2hY-QTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_2xwVgTf6EeS08JDbYjJccA" name="E_Stereotype1_Class1" memberEnd="_2xwVgjf6EeS08JDbYjJccA _2xwVgDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_2xwVgjf6EeS08JDbYjJccA" name="extension_Stereotype1" type="_pMKpkDf6EeS08JDbYjJccA" aggregation="composite" association="_2xwVgTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_3ALzETf6EeS08JDbYjJccA" name="E_Stereotype2_Class1" memberEnd="_3ALzEjf6EeS08JDbYjJccA _3ALzEDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3ALzEjf6EeS08JDbYjJccA" name="extension_Stereotype2" type="_pV5NUDf6EeS08JDbYjJccA" aggregation="composite" association="_3ALzETf6EeS08JDbYjJccA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_3PNGgTf6EeS08JDbYjJccA" name="E_Stereotype2_Element1" memberEnd="_3PNGgjf6EeS08JDbYjJccA _3PNGgDf6EeS08JDbYjJccA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3PNGgjf6EeS08JDbYjJccA" name="extension_Stereotype2" type="_pV5NUDf6EeS08JDbYjJccA" aggregation="composite" association="_3PNGgTf6EeS08JDbYjJccA"/>
+    </packagedElement>
+  </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.notation
new file mode 100644
index 00000000000..189bc5d64fd
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.notation
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_C0NawDf7EeS08JDbYjJccA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_DO2IUDf7EeS08JDbYjJccA" type="2008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FmJ98Df7EeS08JDbYjJccA" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsDf7EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsTf7EeS08JDbYjJccA" key="StereotypeList" value="Profile::Profile1::Stereotype1,Profile::Package1::Stereotype1,Profile::Profile1::Stereotype2,Profile::Package1::Stereotype2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsjf7EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLszf7EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLtDf7EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DO2IUjf7EeS08JDbYjJccA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IUzf7EeS08JDbYjJccA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IVDf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IVTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IVjf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IVzf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IWDf7EeS08JDbYjJccA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IWTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IWjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IWzf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IXDf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IXTf7EeS08JDbYjJccA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IXjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IXzf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IYDf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IYTf7EeS08JDbYjJccA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model2-missing-schemalocation.uml#_DOjNYDf7EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IUTf7EeS08JDbYjJccA" x="416" y="305"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_C0NawTf7EeS08JDbYjJccA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_C0Nawjf7EeS08JDbYjJccA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_C0Nawzf7EeS08JDbYjJccA">
+      <owner xmi:type="uml:Model" href="model2-missing-schemalocation.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model2-missing-schemalocation.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_vlOj8DgnEeS1PIjgbD2xEA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.uml
new file mode 100644
index 00000000000..98c3c87e9fc
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2-missing-schemalocation.uml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Profile.Package1="http:///Profile/Package1.ecore" xmlns:Profile1="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1 model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow">
+  <uml:Model xmi:id="_C0EQ0Df7EeS08JDbYjJccA" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_DOjNYDf7EeS08JDbYjJccA" name="Class1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E5XwcDf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E6HXUDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_0ChbYDg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E6HXUTf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E62-MDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_oQSQIDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+  </uml:Model>
+  <Profile1:Stereotype1 xmi:id="_FmAM8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value of tag1 from nested profile"/>
+  <Profile1:Stereotype2 xmi:id="_Fmvz0Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype1 xmi:id="_FmTu8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value for tag1 from nested package" base_StructuredClassifier="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype2 xmi:id="_FnWQwDf7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag2="true"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.notation
new file mode 100644
index 00000000000..e6c9caaf2e9
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.notation
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_C0NawDf7EeS08JDbYjJccA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_DO2IUDf7EeS08JDbYjJccA" type="2008">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FmJ98Df7EeS08JDbYjJccA" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsDf7EeS08JDbYjJccA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsTf7EeS08JDbYjJccA" key="StereotypeList" value="Profile::Profile1::Stereotype1,Profile::Package1::Stereotype1,Profile::Profile1::Stereotype2,Profile::Package1::Stereotype2"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLsjf7EeS08JDbYjJccA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLszf7EeS08JDbYjJccA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FnpLtDf7EeS08JDbYjJccA" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_DO2IUjf7EeS08JDbYjJccA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IUzf7EeS08JDbYjJccA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IVDf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IVTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IVjf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IVzf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IWDf7EeS08JDbYjJccA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IWTf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IWjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IWzf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IXDf7EeS08JDbYjJccA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_DO2IXTf7EeS08JDbYjJccA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_DO2IXjf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_DO2IXzf7EeS08JDbYjJccA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_DO2IYDf7EeS08JDbYjJccA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IYTf7EeS08JDbYjJccA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model2.uml#_DOjNYDf7EeS08JDbYjJccA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DO2IUTf7EeS08JDbYjJccA" x="416" y="305"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_C0NawTf7EeS08JDbYjJccA" name="diagram_compatibility_version" stringValue="1.0.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_C0Nawjf7EeS08JDbYjJccA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_C0Nawzf7EeS08JDbYjJccA">
+      <owner xmi:type="uml:Model" href="model2.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+    </styles>
+    <element xmi:type="uml:Model" href="model2.uml#_C0EQ0Df7EeS08JDbYjJccA"/>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_vlOj8DgnEeS1PIjgbD2xEA"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.uml
new file mode 100644
index 00000000000..0807144c542
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/resources/regression/bug436666/model2.uml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Profile.Package1="http:///Profile/Package1.ecore" xmlns:Profile1="http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///Profile/Package1.ecore model.profile.uml#_0Chbczg3EeS5ZcmG-RC5ow http://Profile/schemas/Profile1/_wQukwDg3EeS5ZcmG-RC5ow/1 model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow">
+  <uml:Model xmi:id="_C0EQ0Df7EeS08JDbYjJccA" name="model">
+    <packagedElement xmi:type="uml:Class" xmi:id="_DOjNYDf7EeS08JDbYjJccA" name="Class1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E5XwcDf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E6HXUDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_0ChbYDg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_h-wAoDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_E6HXUTf7EeS08JDbYjJccA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E62-MDf7EeS08JDbYjJccA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="model.profile.uml#_wQvL0Dg3EeS5ZcmG-RC5ow"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="model.profile.uml#_oQSQIDf6EeS08JDbYjJccA"/>
+    </profileApplication>
+  </uml:Model>
+  <Profile1:Stereotype1 xmi:id="_FmAM8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value of tag1 from nested profile"/>
+  <Profile1:Stereotype2 xmi:id="_Fmvz0Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype1 xmi:id="_FmTu8Df7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag1="value for tag1 from nested package" base_StructuredClassifier="_DOjNYDf7EeS08JDbYjJccA"/>
+  <Profile.Package1:Stereotype2 xmi:id="_FnWQwDf7EeS08JDbYjJccA" base_Element="_DOjNYDf7EeS08JDbYjJccA" base_Class="_DOjNYDf7EeS08JDbYjJccA" tag2="true"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java
index 4b95ba8554c..9ff8491945b 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeRepairRegressionTest.java
@@ -36,6 +36,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import com.google.common.base.Function;
+import com.google.common.base.Functions;
 
 
 /**
@@ -95,9 +96,9 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 
 		// Verify the stereotype instance that was migrated
 		Stereotype stereo = profile.getOwnedStereotype("Stereo2");
-		Class class2 = (Class)nested.getOwnedType("Class2");
+		Class class2 = (Class) nested.getOwnedType("Class2");
 		Property class1 = class2.getAttribute("class1", null);
-		assertThat(class1.getValue(stereo, "weight"), is((Object)15));
+		assertThat(class1.getValue(stereo, "weight"), is((Object) 15));
 	}
 
 	/**
@@ -124,9 +125,9 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 
 		// Verify the stereotype instance that was migrated
 		Stereotype stereo = profile.getOwnedStereotype("Stereo1");
-		Class class1 = (Class)nested.getOwnedType("Class1");
-		assertThat(class1.getValue(stereo, "tag"), is((Object)"new version"));
-		assertThat(class1.getValue(stereo, "reportable"), is((Object)true));
+		Class class1 = (Class) nested.getOwnedType("Class1");
+		assertThat(class1.getValue(stereo, "tag"), is((Object) "new version"));
+		assertThat(class1.getValue(stereo, "reportable"), is((Object) true));
 
 		nested = model.getNestedPackage("Package3");
 		profile = nested.getAppliedProfile("Profile::Nested1");
@@ -135,9 +136,61 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 
 		// Verify the stereotype instance that was migrated
 		stereo = profile.getOwnedStereotype("Stereo1");
-		Class class4 = (Class)nested.getNestedPackage("p1").getOwnedType("Class4");
-		assertThat(class4.getValue(stereo, "tag"), is((Object)"deeply nested"));
-		assertThat(class4.getValue(stereo, "reportable"), is((Object)true));
+		Class class4 = (Class) nested.getNestedPackage("p1").getOwnedType("Class4");
+		assertThat(class4.getValue(stereo, "tag"), is((Object) "deeply nested"));
+		assertThat(class4.getValue(stereo, "reportable"), is((Object) true));
+	}
+
+	/**
+	 * Tests that a scenario involving well-formed stereotypes contained in a simple package nested in a profile
+	 * does not trigger the repair function.
+	 * 
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=436666
+	 */
+	@Test
+	@PluginResource("/resources/regression/bug436666/model2.uml")
+	public void nestedPackageInProfileIsOK_bug436666() {
+		assertThat("Should not have found zombie stereotypes", zombies, nullValue());
+	}
+
+	/**
+	 * Tests that a scenario involving stereotypes from a nested EPackage gone AWOL, which EPackage is defined by a nested
+	 * simple package in the UML profile, is correctly repaired.
+	 * 
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=436666
+	 */
+	@Test
+	@PluginResource("/resources/regression/bug436666/model2-missing-schemalocation.uml")
+	public void nestedPackageSchemaMissing_bug436666() {
+		EPackage schema = getOnlyZombieSchema();
+		IRepairAction action = zombies.getSuggestedRepairAction(schema);
+		assertThat("Wrong suggested repair action", action.kind(), is(IRepairAction.Kind.APPLY_LATEST_PROFILE_DEFINITION));
+
+		repair(schema, action);
+
+		Profile profile = model.getAppliedProfile("Profile");
+		Package nested = profile.getNestedPackage("Package1");
+
+		// Verify the stereotype instances that were repaired
+		Class class1 = (Class) model.getOwnedType("Class1");
+		Stereotype stereo1 = nested.getOwnedStereotype("Stereotype1");
+		Stereotype stereo2 = nested.getOwnedStereotype("Stereotype2");
+		assertThat(class1.isStereotypeApplied(stereo1), is(true));
+		assertThat(class1.getValue(stereo1, "tag1"), is((Object) "value for tag1 from nested package"));
+		assertThat(class1.isStereotypeApplied(stereo2), is(true));
+		assertThat(class1.getValue(stereo2, "tag2"), is((Object) true));
+	}
+
+	/**
+	 * Tests that a scenario involving non-UML root elements that are recognizably not stereotype
+	 * applications do not trigger the repair function.
+	 * 
+	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=436666
+	 */
+	@Test
+	@PluginResource("/resources/regression/bug436666/model-with-stylesheet.uml")
+	public void nonStereotypeApplicationsAreOK_bug436666() {
+		assertThat("Should not have found zombie stereotypes", zombies, nullValue());
 	}
 
 	//
@@ -148,6 +201,19 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 	public void createFixture() throws Exception {
 		model = modelSet.getModel();
 
+		if (modelSet.getModelResourceURI().toString().contains("model-with-stylesheet")) {
+			createSimpleFixture();
+		} else if (modelSet.getModelResourceURI().toString().contains("bug436666")) {
+			createBug436666Fixture();
+		} else {
+			createDefaultFixture();
+		}
+
+		fixture.start(modelSet.getResourceSet());
+		houseKeeper.setField("zombies", fixture.getZombieStereotypes(modelSet.getModelResource(), modelSet.getModel()));
+	}
+
+	protected void createDefaultFixture() {
 		final Profile rootProfile = model.getAppliedProfile("Profile");
 		final Profile nested1 = model.getNestedPackage("Package1").getAppliedProfile("Profile::Nested1");
 		final Profile nested2 = model.getNestedPackage("Package2").getAppliedProfile("Profile::Nested2");
@@ -159,21 +225,43 @@ public class StereotypeRepairRegressionTest extends AbstractPapyrusTest {
 				Profile result = null;
 
 				// Check starts-with to account for _1, _2, etc. suffixes
-				if(input.getNsPrefix().startsWith("Nested2")) {
+				if (input.getNsPrefix().startsWith("Nested2")) {
 					result = nested2;
-				} else if(input.getNsPrefix().startsWith("Nested1")) {
+				} else if (input.getNsPrefix().startsWith("Nested1")) {
 					result = nested1;
+				} else if (input.getNsPrefix().startsWith("Profile")) {
+					result = rootProfile;
 				}
-				if(input.getNsPrefix().startsWith("Profile")) {
+
+				return result;
+			}
+		}), "dispose", modelSet.getResourceSet());
+	}
+
+	protected void createBug436666Fixture() {
+		final Profile rootProfile = model.getAppliedProfile("Profile");
+		final Profile nestedProfile = model.getAppliedProfile("Profile::Profile1");
+
+		fixture = houseKeeper.cleanUpLater(new StereotypeApplicationRepairSnippet(new Function<EPackage, Profile>() {
+
+			@Override
+			public Profile apply(EPackage input) {
+				Profile result = null;
+
+				// Check starts-with to account for _1, _2, etc. suffixes
+				if (input.getNsPrefix().startsWith("Profile1")) {
+					result = nestedProfile;
+				} else if (input.getNsPrefix().startsWith("Profile")) {
 					result = rootProfile;
 				}
 
 				return result;
 			}
 		}), "dispose", modelSet.getResourceSet());
+	}
 
-		fixture.start(modelSet.getResourceSet());
-		houseKeeper.setField("zombies", fixture.getZombieStereotypes(modelSet.getModelResource(), modelSet.getModel()));
+	protected void createSimpleFixture() {
+		fixture = houseKeeper.cleanUpLater(new StereotypeApplicationRepairSnippet(Functions.constant((Profile) null)), "dispose", modelSet.getResourceSet());
 	}
 
 	void repair(final EPackage schema, final IRepairAction action) {
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
index 3330da34318..40de5d04a32 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.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.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.service.types.tests.creation,
  org.eclipse.papyrus.uml.service.types.tests.deletion,
  org.eclipse.papyrus.uml.service.types.tests.registry,
@@ -9,7 +9,7 @@ Export-Package: org.eclipse.papyrus.uml.service.types.tests.creation,
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.papyrus.uml.service.types;bundle-version="1
  .0.0"
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml
index d54c280818a..bef9f01d6d1 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.service.types.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
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 9329dda7362..4023d43b30a 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
@@ -1,24 +1,24 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.tools.tests,
  org.eclipse.papyrus.uml.tools.tests.tests
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: UML Tools Tests
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.tools.tests.Activator
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml
index 239e2109db9..0feac070d2e 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.tools.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF
index c13a461d9b7..3925358a073 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.uml.tools.utils.tests,
  org.eclipse.papyrus.uml.tools.utils.tests.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
index 6d748ddec6d..18fed788d69 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.uml.tools.utils.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/resources/substereotypes.uml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/resources/substereotypes.uml
new file mode 100644
index 00000000000..caa87d4166e
--- /dev/null
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/resources/substereotypes.uml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Blocks="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" xmlns:Constraints="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">
+  <uml:Model xmi:id="_AoJTMDzaEeSHN-lZqG0I4Q" name="SysMLmodel">
+    <packagedElement xmi:type="uml:Class" xmi:id="_DFCMYDzaEeSHN-lZqG0I4Q" name="Block1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_DvCLoDzaEeSHN-lZqG0I4Q" name="Block2" visibility="protected" isLeaf="true"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_oDYugDzaEeSHN-lZqG0I4Q" name="Requirement1"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_ohXD8DzaEeSHN-lZqG0I4Q" name="Requirement2" isAbstract="true"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="__vZEQDzvEeS4QYEJWAn0aQ" name="ConstraintBlock1"/>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A43PwDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A466IDzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A4-kgDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A4-kgTzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//modelelements"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5EEEDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5EEETzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5ErIDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5FSMDzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5F5QDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5F5QTzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5GgUDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5GgUTzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//activities"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5HHYDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5HucDzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5IVgDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5I8kDzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5JjoDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5JjoTzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//interactions"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5KKsDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5KKsTzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//statemachines"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_A5KxwDzaEeSHN-lZqG0I4Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A5LY0DzaEeSHN-lZqG0I4Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//usecases"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+  </uml:Model>
+  <Blocks:Block xmi:id="_DFITADzaEeSHN-lZqG0I4Q" isEncapsulated="true" base_Class="_DFCMYDzaEeSHN-lZqG0I4Q"/>
+  <Blocks:Block xmi:id="_DvDZwDzaEeSHN-lZqG0I4Q" base_Class="_DvCLoDzaEeSHN-lZqG0I4Q"/>
+  <Requirements:Requirement xmi:id="_oESGYDzaEeSHN-lZqG0I4Q" text="This is required" id="r1" base_Class="_oDYugDzaEeSHN-lZqG0I4Q"/>
+  <Requirements:Requirement xmi:id="_ohpX0DzaEeSHN-lZqG0I4Q" text="that is required" id="r2" base_Class="_ohXD8DzaEeSHN-lZqG0I4Q"/>
+  <Constraints:ConstraintBlock xmi:id="__vmfoDzvEeS4QYEJWAn0aQ" isEncapsulated="true" base_Class="__vZEQDzvEeS4QYEJWAn0aQ"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java
index 6c993ee5752..2d6b9f10444 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/AllTests.java
@@ -9,6 +9,7 @@
  * Contributors:
  *  Benoit Maggi  benoit.maggi@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - bug 440263
+ *  Christian W. Damus (CEA) - bug 444092
  *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.tools.utils.tests.tests;
@@ -19,9 +20,9 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ NameResolutionHelperTest.class, NamedElementUtilTest.class
+@SuiteClasses({ NameResolutionHelperTest.class, NamedElementUtilTest.class, UMLUtilTest.class
 
 })
 public class AllTests {
-	//Test suite
+	// Test suite
 }
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/UMLUtilTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/UMLUtilTest.java
new file mode 100644
index 00000000000..9b40a311a9a
--- /dev/null
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/src/org/eclipse/papyrus/uml/tools/utils/tests/tests/UMLUtilTest.java
@@ -0,0 +1,123 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.tools.utils.tests.tests;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.junit.utils.rules.ResourceSetFixture;
+import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Stereotype;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test cases for the {@link UMLUtil} class.
+ */
+public class UMLUtilTest extends AbstractPapyrusTest {
+	static final String BLOCK = "SysML::Blocks::Block";
+	static final String CONSTRAINT_BLOCK = "SysML::Constraints::ConstraintBlock";
+
+	@Rule
+	public final HouseKeeper houseKeeper = new HouseKeeper();
+
+	@Rule
+	public final ResourceSetFixture model = new ResourceSetFixture();
+
+	private Class block1;
+
+	private Class block2;
+
+	private Class constraintblock1;
+
+	private Stereotype block;
+
+	private Stereotype constraintBlock;
+
+	public UMLUtilTest() {
+		super();
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_strict_notApplicable() {
+		assertThat(UMLUtil.getApplicableStereotype(model.getModel(), BLOCK, true), nullValue());
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_strict_applicable() {
+		assertThat(UMLUtil.getApplicableStereotype(block1, BLOCK, true), is(block));
+		assertThat(UMLUtil.getApplicableStereotype(constraintblock1, CONSTRAINT_BLOCK, true), is(constraintBlock));
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_notStrict_notApplicable() {
+		assertThat(UMLUtil.getApplicableStereotype(model.getModel(), BLOCK, false), nullValue());
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetApplicableStereotype_notStrict_applicable() {
+		assertThat(UMLUtil.getApplicableStereotype(block1, BLOCK, false), is(block));
+		assertThat(UMLUtil.getApplicableStereotype(block1, CONSTRAINT_BLOCK, false), is(constraintBlock));
+		assertThat(UMLUtil.getApplicableStereotype(constraintblock1, BLOCK, false), is(block));
+		assertThat(UMLUtil.getApplicableStereotype(constraintblock1, CONSTRAINT_BLOCK, false), is(constraintBlock));
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetAppliedSubstereotype_notApplied() {
+		assertThat(UMLUtil.getAppliedSubstereotype(model.getModel(), block), nullValue());
+		assertThat(UMLUtil.getAppliedSubstereotype(block2, constraintBlock), nullValue());
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetAppliedSubstereotype_applied() {
+		assertThat(UMLUtil.getAppliedSubstereotype(block2, block), is(block));
+		assertThat(UMLUtil.getAppliedSubstereotype(constraintblock1, constraintBlock), is(constraintBlock));
+		assertThat(UMLUtil.getAppliedSubstereotype(constraintblock1, block), is(constraintBlock));
+	}
+
+	@Test
+	@PluginResource("/resources/substereotypes.uml")
+	public void testGetAppliedSuperstereotype() {
+		assertThat(UMLUtil.getAppliedSuperstereotype(block2, BLOCK), is(block));
+		assertThat(UMLUtil.getAppliedSuperstereotype(block2, CONSTRAINT_BLOCK), nullValue());
+		assertThat(UMLUtil.getAppliedSuperstereotype(constraintblock1, BLOCK), is(block));
+		assertThat(UMLUtil.getAppliedSuperstereotype(constraintblock1, CONSTRAINT_BLOCK), is(constraintBlock));
+	}
+
+	//
+	// Test framework
+	//
+
+	@Before
+	public void setupModel() {
+		block1 = (Class) model.getModel().getOwnedType("Block1");
+		block2 = (Class) model.getModel().getOwnedType("Block2");
+		constraintblock1 = (Class) model.getModel().getOwnedType("ConstraintBlock1");
+
+		block = model.getModel().getAppliedProfile("SysML::Blocks").getOwnedStereotype("Block");
+		constraintBlock = model.getModel().getAppliedProfile("SysML::Constraints").getOwnedStereotype("ConstraintBlock");
+	}
+}
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
index 5a21b4f4c7a..8c2a7c30795 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -6,26 +6,26 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.navigator,
  org.eclipse.uml2.uml;bundle-version="4.0.0",
  org.eclipse.gmf.runtime.notation,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.1",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.1",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.0.1",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.util.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrus.views.modelexplorer.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml
index e397722f9a0..45289a0aa3c 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
   <artifactId>org.eclipse.papyrus.views.modelexplorer.tests</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>