diff --git a/core/org.eclipse.papyrus.sysml14.edit.tests/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.edit.tests/META-INF/MANIFEST.MF
index f0a03a0..a0fd7d1 100644
--- a/core/org.eclipse.papyrus.sysml14.edit.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.edit.tests/META-INF/MANIFEST.MF
@@ -4,12 +4,11 @@
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.edit.tests
 Export-Package: org.eclipse.papyrus.sysml14.edit.tests.requirements.provider
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Description: %Bundle-Description
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.edit.tests
- 
diff --git a/core/org.eclipse.papyrus.sysml14.edit.tests/pom.xml b/core/org.eclipse.papyrus.sysml14.edit.tests/pom.xml
index 3ee749d..1c2046e 100644
--- a/core/org.eclipse.papyrus.sysml14.edit.tests/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14.edit.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.edit.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
index 01694e1..93f5a64 100644
--- a/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.edit;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.sysml14.provider.SysMLEditPlugin$Implementation
 Bundle-Vendor: %Bundle-Vendor
@@ -18,15 +18,15 @@
  org.eclipse.papyrus.sysml14.portsandflows.provider,
  org.eclipse.papyrus.sysml14.provider,
  org.eclipse.papyrus.sysml14.requirements.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.11.1,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.11.2,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.100,2.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.edit;bundle-version="[5.1.1,6.0.0)";visibility:=reexport,
- org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
+ org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.common.edit;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.uml2.uml.edit;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.edit
diff --git a/core/org.eclipse.papyrus.sysml14.edit/pom.xml b/core/org.eclipse.papyrus.sysml14.edit/pom.xml
index f3021bc..33df3ce 100644
--- a/core/org.eclipse.papyrus.sysml14.edit/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14.edit/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
index eb9a387..8e9ba4a 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
@@ -5,18 +5,16 @@
  org.eclipse.papyrus.sysml14.service.types.tests.command,
  org.eclipse.papyrus.sysml14.service.types.tests.util
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.service.types.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)"
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.service.types.tests
-
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/pom.xml b/core/org.eclipse.papyrus.sysml14.service.types.tests/pom.xml
index 012a1cf..efb4393 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.service.types.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
index 3aa40f4..2b23960 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
@@ -2,17 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.service.types;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.service.types.Activator
-Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/pom.xml b/core/org.eclipse.papyrus.sysml14.service.types/pom.xml
index 3196661..e5fd150 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14.service.types/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.service.types</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF
index deabb12..082e657 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF
@@ -12,13 +12,12 @@
  org.eclipse.papyrus.sysml14.tests.resources,
  org.eclipse.papyrus.sysml14.tests.util
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Description: %Bundle-Description
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.tests
- 
diff --git a/core/org.eclipse.papyrus.sysml14.tests/pom.xml b/core/org.eclipse.papyrus.sysml14.tests/pom.xml
index cf9f346..8869bb1 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.validation.tests/META-INF/MANIFEST.MF
index 6bd518a..fa37c07 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.validation.tests
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.papyrus.sysml14.validation
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.papyrus.uml.service.validation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)"
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.service.validation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Export-Package: org.eclipse.papyrus.sysml14.validation.tests.ocl,
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/pom.xml b/core/org.eclipse.papyrus.sysml14.validation.tests/pom.xml
index 0bcd88a..d7880c3 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.validation.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF
index 0fa1e80..6cd6100 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF
@@ -3,24 +3,20 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.validation;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.validation.Activator
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.13.1,4.0.0)",
- org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.ocl.pivot;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ocl.pivot.uml;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ocl.uml;bundle-version="[5.2.0,6.0.0)",
- org.eclipse.ocl.ecore;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.uml2.uml.validation;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)", 
- org.eclipse.papyrus.uml.oclconstraintevaluation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.xtext.integration.validation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.9.1,2.0.0)",
+ org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.equinox.registry;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.papyrus.sysml14.validation/pom.xml b/core/org.eclipse.papyrus.sysml14.validation/pom.xml
index 434b6b4..059b1e2 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14.validation/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.validation</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/quickfix/ConsumerElementMarkerResolution.java b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/quickfix/ConsumerElementMarkerResolution.java
index 6da887c..d57629f 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/quickfix/ConsumerElementMarkerResolution.java
+++ b/core/org.eclipse.papyrus.sysml14.validation/src/org/eclipse/papyrus/sysml14/validation/quickfix/ConsumerElementMarkerResolution.java
@@ -21,6 +21,7 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
diff --git a/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
index 6a6672b..558c683 100644
--- a/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
@@ -2,15 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.sysml14.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.11.2,3.0.0)",
- org.eclipse.uml2.uml.profile.standard;visibility:=reexport;bundle-version="[1.0.100,2.0.0)",
- org.eclipse.uml2.types;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.uml;visibility:=reexport;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.uml2.uml.resources;bundle-version="[5.1.0,6.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
+ org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.sysml14,
  org.eclipse.papyrus.sysml14.activities,
diff --git a/core/org.eclipse.papyrus.sysml14/pom.xml b/core/org.eclipse.papyrus.sysml14/pom.xml
index 64c292f..9cf13b5 100644
--- a/core/org.eclipse.papyrus.sysml14/pom.xml
+++ b/core/org.eclipse.papyrus.sysml14/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index 05cc4d2..7f82c34 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.parent</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>	
 	<artifactId>org.eclipse.papyrus.sysml14.core</artifactId>
 	<packaging>pom</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
index ee29e15..df6a437 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,13 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.blockdefinition;bundle-version="1.0.0"
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)"
+Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests
 Export-Package: org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests.resources
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/pom.xml
index 69b65b2..588bd11 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
index 8a7f06a..001cae2 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -3,20 +3,21 @@
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.blockdefinition;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.blockdefinition.Activator
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
+ org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.jface;bundle-version="[3.22.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.sysml14.diagram.common;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BuddyPolicy: dependent
 Bundle-ActivationPolicy: lazy
@@ -25,4 +26,3 @@
  org.eclipse.papyrus.sysml14.diagram.blockdefinition.internal.factory;x-internal:=true,
  org.eclipse.papyrus.sysml14.diagram.blockdefinition.provider
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.blockdefinition
- 
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/pom.xml
index 7b619f1..a71af93 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>	
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.blockdefinition</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
index 50b3b40..94880da 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
@@ -1,23 +1,19 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0"
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.common.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"
+Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Export-Package: org.eclipse.papyrus.sysml14.diagram.common.tests.resources,
  org.eclipse.papyrus.sysml14.diagram.common.tests.util
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.common.tests
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/pom.xml
index 7470242..91ee765 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.common.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
index eeab3b4..c3f160e 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
@@ -2,38 +2,36 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.common;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.common.Activator
-Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", 
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0]",
- org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.12.0,1.0.0)",
+ org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[5.0.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.papyrus.sysml14.diagram.common;uses:="org.eclipse.ui.plugin,org.osgi.framework",
+Export-Package: org.eclipse.papyrus.sysml14.diagram.common;uses:="org.eclipse.ui.plugin,
+ org.osgi.framework",
  org.eclipse.papyrus.sysml14.diagram.common.advices,
  org.eclipse.papyrus.sysml14.diagram.common.command,
  org.eclipse.papyrus.sysml14.diagram.common.css.dom,
@@ -41,26 +39,22 @@
  org.eclipse.papyrus.sysml14.diagram.common.dialog,
  org.eclipse.papyrus.sysml14.diagram.common.edit.parts,
  org.eclipse.papyrus.sysml14.diagram.common.figure,
- org.eclipse.papyrus.sysml14.diagram.common.internal.command;
-  x-friends:="org.eclipse.papyrus.sysml14.diagram.internalblock,
-   org.eclipse.papyrus.sysml14.diagram.blockdefinition,
-   org.eclipse.papyrus.sysml14.diagram.parametric,
-   org.eclipse.papyrus.sysml14.diagram.requirement",
- org.eclipse.papyrus.sysml14.diagram.common.internal.dialog;
-  x-friends:="org.eclipse.papyrus.sysml14.diagram.internalblock,
-   org.eclipse.papyrus.sysml14.diagram.blockdefinition,
-   org.eclipse.papyrus.sysml14.diagram.parametric,
-   org.eclipse.papyrus.sysml14.diagram.requirement",
- org.eclipse.papyrus.sysml14.diagram.common.internal.factory;
-  x-friends:="org.eclipse.papyrus.sysml14.diagram.internalblock,
-   org.eclipse.papyrus.sysml14.diagram.blockdefinition,
-   org.eclipse.papyrus.sysml14.diagram.parametric,
-   org.eclipse.papyrus.sysml14.diagram.requirement",
- org.eclipse.papyrus.sysml14.diagram.common.internal.factory.util;
-  x-friends:="org.eclipse.papyrus.sysml14.diagram.blockdefinition,
-   org.eclipse.papyrus.sysml14.diagram.internalblock,
-   org.eclipse.papyrus.sysml14.diagram.parametric,
-   org.eclipse.papyrus.sysml14.diagram.requirement",
+ org.eclipse.papyrus.sysml14.diagram.common.internal.command; x-friends:="org.eclipse.papyrus.sysml14.diagram.internalblock,
+ org.eclipse.papyrus.sysml14.diagram.blockdefinition,
+ org.eclipse.papyrus.sysml14.diagram.parametric,
+ org.eclipse.papyrus.sysml14.diagram.requirement",
+ org.eclipse.papyrus.sysml14.diagram.common.internal.dialog; x-friends:="org.eclipse.papyrus.sysml14.diagram.internalblock,
+ org.eclipse.papyrus.sysml14.diagram.blockdefinition,
+ org.eclipse.papyrus.sysml14.diagram.parametric,
+ org.eclipse.papyrus.sysml14.diagram.requirement",
+ org.eclipse.papyrus.sysml14.diagram.common.internal.factory; x-friends:="org.eclipse.papyrus.sysml14.diagram.internalblock,
+ org.eclipse.papyrus.sysml14.diagram.blockdefinition,
+ org.eclipse.papyrus.sysml14.diagram.parametric,
+ org.eclipse.papyrus.sysml14.diagram.requirement",
+ org.eclipse.papyrus.sysml14.diagram.common.internal.factory.util; x-friends:="org.eclipse.papyrus.sysml14.diagram.blockdefinition,
+ org.eclipse.papyrus.sysml14.diagram.internalblock,
+ org.eclipse.papyrus.sysml14.diagram.parametric,
+ org.eclipse.papyrus.sysml14.diagram.requirement",
  org.eclipse.papyrus.sysml14.diagram.common.internal.provider;x-internal:=true,
  org.eclipse.papyrus.sysml14.diagram.common.provider,
  org.eclipse.papyrus.sysml14.diagram.common.util
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.common/pom.xml
index bcf083e..4992d9d 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>	
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF
index 4336580..5e0370e 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,13 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.internalblock;bundle-version="1.0.0"
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.internalblock.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)"
+Require-Bundle: org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.internalblock.tests
 Export-Package: org.eclipse.papyrus.sysml14.diagram.internalblock.tests.resources
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/pom.xml
index c932451..26129e6 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.internalblock.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
index 4a61a22..950e0ec 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
@@ -3,19 +3,17 @@
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.internalblock;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.internalblock.Activator
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.sysml14.diagram.common;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.sysml14.diagram.internalblock,
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/pom.xml
index 5aa33c8..489c0c3 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>	
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.internalblock</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF
index 01736fd..2ce4f1a 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,13 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.parametric;bundle-version="1.0.0"
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.parametric.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.parametric.tests
 Export-Package: org.eclipse.papyrus.sysml14.diagram.parametric.tests.resources
-
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/pom.xml
index 931ef1f..23325ba 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.parametric.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
index 8f3c215..66e78d5 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
@@ -3,24 +3,22 @@
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.parametric;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.parametric.Activator
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.equinox.registry;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.sysml14.diagram.common;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.sysml14.diagram.parametric,
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/pom.xml
index a0cec56..cc69608 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>	
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.parametric</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/META-INF/MANIFEST.MF
index 6a21413..e12d070 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)"
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
@@ -10,4 +11,3 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.requirement.tests
 Export-Package: org.eclipse.papyrus.sysml14.diagram.requirement.tests.resources
-
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/pom.xml
index fb56ee7..098fa69 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.requirement.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
index 6724e2b..64105f5 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
@@ -3,16 +3,15 @@
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.requirement;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.requirement.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.requirement
 Export-Package: org.eclipse.papyrus.sysml14.diagram.requirement
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.22.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)"
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/pom.xml b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/pom.xml
index 9e4f356..ef8a64d 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/pom.xml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>	
 		<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.diagram.requirement</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/diagram/pom.xml b/diagram/pom.xml
index 9227b04..e4714f0 100644
--- a/diagram/pom.xml
+++ b/diagram/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.parent</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>	
 	<artifactId>org.eclipse.papyrus.sysml14.diagram</artifactId>
 	<packaging>pom</packaging>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF
index 171587a..16847fa 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,17 @@
 Manifest-Version: 1.0
 Fragment-Host: org.eclipse.papyrus.sysml14.architecture;bundle-version="1.0.0"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Description: %Bundle-Description
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.architecture.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="4.0.0"
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.architecture.tests
 Export-Package: org.eclipse.papyrus.sysml14.architecture.tests.resources,
  org.eclipse.papyrus.sysml14.architecture.tests.util
- 
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture.tests/pom.xml b/gui/org.eclipse.papyrus.sysml14.architecture.tests/pom.xml
index cb5b230..d37e6cf 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture.tests/pom.xml
+++ b/gui/org.eclipse.papyrus.sysml14.architecture.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrus.sysml</groupId>
     <artifactId>org.eclipse.papyrus.sysml14.gui</artifactId>
-    <version>1.3.400-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.papyrus.sysml14.architecture.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF
index 81f51af..079ed21 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF
@@ -2,43 +2,42 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.architecture;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.sysml14.nattable.requirement;bundle-version="1.0.0",
+Require-Bundle: org.eclipse.core.commands;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="3.0.0",
- org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.edit;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.blockdefinition;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.internalblock;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.parametric;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.requirement;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.allocation;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.common;bundle-version="1.0.0", 
- org.eclipse.papyrus.sysml14.nattable.ui;bundle-version="1.0.0"
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable.common;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.diagram.blockdefinition;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.diagram.internalblock;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.diagram.parametric;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.diagram.requirement;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.nattable.allocation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.nattable.requirement;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Export-Package: org.eclipse.papyrus.sysml14.architecture,
  org.eclipse.papyrus.sysml14.architecture.internal;x-internal:=true,
  org.eclipse.papyrus.sysml14.architecture.internal.migration;x-internal:=true,
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/pom.xml b/gui/org.eclipse.papyrus.sysml14.architecture/pom.xml
index a83a69a..cb1d7dd 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/pom.xml
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.gui</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.architecture</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
index eb3cd89..d468c7f 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
@@ -1,47 +1,12 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.5.200,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.300,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.5.0,2.0.0)",
- org.junit;bundle-version="[4.10.0,5.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.edit;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.blockdefinition;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.internalblock;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.parametric;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.diagram.requirement;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.common;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.allocation;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.requirement;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.ui;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
@@ -51,4 +16,3 @@
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.ui.tests
 Export-Package: org.eclipse.papyrus.sysml14.ui.tests.images,
  org.eclipse.papyrus.sysml14.ui.tests.resources
-
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/pom.xml b/gui/org.eclipse.papyrus.sysml14.ui.tests/pom.xml
index 21f1626..356b102 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/pom.xml
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrus.sysml</groupId>
     <artifactId>org.eclipse.papyrus.sysml14.gui</artifactId>
-    <version>1.3.400-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.papyrus.sysml14.ui.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
index f4f258c..4b4b071 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
@@ -2,36 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.ui;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.sysml14.ui.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.gef;bundle-version="[3.10.0,4.0.0]",
- org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.filters;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.uml.modelexplorer;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.templaterepository;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.architecture;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.sysml14.ui,
  org.eclipse.papyrus.sysml14.ui.constraints,
@@ -43,3 +16,35 @@
 Bundle-Description: %Bundle-Description
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.ui
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.osgi;bundle-version="[3.16.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.properties;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.papyrus.infra.filters;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.filters;bundle-version="[2.0.0,3.0.0)"
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/pom.xml b/gui/org.eclipse.papyrus.sysml14.ui/pom.xml
index 753a23c..9befba6 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/pom.xml
+++ b/gui/org.eclipse.papyrus.sysml14.ui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.gui</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/gui/pom.xml b/gui/pom.xml
index 1c51670..3e22514 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.parent</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>	
 	<artifactId>org.eclipse.papyrus.sysml14.gui</artifactId>
 	<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index a133228..78311d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.eclipse.papyrus.sysml</groupId>
 	<artifactId>org.eclipse.papyrus.sysml14.parent</artifactId>
-	<version>1.3.400-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>SysML</name>
 	<description>A Papyrus DSML for the SysML 1.4 OMG norm</description>
@@ -27,6 +27,7 @@
 		<module>gui</module>
 		<module>releng</module>
 	</modules>
+
 	<properties>
 		<component.shortname>sysml</component.shortname>
 		<component.fullartifactId>org.eclipse.papyrus.sysml14</component.fullartifactId>
@@ -36,9 +37,11 @@
 		<component.rcp.name>org.eclipse.papyrus.sysml14.rcp</component.rcp.name>
 		<component.apibaseline.url>https://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2019-06/1.3.2_papyrus-sysml14-master_48/</component.apibaseline.url>
 		<component.servicetype>org.eclipse.papyrus.sysml14.service.types</component.servicetype>
-		<eclipse.targetrelease>2020-06</eclipse.targetrelease>
+		<eclipse.targetrelease>2020-12</eclipse.targetrelease>
 		<target.version>${project.version}</target.version>
 		<sonar.exclusions>**/src-gen/**</sonar.exclusions>
+		<tycho-version>2.0.0</tycho-version>
+		<jboss.utils.version>1.7.0</jboss.utils.version>
 
 		<!-- Override Components properties -->
 		<rcptt-runner-version>2.3.0</rcptt-runner-version>
@@ -141,12 +144,13 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
 				<configuration>
 					<failIfNoTests>false</failIfNoTests>
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>true</useUIThread>
 					<!-- <showEclipseLog>true</showEclipseLog> -->
-					<!-- <testFailureIgnore>true</testFailureIgnore> -->
+					<testFailureIgnore>true</testFailureIgnore>
 					<jvmArgs>
 						<args>${ui.test.vmargs}</args>
 					</jvmArgs>
@@ -177,4 +181,4 @@
 		</plugins>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.eclipse.papyrus.sysml14.feature/feature.xml b/releng/org.eclipse.papyrus.sysml14.feature/feature.xml
index 714e3b4..dd18aa6 100644
--- a/releng/org.eclipse.papyrus.sysml14.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.sysml14.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.sysml14.feature"
       label="%featureName"
-      version="1.3.400.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.papyrus.sysml14.ui"
       license-feature="org.eclipse.license"
@@ -23,7 +23,7 @@
    </copyright>
 
    <requires>
-      <import feature="org.eclipse.papyrus.sdk.feature" version="4.0.0" match="compatible"/>
+      <import feature="org.eclipse.papyrus.sdk.feature" version="5.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/releng/org.eclipse.papyrus.sysml14.feature/pom.xml b/releng/org.eclipse.papyrus.sysml14.feature/pom.xml
index 5b2dc40..1758f45 100644
--- a/releng/org.eclipse.papyrus.sysml14.feature/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.releng</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/releng/org.eclipse.papyrus.sysml14.p2/category.xml b/releng/org.eclipse.papyrus.sysml14.p2/category.xml
index 7671580..5829db8 100644
--- a/releng/org.eclipse.papyrus.sysml14.p2/category.xml
+++ b/releng/org.eclipse.papyrus.sysml14.p2/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.papyrus.sysml14.feature_1.3.400.qualifier.jar" id="org.eclipse.papyrus.sysml14.feature" version="1.3.400.qualifier">
+   <feature url="features/org.eclipse.papyrus.sysml14.feature_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml14.feature" version="2.0.0.qualifier">
       <category name="org.eclipse.papyrus.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.sysml14.feature.source_1.3.400.qualifier.jar" id="org.eclipse.papyrus.sysml14.feature.source" version="1.3.400.qualifier">
+   <feature url="features/org.eclipse.papyrus.sysml14.feature.source_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml14.feature.source" version="2.0.0.qualifier">
       <category name="org.eclipse.papyrus.category"/>
    </feature>
    <category-def name="org.eclipse.papyrus.category" label="Papyrus SysML Category">
@@ -11,5 +11,5 @@
          Papyrus SysML Category
       </description>
    </category-def>
-   <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06/" enabled="true" />
+   <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-12/" enabled="true" />
 </site>
diff --git a/releng/org.eclipse.papyrus.sysml14.p2/pom.xml b/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
index 8dd44ba..f44426b 100644
--- a/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.releng</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.p2</artifactId>
 	<packaging>eclipse-repository</packaging>
@@ -16,6 +16,7 @@
 				<!-- https://github.com/jbosstools/jbosstools-maven-plugins/wiki -->
 				<groupId>org.jboss.tools.tycho-plugins</groupId>
 				<artifactId>repository-utils</artifactId>
+				<version>${jboss.utils.version}</version>
 				<executions>
 					<execution>
 						<id>generate-facade</id>
diff --git a/releng/org.eclipse.papyrus.sysml14.product/category.xml b/releng/org.eclipse.papyrus.sysml14.product/category.xml
index 39ee940..b7433c7 100644
--- a/releng/org.eclipse.papyrus.sysml14.product/category.xml
+++ b/releng/org.eclipse.papyrus.sysml14.product/category.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.papyrus.sysml14.feature_1.3.400.qualifier.jar" id="org.eclipse.papyrus.sysml14.feature" version="1.3.400.qualifier"/>
+   <feature url="features/org.eclipse.papyrus.sysml14.feature_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml14.feature" version="2.0.0.qualifier"/>
 </site>
diff --git a/releng/org.eclipse.papyrus.sysml14.product/pom.xml b/releng/org.eclipse.papyrus.sysml14.product/pom.xml
index 0c3514d..e8944c7 100644
--- a/releng/org.eclipse.papyrus.sysml14.product/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.product/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.releng</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.product</artifactId>
 	<packaging>eclipse-repository</packaging>
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.xml b/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.xml
index 64fd5f8..312c63c 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.xml
@@ -2,13 +2,13 @@
 <feature
       id="org.eclipse.papyrus.sysml14.rcp.feature"
       label="%featureName"
-      version="1.3.400.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
 
    <description url="https://eclipse.org/papyrus/">
-      This feature defines the Rich Client Platform dedicated to SysML 1.4 
+      This feature defines the Rich Client Platform dedicated to SysML 1.4
    </description>
 
    <copyright url="https://www.eclipse.org/legal/epl-2.0/">
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp.feature/pom.xml b/releng/org.eclipse.papyrus.sysml14.rcp.feature/pom.xml
index 225c49b..cdfdece 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcp.feature/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.rcp.feature/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.releng</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.rcp.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF b/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF
index 5a5225e..757cc2a 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.rcp;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Description: %Bundle-Description
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.e4.ui.css.swt.theme;bundle-version="[0.10.0,1.0.0)"
+Require-Bundle: org.eclipse.e4.ui.css.swt.theme;bundle-version="[0.12.0,1.0.0)"
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.rcp
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp/pom.xml b/releng/org.eclipse.papyrus.sysml14.rcp/pom.xml
index 9c943e7..833bc72 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcp/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.rcp/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.releng</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.rcp</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/releng/pom.xml b/releng/pom.xml
index b22b07e..d4e32a4 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.parent</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.releng</artifactId>
 	<packaging>pom</packaging>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF
index 7932ef3..1a5bfc5 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.ocl;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ocl.pivot;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.sysml14.service.types;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
@@ -31,4 +16,3 @@
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.nattable.allocation.tests
 Export-Package: org.eclipse.papyrus.sysml14.nattable.allocation.tests.resources,
  org.eclipse.papyrus.sysml14.nattable.allocation.tests.tester
-
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/pom.xml b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/pom.xml
index 77cb44b..402fdf1 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/pom.xml
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
         <groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.table</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.papyrus.sysml14.nattable.allocation.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.allocation/META-INF/MANIFEST.MF
index f0ecb4d..b3e46a5 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation/META-INF/MANIFEST.MF
@@ -1,19 +1,14 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="3.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.common;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[7.0.0,8.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.equinox.registry;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.sysml14.nattable.allocation.Activator
 Bundle-ManifestVersion: 2
@@ -22,4 +17,3 @@
 Export-Package: org.eclipse.papyrus.sysml14.nattable.allocation,
  org.eclipse.papyrus.sysml14.nattable.allocation.tester
 Automatic-Module-Name: org.eclipse.papyrus.sysml14.nattable.allocation
-
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation/pom.xml b/table/org.eclipse.papyrus.sysml14.nattable.allocation/pom.xml
index 3227698..1c5d8ad 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation/pom.xml
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.table</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.nattable.allocation</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF
index cb549b5..68c5c41 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF
@@ -3,30 +3,26 @@
  org.eclipse.papyrus.sysml14.nattable.common.manager.axis,
  org.eclipse.papyrus.sysml14.nattable.common.manager.cell,
  org.eclipse.papyrus.sysml14.nattable.common.provider
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
+Require-Bundle: ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.1,2.0.0)",
+ org.eclipse.jface;bundle-version="[3.22.0,4.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[7.0.0,8.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.nattable;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.papyrus.infra.emf.expressions;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.sysml14.nattable.common.Activator
 Bundle-ManifestVersion: 2
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.common/pom.xml b/table/org.eclipse.papyrus.sysml14.nattable.common/pom.xml
index 9a1c8b9..db412e9 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.common/pom.xml
+++ b/table/org.eclipse.papyrus.sysml14.nattable.common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.table</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.nattable.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
index 359783c..6d3ec2f 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,17 @@
 Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.ocl;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ocl.pivot;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.0.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.uml2.uml.resources;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.12.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)",
+ org.eclipse.uml2.uml.resources;bundle-version="[5.5.0,6.0.0)",
+ org.junit;bundle-version="[4.13.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.nattable.requirement.tests
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/pom.xml b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/pom.xml
index 11aa5d3..1385936 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/pom.xml
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
         <groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.table</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.papyrus.sysml14.nattable.requirement.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
index 33ba27d..db213c6 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
@@ -1,21 +1,18 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="3.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.uml.nattable.richtext;bundle-version="2.1.0",
- org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
+Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.19.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[7.0.0,8.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.sysml14;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sysml14.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.nattable;bundle-version="[6.0.0,7.0.0)",
+ org.eclipse.papyrus.uml.nattable.richtext;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.5.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.sysml14.nattable.requirement.Activator
 Bundle-ManifestVersion: 2
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/pom.xml b/table/org.eclipse.papyrus.sysml14.nattable.requirement/pom.xml
index b9e975c..38c3cf9 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/pom.xml
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.table</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.nattable.requirement</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
index a1096bf..260a931 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
@@ -3,29 +3,24 @@
  org.eclipse.papyrus.sysml14.nattable.ui.allocation.tester,
  org.eclipse.papyrus.sysml14.nattable.ui.filter,
  org.eclipse.papyrus.sysml14.nattable.ui.handlers
-Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
+Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.500,4.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable;bundle-version="[7.0.0,8.0.0)",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.sysml14.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.nattable.menu;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.sysml14.nattable.ui.Activator
 Bundle-ManifestVersion: 2
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/pom.xml b/table/org.eclipse.papyrus.sysml14.nattable.ui/pom.xml
index 2bfa11c..e236098 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/pom.xml
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.table</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.nattable.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/table/pom.xml b/table/pom.xml
index 33d2212..e56716e 100644
--- a/table/pom.xml
+++ b/table/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.parent</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>	
 	<artifactId>org.eclipse.papyrus.sysml14.table</artifactId>
 	<packaging>pom</packaging>
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/.settings/org.eclipse.core.resources.prefs b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/.settings/org.eclipse.core.resources.prefs
rename to targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/.settings/org.eclipse.core.resources.prefs
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/org.eclipse.papyrus.sysml14.targetplatform.2020-06.target b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/org.eclipse.papyrus.sysml14.targetplatform.2020-12.target
similarity index 87%
rename from targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/org.eclipse.papyrus.sysml14.targetplatform.2020-06.target
rename to targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/org.eclipse.papyrus.sysml14.targetplatform.2020-12.target
index 0c09bb7..7db8893 100755
--- a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/org.eclipse.papyrus.sysml14.targetplatform.2020-06.target
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/org.eclipse.papyrus.sysml14.targetplatform.2020-12.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus 2020-06" sequenceNumber="1595936651">
+<target name="Papyrus Sysml14 2020-12" sequenceNumber="1604940786">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -12,7 +12,7 @@
       <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
-      <repository id="eclipse-2020-06" location="http://download.eclipse.org/releases/2020-06/"/>
+      <repository id="eclipse-2020-12" location="http://download.eclipse.org/releases/2020-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/org.eclipse.papyrus.sysml14.targetplatform.2020-06.tpd b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/org.eclipse.papyrus.sysml14.targetplatform.2020-12.tpd
similarity index 78%
rename from targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/org.eclipse.papyrus.sysml14.targetplatform.2020-06.tpd
rename to targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/org.eclipse.papyrus.sysml14.targetplatform.2020-12.tpd
index 91c2cea..7836223 100755
--- a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/org.eclipse.papyrus.sysml14.targetplatform.2020-06.tpd
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/org.eclipse.papyrus.sysml14.targetplatform.2020-12.tpd
@@ -1,6 +1,6 @@
-target "Papyrus 2020-06" with source requirements
+target "Papyrus Sysml14 2020-12" with source requirements
 
-location "http://download.eclipse.org/releases/2020-06/" eclipse-2020-06 {
+location "http://download.eclipse.org/releases/2020-12/" eclipse-2020-12 {
  org.eclipse.platform.feature.group lazy
  org.eclipse.rcp.feature.group lazy
  org.eclipse.jdt.feature.group lazy
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/pom.xml b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/pom.xml
similarity index 73%
rename from targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/pom.xml
rename to targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/pom.xml
index d470e46..32acd7b 100755
--- a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-06/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2020-12/pom.xml
@@ -4,10 +4,10 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml14.targetplatform</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>	
-	<artifactId>org.eclipse.papyrus.sysml14.targetplatform.2020-06</artifactId>
+	<artifactId>org.eclipse.papyrus.sysml14.targetplatform.2020-12</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<name>org.eclipse.papyrus.sysml14.targetplatform.2020-06</name>
-	<description>This plug-in contains the target definition for Papyrus SysML in 2020-06.</description>
+	<name>org.eclipse.papyrus.sysml14.targetplatform.2020-12</name>
+	<description>This plug-in contains the target definition for Papyrus SysML in 2020-12.</description>
 </project>
\ No newline at end of file
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index fd64b23..40642cc 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<artifactId>org.eclipse.papyrus.sysml14.parent</artifactId>
-		<version>1.3.400-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml14.targetplatform</artifactId>
 	<packaging>pom</packaging>
@@ -14,7 +14,7 @@
 	<description>This module contains the different Eclipse target platform definitions.</description>
 
 	<modules>
-		<module>org.eclipse.papyrus.sysml14.targetplatform.2020-06</module>
+		<module>org.eclipse.papyrus.sysml14.targetplatform.2020-12</module>
 	</modules>
 
 </project>
\ No newline at end of file