commit d117c3f13f3b0d89b90a798218307605967c2e38
author jeremie.tatibouet <jeremie.tatibouet@cea.fr> Thu May 11 12:00:46 2017 +0200
committer jeremie.tatibouet <jeremie.tatibouet@cea.fr> Thu May 11 17:05:00 2017 +0200
tree ccd7126497956eef966d9b9e165180c4b1331ec7
parent 1da34e526e152aae23cd24702228221ec00e2d34

Migration of Moka to Eclipse Oxygen (see Bug 516492). This includes the
resolution to:
Bug 516495 - Installation of FMU examples
Bug 516499 - Simex viewpoint must rely on the new architecture framework

Change-Id: I022accf8822f880f42bed50a25260c477f04d747
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>

bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
index 4be3c35..4505696 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
  org.eclipse.papyrus.moka;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.moka.fuml;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.debug.core;bundle-version="3.10.0",
+ org.eclipse.debug.core;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.papyrus.moka.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.moka.composites;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="1.2.0",
- org.eclipse.ui.console;bundle-version="3.6.100",
- org.apache.commons.lang;bundle-version="2.6.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="[2.0.0,3.0.0)",
- org.aspectj.runtime;bundle-version="1.8.9";resolution:=optional
+ org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.6.100,4.0.0)",
+ org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
+ org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)"
 Export-Package: org.eclipse.papyrus.moka.async.fuml,
  org.eclipse.papyrus.moka.async.fuml.Semantics.Classes.Kernel,
  org.eclipse.papyrus.moka.async.fuml.Semantics.CommonBehaviors.Communications,

bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
index 987bc8c..070e470 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.composites.interfaces
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.composites.interfaces.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project

bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
index da35144..ec30526 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.fuml;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka;bundle-version="[2.0.0,3.0.0)",
- org.aspectj.runtime;bundle-version="1.8.9";resolution:=optional,
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.debug.core;bundle-version="3.10.0";resolution:=optional
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka;bundle-version="2.0.0",
+ org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)"
 Export-Package: org.eclipse.papyrus.moka.composites,
  org.eclipse.papyrus.moka.composites.Semantics.impl.Actions.CompleteActions,
  org.eclipse.papyrus.moka.composites.Semantics.impl.Actions.IntermediateActions,

bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
index fd032d0..7ccbe49 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.Semantics.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.aspectj.runtime;bundle-version="1.8.9";resolution:=optional,
- org.eclipse.equinox.registry;bundle-version="3.6.100"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)";resolution:=optional,
+ org.eclipse.equinox.registry;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.fuml.Semantics,

bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
index 992f915..4f8142b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.moka.composites.interfaces
+Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0"
 Export-Package: org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.CommonBehavior,
  org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.StateMachines,
  org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.Values

bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
index 923c949..17ee51b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
@@ -4,19 +4,19 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.statemachines;singleton:=true

 Bundle-Version: 1.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.moka.fuml.statemachines.Activator

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.uml.extensionpoints,

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.moka,

- org.eclipse.papyrus.moka.composites,

- org.eclipse.papyrus.moka.fuml,

- org.eclipse.debug.core;bundle-version="3.8.0",

- org.eclipse.papyrus.moka.ui,

- org.eclipse.papyrus.infra.core.log,

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",

+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

+ org.eclipse.papyrus.moka;bundle-version="2.0.0",

+ org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",

+ org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",

+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",

+ org.eclipse.papyrus.moka.ui;bundle-version="2.0.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="1.0.0",

- org.eclipse.papyrus.moka.fuml.interfaces,

+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0",

- org.aspectj.runtime

+ org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Bundle-ActivationPolicy: lazy

 Bundle-Vendor: Eclipse Modeling Project

bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
index 29ef147..6e4ae69 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.debug.core;bundle-version="3.10.0";resolution:=optional,
- org.apache.commons.lang;bundle-version="2.6.0",
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.papyrus.moka.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.service;bundle-version="[2.0.0,3.0.0)",
- org.aspectj.runtime;bundle-version="1.8.9";resolution:=optional
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
+ org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.0",
+ org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)"
 Export-Package: org.eclipse.papyrus.moka.fuml;uses:="org.eclipse.ui.plugin,org.osgi.framework",
  org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions,
  org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.CompleteActions,

bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
index 3d80a3f..5c79912 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.timedfuml;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.timedfuml.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.papyrus.moka.discreteevent;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
  org.eclipse.papyrus.moka;bundle-version="2.0.0",
- org.eclipse.debug.core;bundle-version="3.10.0";resolution:=optional,
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="1.0.0",

bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF

diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
index 5976f04..671b121 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core;bundle-version="3.10.0";resolution:=optional,
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.service;bundle-version="[2.0.0,3.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.0",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)"
 Export-Package: org.eclipse.papyrus.moka,
  org.eclipse.papyrus.moka.engine
 Bundle-Vendor: Eclipse Modeling Project

bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF

diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
index 82eefde..4f1f0a4 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.papyrus.moka.fuml;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0";resolution:=optional,
- org.eclipse.ui.workbench;bundle-version="3.108.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)";resolution:=optional,
+ org.eclipse.ui.workbench;bundle-version="[3.110.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0"
 Export-Package: org.eclipse.papyrus.moka.fuml.assertionlibrary,
  org.eclipse.papyrus.moka.fuml.assertionlibrary.basic,
  org.eclipse.papyrus.moka.fuml.assertionlibrary.reporting,

bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF

diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index 50b6ce5..ac9c7b2 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.papyrus.moka.fuml;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="2.12.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0";resolution:=optional,
- org.eclipse.emf;bundle-version="2.6.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
+ org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.papyrus.moka;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0";resolution:=optional,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0";resolution:=optional,
- org.eclipse.ui.console;bundle-version="3.6.100";resolution:=optional,
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui;bundle-version="3.107.0";resolution:=optional
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";resolution:=optional,
+ org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)";resolution:=optional,
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.ui;bundle-version="[3.109.0,4.0.0)";resolution:=optional
 Export-Package: org.eclipse.papyrus.moka.fuml.standardlibrary,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.boolean_,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.integer,

bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF

diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
index ccc441e..616dd31 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
@@ -4,28 +4,28 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.animation;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.animation.AnimationPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
- org.eclipse.emf.transaction;bundle-version="1.9.0",
- org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
- org.eclipse.gef;bundle-version="3.11.0",
- org.eclipse.debug.core;bundle-version="3.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.core.jobs;bundle-version="3.8.0",
- org.eclipse.jface;bundle-version="3.12.0",
- org.eclipse.ui.workbench;bundle-version="3.108.0",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.moka.service;bundle-version="1.2.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.jobs;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.110.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF

diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
index e2c0c99..0c039a7 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
@@ -4,19 +4,19 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.debug;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.debug.MokaDebugPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.debug.core;bundle-version="3.10.0",
- org.eclipse.emf.ecore;bundle-version="2.12.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
  org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
- org.eclipse.core.jobs;bundle-version="3.8.0",
- org.eclipse.papyrus.moka.service;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
+ org.eclipse.core.jobs;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.moka.animation;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.0",
- org.eclipse.debug.ui
+ org.eclipse.debug.ui;bundle-version="[3.12.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project

bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF

diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
index e125ef7..6b3357a 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.service.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.debug.core;bundle-version="3.10.0";resolution:=optional
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.service

bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
index 315470d..f95e9fb 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.emf.transaction;bundle-version="1.9.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.moka.fuml;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.uml.icons;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.moka.composites;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.utils.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.uml.icons;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.0"
 Export-Package: org.eclipse.papyrus.moka.composites.utils,
  org.eclipse.papyrus.moka.composites.utils.handlers,
  org.eclipse.papyrus.moka.composites.utils.ui

bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
index dde2f6a..c23b1fd 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.discreteevent;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.discreteevent.Activator
-Require-Bundle: org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.discreteevent,

bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
index 4c70230..37193b2 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
@@ -4,17 +4,17 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.libraries.tools.annotations;singleton:=true

 Bundle-Version: 1.0.0.qualifier

 Bundle-Vendor: CEA

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.jdt.apt.core,

- org.eclipse.core.resources;bundle-version="3.11.0",

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

+ org.eclipse.jdt.apt.core;bundle-version="[3.5.0,4.0.0)",

+ org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",

  org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",

- org.eclipse.pde.core;bundle-version="3.11.0",

- com.google.guava,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.xtend.lib,

- org.eclipse.xtend.lib.macro,

- org.eclipse.uml2.uml;bundle-version="5.2.0",

- org.eclipse.papyrus.moka.simex;bundle-version="2.0.0"

+ org.eclipse.pde.core;bundle-version="[3.11.100,4.0.0)",

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

+ org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,3.0.0)",

+ org.eclipse.xtend.lib;bundle-version="[2.11.0,3.0.0)",

+ org.eclipse.xtend.lib.macro;bundle-version="[2.11.0,3.0.0)",

+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

+ org.eclipse.papyrus.moka.simex;bundle-version="2.0.1"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: org.eclipse.papyrus.moka.fuml.libraries.tools.annotations,

  org.eclipse.papyrus.moka.fuml.libraries.tools.annotations.processor

bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
index 20cf5bf..3639916 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.emf.validation;bundle-version="1.8.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0"
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.0.qualifier

bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
index f79b8b5..3c4368c 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: SIMplified EXecutable UML
 Bundle-SymbolicName: org.eclipse.papyrus.moka.simex;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.simex.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.gef;bundle-version="3.11.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.types.core;bundle-version="2.0.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;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.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project

bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.architecture

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.architecture b/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.architecture
new file mode 100644
index 0000000..021cba8
--- /dev/null
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.architecture
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmi:id="_2suT8DV1Eee-7Kh-SaGi_A" name="Architecture Domain for Executable UML" description="Defines fUML / PSCS / PSSM conformant models">

+  <stakeholders xmi:id="_zyNb4DV7EeePoIE8FwW18w" name="Software Engineer" description="An engineer interested in software development">

+    <concerns href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf4sSYEeaKZJ_pGfaSiA"/>

+    <concerns href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>

+    <concerns href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf5MSYEeaKZJ_pGfaSiA"/>

+  </stakeholders>

+  <contexts xsi:type="architecture:ArchitectureFramework" xmi:id="_d3uPoDV9EeePoIE8FwW18w" name="Executable UML" description="The Executable subset of UML" id="Simex" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/uml.gif" extensionPrefix="" creationCommandClass="org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand">

+    <viewpoints xmi:id="_GaCAsDV-EeePoIE8FwW18w" name="Structure" description="Specification of the system structure using classes and composite structures" id="org.eclipse.papyrus.moka.executable.uml.structure">

+      <concerns href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf48SYEeaKZJ_pGfaSiA"/>

+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_zzf4gHDtEeWh-MssWmCB_A"/>

+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_bKiwMHDuEeWh-MssWmCB_A"/>

+    </viewpoints>

+    <viewpoints xmi:id="_XXr0oDV-EeePoIE8FwW18w" name="Behavior" description="Specification of the system behavior using activities and state machines" id="org.eclipse.papyrus.moka.executable.uml.behavior">

+      <concerns href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf5MSYEeaKZJ_pGfaSiA"/>

+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_UzcgsHDtEeWh-MssWmCB_A"/>

+      <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="../../org.eclipse.papyrus.uml.architecture/model/uml.architecture#_PwD0cHDvEeWh-MssWmCB_A"/>

+    </viewpoints>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+  </contexts>

+</architecture:ArchitectureDomain>

bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.configuration

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.configuration b/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.configuration
deleted file mode 100644
index fe2cbdd..0000000
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.configuration
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_N8EKoFY9EeWcmuYjB__atg" defaultStakeholder="_frwfgFY9EeWcmuYjB__atg">

-  <stakeholders xmi:id="_frwfgFY9EeWcmuYjB__atg" name="Simex Designer" viewpoints="_Swj0YFY9EeWcmuYjB__atg"/>

-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_Swj0YFY9EeWcmuYjB__atg" name="Simex Viewpoint">

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_1PVVsFY9EeWcmuYjB__atg" name="Simex Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" categories="_q2Pa8FY9EeWcmuYjB__atg" customPalette="platform:/plugin/org.eclipse.papyrus.moka.simex/palette/simexClass.paletteconfiguration" customStyle="">

-      <modelRules xmi:id="_xDduAFZEEeWcmuYjB__atg">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <owningRules xmi:id="_On608FZGEeWcmuYjB__atg">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_a-WsUFiaEeWZUMJhjgTKEw" name="Simex Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" implementationID="CompositeStructure" categories="_q2Pa8FY9EeWcmuYjB__atg" customPalette="platform:/plugin/org.eclipse.papyrus.moka.simex/palette/simexComposite.paletteconfiguration" customStyle="">

-      <modelRules xmi:id="_a-WsUViaEeWZUMJhjgTKEw">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <modelRules xmi:id="_abH8EFidEeWZUMJhjgTKEw">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </modelRules>

-      <owningRules xmi:id="_a-WsUliaEeWZUMJhjgTKEw" multiplicity="1">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </owningRules>

-      <owningRules xmi:id="_QqSz0FigEeWZUMJhjgTKEw">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-    </modelKinds>

-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_VerKMGAyEeWAtYeYccnjOA" name="Simex Activity Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" implementationID="PapyrusUMLActivityDiagram" categories="_q2Pa8FY9EeWcmuYjB__atg" customPalette="platform:/plugin/org.eclipse.papyrus.moka.simex/palette/simexActivity.paletteconfiguration" customStyle="platform:/plugin/org.eclipse.papyrus.moka.simex/css/activity-canonical.css">

-      <modelRules xmi:id="_wFHKUGEDEeWAtYeYccnjOA" multiplicity="1">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

-      </modelRules>

-      <modelRules xmi:id="_pqLcADbPEeaGc5Cpc9rXCQ">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </modelRules>

-      <modelRules xmi:id="_xAfiQDbPEeaGc5Cpc9rXCQ">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </modelRules>

-      <owningRules xmi:id="_-i9MwGErEeWAtYeYccnjOA">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

-      </owningRules>

-      <owningRules xmi:id="_WR3aYKivEeW8cJChdmfSPQ">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

-      </owningRules>

-      <owningRules xmi:id="_I-1AIDbPEeaGc5Cpc9rXCQ">

-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

-      </owningRules>

-    </modelKinds>

-  </viewpoints>

-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

-  <categories xmi:id="_q2Pa8FY9EeWcmuYjB__atg" name="Simex View"/>

-</configuration:PapyrusConfiguration>

bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.elementtypesconfigurations

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.elementtypesconfigurations b/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.elementtypesconfigurations
deleted file mode 100644
index ad4c61a..0000000
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/config/simex.elementtypesconfigurations
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_tL86sLazEeSbnofizoRSMQ" identifier="com.cea.papyrus.iptg.elementtypeset" name="Simex ElementTypesSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_tvSJEKiZEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.ActivityNodePinUpdateEditHelperAdvice" description="Generic Helper advice in charge of managing ActivityNode pins" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.ActivityNodePinUpdateEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_tRFxMKiZEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.AddStructuralFeatureActionEditHelperAdvice" description="Set 'isReplaceAll' to true by default on AddStructuralFeatureActions" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.AddStructuralFeatureActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScWjU1YCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_uJLPwKiZEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.ActivityNodePinUpdateEditHelperAdviceForTriggerEvent" description="Generic Helper advice in charge of managing ActivityNode, also called for Trigger event modification" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.ActivityNodePinUpdateEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdLCt1YCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_uomWsKiZEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.ActivityNodePinUpdateEditHelperAdviceForSignalEvent" description="Generic Helper advice in charge of managing ActivityNode, also called for Signal event modification " inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.ActivityNodePinUpdateEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdB44VYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_afN7sKibEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.ActivityNodePinUpdateEditHelperAdviceForCallEvent" description="Generic Helper advice in charge of managing ActivityNode, also called for call event modification " inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.ActivityNodePinUpdateEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_bDhioKibEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.ReadIsClassifiedObjectActionEditHelperAdvice" description="Helper advice in charge of ReadIsClassifiedObject pins creation" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.ReadIsClassifiedObjectActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc_clVYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_biEf0KibEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.LinkActionEditHelperAdvice" description="Helper advice in charge of LinkAction creation" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.LinkActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scz2WVYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_P5Q-wKidEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.SendSignalActionEditHelperAdvice" description="Update &quot;on port&quot; on send signal actions" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.SendSignalActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdB4xlYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_pibxUKidEeW8cJChdmfSPQ" identifier="org.eclipse.papyrus.moka.simex.advices.SignalEditHelperAdvice" description="Create, align name and destroy events" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.SignalEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdB431YCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R15X8LrPEeW4_Z8HM447OQ" identifier="org.eclipse.papyrus.moka.simex.advices.LoopNodeEditHelperAdvice" description="Create a pre-configured loop node, where only the body part has to be specified" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.LoopNodeEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc58-VYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_QFhkIL99EeWpJNXrCZFrtQ" identifier="org.eclipse.papyrus.moka.simex.advices.ReadSelfActionEditHelperAdvice" description="Create a ReadSelfAction with a result output pin correctly typed" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.ReadSelfActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdADk1YCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_IlGUEL-HEeWpJNXrCZFrtQ" identifier="org.eclipse.papyrus.moka.simex.advices.ValueSpecificationActionEditHelperAdvice" description="Create a ValueSpecificationAction with a result output pin" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.ValueSpecificationActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdM4AVYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_a00YADlFEeaGc5Cpc9rXCQ" identifier="org.eclipse.papyrus.moka.simex.advices.TestIdentityActionEditHelperAdvice" description="Create a TestIdentityAction with with appropriate input and output pins" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.TestIdentityActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdHYZVYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="__athYDlGEeaGc5Cpc9rXCQ" identifier="org.eclipse.papyrus.moka.simex.advices.StartObjectBehaviorActionEditHelperAdvice" description="Create a StartObjectBehaviorAction with an object input pin" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.moka.simex.advices.StartObjectBehaviorActionEditHelperAdvice">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdCf7FYCEeS0WsAAtVmToA"/>

-  </adviceBindingsConfigurations>

-</elementtypesconfigurations:ElementTypeSetConfiguration>

bundles/core/tools/org.eclipse.papyrus.moka.simex/plugin.xml

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/plugin.xml b/bundles/core/tools/org.eclipse.papyrus.moka.simex/plugin.xml
index 81daeb4..90e3f3b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/plugin.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/plugin.xml
@@ -2,19 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <configuration
-            file="config/simex.configuration"
-            priority="100">
-      </configuration>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.policycheckerlistener">
-      <policycheckerlistener
-            listenerClass="org.eclipse.papyrus.moka.simex.viewpoint.SimexViewpointListener">
-      </policycheckerlistener>
-   </extension>
-   <extension
          point="org.eclipse.papyrus.infra.gmfdiag.dnd.dropStrategy">
       <strategy
             strategy="org.eclipse.papyrus.moka.simex.dnd.strategy.ActivityToCallBehaviorActionStrategy">
@@ -77,4 +64,16 @@
             strategy="org.eclipse.papyrus.moka.simex.dnd.strategy.ParameterToActivityParameterNodeStrategy">
       </strategy>
    </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.architecture.listeners">
+      <listener
+            class="org.eclipse.papyrus.moka.simex.viewpoint.SimexViewpointListener">
+      </listener>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.architecture.models">
+      <model
+            path="config/simex.architecture">
+      </model>
+   </extension>
 </plugin>

bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml
index 3a60550..1d3e770 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/pom.xml
@@ -14,5 +14,6 @@
 	<artifactId>org.eclipse.papyrus.moka.simex</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<name>org.eclipse.papyrus.moka.simex</name>
-
+	<version>2.0.1-SNAPSHOT</version>
+	
 </project>
\ No newline at end of file

bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
index b486ba5..b92d0ee 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
@@ -14,153 +14,70 @@
 package org.eclipse.papyrus.moka.simex.viewpoint;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.papyrus.infra.architecture.listeners.IArchitectureDescriptionListener;
 import org.eclipse.papyrus.infra.gmfdiag.dnd.policy.DropStrategyManager;
 import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.DropStrategy;
-import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.infra.viewpoints.policy.listener.IPolicyCheckerListener;
 import org.eclipse.papyrus.moka.simex.dnd.strategy.AbstractDropInActivityStrategy;
 
+public class SimexViewpointListener implements IArchitectureDescriptionListener {
 
-
-
-public class SimexViewpointListener implements IPolicyCheckerListener {
-
-	private static final String SIMEX_VIEWPOINT_NAME = "Simex Viewpoint";
-	private static final String SIMEX_ELEMENT_TYPES_DEF_PATH = "platform:/plugin/org.eclipse.papyrus.moka.simex/config/simex.elementtypesconfigurations";
-	private  String SIMEX_ELEMENT_TYPES_ID ="org.eclipse.papyrus.moka.simex.elementtypes"; 
+	// The architecture context ID
+	private static final String SIMEX_ARCHITECTURE_FRAMEWORK = "Simex";
 	
-	protected boolean isActive = false;
-
+	// Is the architecture context enabled
+	protected boolean isActive;
+	
+	// Drop strategies to be restored when the architecture context is left
+	private List<DropStrategy> dropStrategiesToRestore;
+	
 	public SimexViewpointListener() {
-		// TODO Auto-generated constructor stub
+		this.isActive = false;
+		this.dropStrategiesToRestore = new ArrayList<DropStrategy>();
+		this.init();
+	}
+	
+	private void init(){
+		// Every strategy that shall not be active in the current architecture context
+		// is registered in the list of strategies to be restored. These strategies will
+		// be restored when the current architecture context is left.
+		for(DropStrategy strategy: DropStrategyManager.instance.getAllStrategies()){
+			if(!this.shouldBeActivated(strategy)) {
+				this.dropStrategiesToRestore.add(strategy);
+			}
+		}
+		this.configureDndStrategies();
+	}
+	
+	@Override
+	public void architectureContextChanged(Notification notification) {
+		// If the new architecture context is SIMEX and it is not already
+		// enabled then drop strategies that are specific to this architecture
+		// context are enabled. Conversely, if SIMEX architecture context is left
+		// then additional drop strategies are disabled.
+		final String architectureContext = notification.getNewStringValue();
+		if(architectureContext.equals(SIMEX_ARCHITECTURE_FRAMEWORK)) {
+			if(!this.isActive) {
+				this.configureDndStrategies();
+				this.isActive = true;
+			}
+		}else {
+			this.restoreDndStrategies();
+			this.isActive = false;
+		}
 	}
 
 	@Override
-	public void policyCheckerChanged(PolicyChecker policyChecker) {
-		if (SIMEX_VIEWPOINT_NAME.equals(policyChecker.getViewpoint().getName())){
-			if(!isActive){
-				activatePerspective();
-				isActive = true;
-			}
-		}else  {
-			if (isActive){
-				desactivatePerspective();
-				isActive = false;
-			}	
-		}	
-
+	public void architectureViewpointsChanged(Notification notification) {
+		// TODO: enable filtering of available drop strategies based on the
+		// viewpoints that are currently enabled in the Simex framework.
 	}
 
-	
-	
-	
-	//TODO : define a list of drop strategy to activate by default 
-	//in addition to the Activity diag drop strategies
-	private final List<String> dropStrategiesToActivate= Arrays.asList(	);
-
-
-	private List<DropStrategy> dropStrategiesToRestore = null;
-	private ElementTypeSetConfiguration loadedConfig =null;  
-
-	
-
-	protected void desactivatePerspective() {
-		
-		restoreDndStrategies();
-		removeElementTypesConfiguration();
-	}
-
-	protected void activatePerspective() {
-		
-		configureDndStrategies();
-		registerElementTypesConfiguration();	
-	}
-
-
-	@SuppressWarnings("restriction")
-	protected void registerElementTypesConfiguration() {
-
-		ElementTypeSetConfiguration simexConfig = getSimexElementTypesConfig(); 
-		List<ElementTypeSetConfiguration> tmpCollection = new ArrayList<ElementTypeSetConfiguration>();
-		tmpCollection.add(simexConfig);
-		String contextID;
-		try {
-			contextID = org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext.getContext().getId();
-			ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfigurations(contextID,tmpCollection);
-			Map<String, ElementTypeSetConfiguration> configMap = new HashMap<>();
-			configMap.put(SIMEX_ELEMENT_TYPES_ID, simexConfig);
-			ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().put(contextID, configMap);
-
-		} catch (ServiceException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	
-
-	}
-
-
-
-	protected ElementTypeSetConfiguration getSimexElementTypesConfig() {
-		if (loadedConfig != null){
-			return loadedConfig ;
-		}else {
-			Map<String, Map<String, ElementTypeSetConfiguration>> elementTypesConfigs = ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations();
-		
-			ResourceSet elementTypesResSet=null;
-			if (! elementTypesConfigs.isEmpty()){
-				 
-				@SuppressWarnings("restriction")
-				ElementTypeSetConfiguration firstConfig;
-				try {
-					firstConfig = elementTypesConfigs.get(org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext.getContext().getId()).values().iterator().next();
-					elementTypesResSet = firstConfig.eResource().getResourceSet();
-				} catch (ServiceException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				
-
-			}else  {
-				elementTypesResSet = new ResourceSetImpl();
-			}
-			if (elementTypesResSet != null){
-				Resource res = elementTypesResSet.getResource(URI.createURI(SIMEX_ELEMENT_TYPES_DEF_PATH), true);
-				loadedConfig = (ElementTypeSetConfiguration) res.getContents().get(0);
-			}
-			
-			return loadedConfig;
-		}
-
-	}
-
-	public void removeElementTypesConfiguration() {
-		try {
-			String contextID = org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext.getContext().getId();
-			ElementTypeSetConfigurationRegistry.getInstance().unload(contextID, SIMEX_ELEMENT_TYPES_ID);
-		} catch (ServiceException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-
-	}
-
-
-
 	protected void restoreDndStrategies() {
+		// Any strategy that is not referenced in the list of strategies to be restored
+		// is disabled. Conversely, any strategy owned by this list is enabled.
 		if (dropStrategiesToRestore != null) {
 			for (DropStrategy strategy : DropStrategyManager.instance.getAllStrategies()){
 				if (dropStrategiesToRestore.contains(strategy)){
@@ -170,30 +87,27 @@
 				}
 			}
 		}
-
-
 	}
 
 	protected void configureDndStrategies() {
-		dropStrategiesToRestore = new ArrayList<DropStrategy>();
-
-		for (DropStrategy strategy : DropStrategyManager.instance.getAllStrategies()){
-			if (DropStrategyManager.instance.isActive(strategy)){
-				if (! shouldBeActivated(strategy)){
+		// Any strategy that is referenced in the list of strategies to be restored
+		// is disabled. Conversely, any strategy not owned by this list is enabled.
+		// (exact mirror of restoreDndStrategies operation)
+		if (dropStrategiesToRestore != null) {
+			for (DropStrategy strategy : DropStrategyManager.instance.getAllStrategies()){
+				if (!dropStrategiesToRestore.contains(strategy)){
+					DropStrategyManager.instance.setActive(strategy, true);
+				}else {
 					DropStrategyManager.instance.setActive(strategy, false);
 				}
-				dropStrategiesToRestore.add(strategy);
-			}else if (shouldBeActivated(strategy)){
-				DropStrategyManager.instance.setActive(strategy, true);
 			}
 		}
-
 	}
 
-
 	protected boolean shouldBeActivated(DropStrategy strategy) {
-		
-		return dropStrategiesToActivate.contains(strategy.getID()) || strategy.getID().startsWith(AbstractDropInActivityStrategy.SIMEX_DROP_STRATEGY_PREFIX);
+		// If the ID of a strategy matches the SIMEX prefix then this means the strategy shall
+		// be enabled in the current architecture context
+		return strategy.getID().startsWith(AbstractDropInActivityStrategy.SIMEX_DROP_STRATEGY_PREFIX);
 	}
 
 }

bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
index 04926cc..ef6d3c2 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.utils.ui
 Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.moka.utils;bundle-version="2.0.0"
 Export-Package: org.eclipse.papyrus.moka.utils.helper,
  org.eclipse.papyrus.moka.utils.helper.presentation

bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
index a49b806..f8a6871 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.utils.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.core.resources;bundle-version="3.11.0",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.uml2.uml;bundle-version="5.2.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
+ org.eclipse.uml2.uml;bundle-version="5.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.utils,

bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
index 218c16f..c56fe5c 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
@@ -5,17 +5,17 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.datavisualization.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.emf.common.ui,
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.1)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0]",
+ org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.papyrus.moka.datavisualization;bundle-version="1.0.0",
  org.eclipse.papyrus.moka.xygraph.common;bundle-version="1.0.0",
- org.eclipse.papyrus.moka.xygraph.mapping,
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0"
+ org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.datavisualization.handlers,

bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
index fff65a6..b000d28 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@
 Bundle-Activator: org.eclipse.papyrus.moka.datavisualization.Activator
 Bundle-Vendor: Eclipse ModelingFramework
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.12.0";visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="5.2.0";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.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.3.0,6.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.datavisualization,

bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
index fc06318..679d1de 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.common;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.common.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.draw2d;bundle-version="3.10.100",
- org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
- org.eclipse.nebula.visualization.xygraph;bundle-version="2.0.0"
+ org.eclipse.draw2d;bundle-version="[3.10.100,4.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.nebula.visualization.xygraph;bundle-version="[2.1.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.xygraph.common,

bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
index 19da472..0889f3b 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.mapping
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.mapping.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.draw2d;bundle-version="3.10.100",
- org.eclipse.nebula.visualization.xygraph;bundle-version="2.0.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.10.100,4.0.0)",
+ org.eclipse.nebula.visualization.xygraph;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
index 517a433..838cb13 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.model.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.moka.xygraph.model.reflection,
  org.eclipse.papyrus.moka.xygraph.model.xygraph;

bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
index 7592666..e0b9551 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
@@ -4,16 +4,16 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.modelexplorer;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.modelexplorer.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.100,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.xygraph.modelexplorer,

bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF

diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
index 5b2bd0f..a1e9e54 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
@@ -4,12 +4,12 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.properties;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.properties.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.xygraph.properties,

bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF

diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF b/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
index ea068e1..c5f15c4 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
@@ -1,33 +1,33 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.moka;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
- org.eclipse.debug.core;bundle-version="3.10.0",
- org.eclipse.debug.ui;bundle-version="3.11.100",
- org.eclipse.papyrus.infra.widgets;bundle-version="2.0.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
- org.eclipse.gef;bundle-version="3.11.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.12.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.e4.ui.css.core;bundle-version="0.11.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.debug;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;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.services.decoration;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.e4.ui.css.core;bundle-version="[0.12.100,1.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.debug;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.0",
- org.eclipse.ui.console,
- org.eclipse.jdt.ui,
- org.eclipse.papyrus.moka.animation
+ org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.animation;bundle-version="2.0.0"
 Export-Package: org.eclipse.papyrus.moka.launch,
  org.eclipse.papyrus.moka.ui,
  org.eclipse.papyrus.moka.ui.breakpoint.decoration,

bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
index 5465969..161403c 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
@@ -4,19 +4,18 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.master;singleton:=true

 Bundle-Version: 2.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.moka.fmi.master.Activator

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",

- org.eclipse.uml2.uml;bundle-version="5.2.0",

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

  org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",

  org.eclipse.papyrus.moka;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",

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

+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0",

- com.kenai.jffi,

- jnr.ffi,

- org.eclipse.jface;bundle-version="3.12.0"

+ jnr.ffi;bundle-version="[2.0.1,3.0.0)",

+ org.eclipse.jface;bundle-version="[3.12.0,4.0.0)"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Bundle-ActivationPolicy: lazy

 Export-Package: org.eclipse.papyrus.moka.fmi.master,

bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
index 2aabe90..1bb6506 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
@@ -4,15 +4,15 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.engine.debug;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmu.engine.debug.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.moka.fmu.engine;bundle-version="1.0.0",
- org.eclipse.papyrus.moka,
- org.eclipse.papyrus.moka.timedfuml,
- org.eclipse.papyrus.moka.discreteevent,
- org.eclipse.papyrus.moka.service,
- org.eclipse.uml2.uml,
- org.eclipse.debug.core;bundle-version="3.10.100",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.fmu.engine;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.10.100,4.0.0)",
  org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",

bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
index 95b78c8..13a2e18 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
@@ -4,18 +4,18 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.engine;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmu.engine.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.moka.timedfuml;bundle-version="1.0.0",
- org.eclipse.papyrus.moka.composites;bundle-version="1.2.0",
- org.eclipse.debug.core;bundle-version="3.10.0";resolution:=optional,
- org.eclipse.papyrus.moka.fuml;bundle-version="1.2.0",
- org.eclipse.papyrus.moka;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.discreteevent,
- org.eclipse.papyrus.moka.fuml.interfaces,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka;bundle-version="2.0.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.5.0",
- com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.5.0",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.5.0,3.0.0)",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.service;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",

bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
index 2784c3e..d36b559 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
@@ -3,16 +3,16 @@
 Bundle-Name: Moka execution engine for cosimulation

 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.cosimulation;singleton:=true

 Bundle-Version: 2.0.0.qualifier

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",

- org.eclipse.papyrus.moka.composites;bundle-version="1.1.0",

- org.eclipse.uml2.uml;bundle-version="5.2.0",

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

+ org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",

+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",

  org.eclipse.papyrus.moka.fmi.master;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.fuml;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.discreteevent;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.timedfuml;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.composites.interfaces;bundle-version="2.0.0",

- org.eclipse.debug.core;bundle-version="3.10.0",

+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",

  org.eclipse.papyrus.moka;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0",

  org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="1.0.0",

bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
index c23ac18..40c49dc 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.uml2.uml.profile.standard;visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

+ org.eclipse.emf.ecore;bundle-version="[2.13.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.3.0,6.0.0)";visibility:=reexport,

  org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0";visibility:=reexport,

- org.eclipse.uml2.uml.resources;bundle-version="5.2.0"

+ org.eclipse.uml2.uml.resources;bundle-version="[5.3.0,6.0.0)"

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 2.0.0.qualifier

 Bundle-ClassPath: .

bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.exporter/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.exporter/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.exporter/META-INF/MANIFEST.MF
index c533773..b3f56b6 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.exporter/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.exporter/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.exporter.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.utils;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fmu.rcp;bundle-version="2.0.0",
- org.eclipse.papyrus.moka.fuml.standardlibrary
+ org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrus.moka.fmi.exporter

bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
index 2e72c32..58d9d6a 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
 Bundle-Name: FMI 2 UML Importer
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.fmi2uml
 Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.core.resources;bundle-version="3.11.0",
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
  org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
index fb498fb..3900e10 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.profile.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
index 2e08f42..adc29ca 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",

- org.eclipse.emf.ecore;bundle-version="2.10.1";visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="2.12.0";visibility:=reexport

+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,

+ org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)";visibility:=reexport

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 2.0.0.qualifier

 Bundle-ClassPath: .

bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
index bd2b5b5..a56d6f5 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@
 Bundle-Name: Moka standalone RCP for FMU
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.rcp;singleton:=true
 Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.fmu.engine;bundle-version="1.0.0",
- org.apache.commons.cli;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.fmu.engine;bundle-version="2.0.0",
+ org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.moka;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.timedfuml;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.composites;bundle-version="2.0.0",
- org.aspectj.runtime;bundle-version="1.8.9",
- org.eclipse.debug.core;bundle-version="3.10.100";resolution:=optional
+ org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Export-Package: org.eclipse.papyrus.moka.fmu.rcp

bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF

diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
index 4e6f2a8..f44baf8 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FMI UI
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.ide;bundle-version="3.12.0",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.papyrus.moka.ui;bundle-version="2.0.0",
- org.eclipse.uml2.uml;bundle-version="5.2.0",
- org.eclipse.papyrus.moka.composites.utils,
- org.eclipse.emf.transaction;bundle-version="1.9.0",
+ org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.moka.composites.utils;bundle-version="2.0.0",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.papyrus.moka.fmu.engine;bundle-version="2.0.0",
  org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.ui,
- org.eclipse.papyrus.moka.fmi,
- org.eclipse.papyrus.moka.fmi.fmi2uml,
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
- org.eclipse.gef;bundle-version="3.11.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.moka.fmi.exporter;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="2.0.0"
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
@@ -32,5 +32,4 @@
  org.eclipse.papyrus.moka.fmi.ui.commands,
  org.eclipse.papyrus.moka.fmi.ui.dialogs,
  org.eclipse.papyrus.moka.fmi.ui.dnd,
- org.eclipse.papyrus.moka.fmi.ui.handlers,
- org.eclipse.papyrus.moka.fmi.ui.wizards
+ org.eclipse.papyrus.moka.fmi.ui.handlers

bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties

diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
index 3dce17e..9bd969e 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
@@ -3,4 +3,5 @@
                .,\

                plugin.xml,\

                css/,\

-               models/

+               models/,\

+               icons/

bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png

diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png
new file mode 100644
index 0000000..6739135
--- /dev/null
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png
Binary files differ

bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml

diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml
index 6ae6738..a419cd8 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml
@@ -173,16 +173,32 @@
          </stylesheet>

       </themeContribution>

    </extension>

-   <extension point="org.eclipse.ui.newWizards">

-		<wizard

-			category="org.eclipse.ui.Examples/org.eclipse.papyrus.examples"

-			class="org.eclipse.papyrus.moka.fmi.ui.wizards.FMUTutoWizard"

-			finalPerspective="org.eclipse.papyrus.infra.core.perspective"

-			icon="platform:/plugin/org.eclipse.papyrus.moka.ui/icons/moka_icon.png"

-			id="org.eclipse.papyrus.moka.fmi.ui.wizards.FMUTutoWizard"

-			name="FMU Tutorial Model Example">

-			<selection class="org.eclipse.core.resources.IResource"/>

-		</wizard>

-	</extension>

+   <extension

+         point="org.eclipse.emf.common.ui.examples">

+      <example

+            id="org.eclipse.papyrus.moka.fmi.ui.wizards.FMUTutoWizard"

+            pageImage="icons/moka_icon.png"

+            wizardID="org.eclipse.papyrus.moka.fmi.ui.wizards.FMUTutoWizard">

+         <projectDescriptor

+               contentURI="platform:/plugin/org.eclipse.papyrus.moka.fmi.ui/models/examples/"

+               description="FMU Getting Started"

+               name="TutoFMU">

+         </projectDescriptor>

+         <fileToOpen

+               location="platform:/plugin/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.di">

+         </fileToOpen>

+      </example>

+   </extension>

+   <extension

+         point="org.eclipse.ui.newWizards">

+      <wizard

+            category="org.eclipse.ui.Examples/org.eclipse.papyrus.examples"

+            class="org.eclipse.papyrus.moka.fmi.ui.wizards.FMUTutoWizard"

+            finalPerspective="org.eclipse.papyrus.infra.core.perspective"

+            icon="icons/moka_icon.png"

+            id="org.eclipse.papyrus.moka.fmi.ui.wizards.FMUTutoWizard"

+            name="FMU Tutorial Model Example">

+      </wizard>

+   </extension>

 

 </plugin>

bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml

diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
index f09170a..375dcc3 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
@@ -16,5 +16,6 @@
 	<artifactId>org.eclipse.papyrus.moka.fmi.ui</artifactId>

 	<packaging>eclipse-plugin</packaging>

 	<name>org.eclipse.papyrus.moka.fmi.ui</name>

+	<version>2.0.1-SNAPSHOT</version>

 

 </project>
\ No newline at end of file

bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java

diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
index d75c809..b5df1d8 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
@@ -14,14 +14,14 @@
 
 package org.eclipse.papyrus.moka.fmi.ui.wizards;
 
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.ModelCopyWizard;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.PapyrusExampleInstallerWizard;
 
 /**
  * Copy wizard for the HelloWorld example
  */
-public class FMUTutoWizard extends ModelCopyWizard {
+public class FMUTutoWizard extends PapyrusExampleInstallerWizard {
 
 	public FMUTutoWizard() {
-		super("TutoFMU"); //$NON-NLS-1$
+		super();
 	}
 }

features/org.eclipse.papyrus.moka.feature/feature.xml

diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index 7cf63f2..3ce7994 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.feature/feature.xml
@@ -41,6 +41,7 @@
       <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf" version="2.6.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore" version="2.12.0" match="greaterOrEqual"/>

+      <import plugin="org.aspectj.runtime" version="1.8.10" match="greaterOrEqual"/>

       <import plugin="org.eclipse.ui.workbench" version="3.108.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.common" version="2.12.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.debug.ui" version="3.11.100" match="greaterOrEqual"/>

@@ -68,7 +69,6 @@
       <import plugin="org.eclipse.core.jobs" version="3.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.jface" version="3.12.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.infra.core.sashwindows.di" version="1.2.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="1.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.infra.viewpoints.policy" version="1.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.infra.services.edit" version="2.0.0" match="greaterOrEqual"/>

@@ -80,22 +80,21 @@
       <import plugin="org.eclipse.equinox.registry" version="3.6.100" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.validation" version="1.8.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.core.resources" version="3.11.0" match="greaterOrEqual"/>

-      <import plugin="org.aspectj.runtime" version="1.8.3" match="greaterOrEqual"/>

       <import plugin="org.eclipse.osgi" version="3.10.0" match="compatible"/>

       <import plugin="org.eclipse.papyrus.infra.ui" version="1.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.uml2.types"/>

       <import plugin="org.eclipse.emf.common.ui"/>

       <import plugin="org.eclipse.papyrus.moka.xygraph.mapping"/>

+      <import plugin="org.eclipse.papyrus.infra.properties" version="1.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.draw2d" version="3.10.100" match="greaterOrEqual"/>

       <import plugin="org.eclipse.nebula.visualization.xygraph" version="2.0.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.papyrus.infra.emf.gmf" version="1.2.0" match="compatible"/>

-      <import plugin="org.eclipse.papyrus.infra.viewpoints.policy" version="1.2.0" match="compatible"/>

+      <import plugin="org.eclipse.papyrus.infra.emf.gmf" version="1.2.100" match="compatible"/>

+      <import plugin="org.eclipse.papyrus.infra.viewpoints.policy" version="1.2.0"/>

       <import plugin="org.eclipse.papyrus.emf.facet.query.java.core" version="2.0.0" match="compatible"/>

-      <import plugin="org.eclipse.papyrus.emf.facet.custom.metamodel" version="1.2.0" match="compatible"/>

-      <import plugin="org.eclipse.papyrus.emf.facet.custom.ui" version="2.0.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.papyrus.infra.ui" version="1.2.0" match="compatible"/>

-      <import plugin="org.eclipse.papyrus.infra.emf" version="2.0.0" match="compatible"/>

-      <import plugin="org.eclipse.papyrus.infra.properties" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.emf.facet.custom.metamodel" version="1.3.0" match="compatible"/>

+      <import plugin="org.eclipse.papyrus.emf.facet.custom.ui" version="1.2.0"/>

+      <import plugin="org.eclipse.papyrus.infra.ui" version="2.0.0" match="compatible"/>

+      <import plugin="org.eclipse.papyrus.infra.emf" version="1.2.0"/>

       <import plugin="org.eclipse.papyrus.infra.properties.ui" version="1.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.uml2.uml" version="4.1.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka"/>

@@ -174,7 +173,7 @@
          id="org.eclipse.papyrus.moka.simex"

          download-size="0"

          install-size="0"

-         version="2.0.0.qualifier"

+         version="2.0.1.qualifier"

          unpack="false"/>

 

    <plugin

features/org.eclipse.papyrus.moka.fmi.feature/feature.xml

diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
index 7864754..bbf8816 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
@@ -18,29 +18,61 @@
    </copyright>

 

    <requires>

-      <import feature="org.eclipse.papyrus.moka.feature" version="2.0.0.qualifier"/>

-      <import plugin="org.eclipse.ui" version="3.107.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore" version="2.10.1" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore.xmi" version="2.12.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.core.resources" version="3.11.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.emf.ecore" version="2.12.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.m2m.qvt.oml" version="3.6.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.uml2.uml" version="5.2.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka.fuml" version="2.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka" version="2.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka.composites" version="2.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.0.2" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.papyrus.moka.fuml.assertionlibrary" version="2.0.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.papyrus.moka.fuml.standardlibrary" version="2.0.0" match="greaterOrEqual"/>

-      <import plugin="org.eclipse.papyrus.moka.ui" version="2.0.0" match="greaterOrEqual"/>

-      <import plugin="org.apache.commons.lang" version="2.6.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka.fuml.interfaces" version="2.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka.composites.interfaces" version="2.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka.composites" version="1.1.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka.discreteevent" version="2.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.papyrus.moka.timedfuml" version="2.0.0" match="greaterOrEqual"/>

       <import plugin="org.eclipse.debug.core" version="3.10.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.ui" version="3.107.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.ui" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.fuml.standardlibrary" version="2.0.0" match="greaterOrEqual"/>

+      <import feature="org.eclipse.papyrus.moka.feature" version="2.0.0.qualifier"/>

+      <import plugin="org.eclipse.uml2.types"/>

+      <import plugin="jnr.ffi"/>

+      <import plugin="org.eclipse.jface" version="3.12.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="1.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.fuml.statemachines" version="1.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.uml2.uml.profile.standard"/>

+      <import plugin="org.eclipse.uml2.uml" version="5.1.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.uml2.uml.resources" version="5.2.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.ui.ide" version="3.12.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.composites.utils"/>

+      <import plugin="org.eclipse.emf.transaction" version="1.9.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.infra.core" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.infra.ui"/>

+      <import plugin="org.eclipse.papyrus.moka.fmi"/>

+      <import plugin="org.eclipse.papyrus.moka.fmi.fmi2uml"/>

+      <import plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.gef" version="3.11.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.uml.diagram.composite" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.uml.diagram.wizards" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.uml.tools.utils" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.timedfuml" version="1.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.composites" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.fuml" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.5.0" match="greaterOrEqual"/>

+      <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.service" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.utils" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.debug.core" version="3.10.100" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.moka.fmu.rcp" version="2.0.0" match="greaterOrEqual"/>

+      <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="org.apache.commons.cli" version="1.2.0" match="greaterOrEqual"/>

+      <import plugin="org.aspectj.runtime" version="1.8.9" match="greaterOrEqual"/>

    </requires>

 

    <plugin

@@ -82,7 +114,7 @@
          id="org.eclipse.papyrus.moka.fmi.ui"

          download-size="0"

          install-size="0"

-         version="2.0.0.qualifier"

+         version="2.0.1.qualifier"

          unpack="false"/>

 

    <plugin

releng/org.eclipse.papyrus.moka.configuration/pom.xml

diff --git a/releng/org.eclipse.papyrus.moka.configuration/pom.xml b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
index 245d816..7e739ef 100644
--- a/releng/org.eclipse.papyrus.moka.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
@@ -7,7 +7,7 @@
 	<parent>

 		<groupId>org.eclipse.papyrus.components</groupId>

 		<artifactId>org.eclipse.papyrus.components.parent</artifactId>

-		<version>0.0.21</version>

+		<version>0.0.22</version>

 		<relativePath></relativePath>

 	</parent>

 	

@@ -28,7 +28,7 @@
 		<component.bugzilla.name>Moka</component.bugzilla.name>

 		<component.package.rootname>org.eclipse.papyrus.moka</component.package.rootname>

 		<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/moka/</component.apibaseline.url>

-		<eclipse.targetrelease>neon</eclipse.targetrelease>

+		<eclipse.targetrelease>oxygen-papyrusnightly</eclipse.targetrelease>

 		<target.version>2.0.0-SNAPSHOT</target.version>

 	</properties>

 

releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.target

diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.target
new file mode 100644
index 0000000..2a94459
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.target
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?pde?>

+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

+<target name="Moka Oxygen Papyrus Nightly Target Platform" sequenceNumber="1494504194">

+  <locations>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.platform.feature.group" version="4.7.0.v20170308-2000"/>

+      <unit id="org.eclipse.rcp.feature.group" version="4.7.0.v20170308-2000"/>

+      <unit id="org.eclipse.jdt.feature.group" version="3.13.0.v20170308-2105"/>

+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.0.v20170105-1450"/>

+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170111-1955"/>

+      <repository id="eclipse" location="http://download.eclipse.org/releases/oxygen"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>

+      <repository id="papyrus-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.papyrus.dev.feature.feature.group" version="0.0.0"/>

+      <repository id="papyrus-developper-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.aspectj.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>

+      <repository id="aspectj-neon" location="http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.orbit.category.json" version="1.0.0.7f_e7McLz57EEXeLAn2b0b7y_z-IG"/>

+      <unit id="jnr.ffi" version="2.0.1.v201505052040"/>

+      <unit id="jnr.constants" version="0.8.6.v201505052040"/>

+      <unit id="jnr.enxio" version="0.6.0.v201505052040"/>

+      <unit id="javax.xml" version="1.3.4.v201005080400"/>

+      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201703081533"/>

+      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201703081533"/>

+      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.2.0"/>

+    </location>

+  </locations>

+</target>

releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.tpd

diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.tpd
new file mode 100644
index 0000000..b5e8291
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.tpd
@@ -0,0 +1,36 @@
+target "Moka Oxygen Papyrus Nightly Target Platform" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen" eclipse {
+ org.eclipse.platform.feature.group
+ org.eclipse.rcp.feature.group
+ org.eclipse.jdt.feature.group
+ org.eclipse.equinox.p2.discovery.feature.feature.group
+ org.eclipse.equinox.executable.feature.group
+}
+
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/" papyrus-nightly {
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/" papyrus-developper-nightly {
+ org.eclipse.papyrus.dev.feature.feature.group lazy
+}
+
+location "http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/" aspectj-neon{
+	org.aspectj.feature.group lazy
+	org.eclipse.ajdt.feature.group lazy
+	org.eclipse.equinox.weaving.sdk.feature.group lazy
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/" orbit{
+	org.eclipse.orbit.category.json
+	jnr.ffi
+	jnr.constants
+	jnr.enxio
+	javax.xml
+}
+
+location "http://download.eclipse.org/nebula/releases/1.2.0" nebula{
+	org.eclipse.nebula.widgets.xviewer.feature.feature.group
+	org.eclipse.nebula.visualization.feature.feature.group
+}
\ No newline at end of file

releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/pom.xml

diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/pom.xml
new file mode 100644
index 0000000..9179f89
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- Parent POM (i.e., the one owned by the releng folder) -->
+	<parent>
+		<groupId>org.eclipse.papyrus.moka</groupId>
+		<artifactId>org.eclipse.papyrus.moka.releng.platforms</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- POM description -->
+	<artifactId>org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>Moka Oxygen Target Platform</name>
+	
+</project>
\ No newline at end of file

releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.target

diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.target
new file mode 100644
index 0000000..dfaf1a9
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.target
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?pde?>

+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

+<target name="Moka Oxygen Target Platform" sequenceNumber="1494504127">

+  <locations>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.platform.feature.group" version="4.7.0.v20170308-2000"/>

+      <unit id="org.eclipse.rcp.feature.group" version="4.7.0.v20170308-2000"/>

+      <unit id="org.eclipse.jdt.feature.group" version="3.13.0.v20170308-2105"/>

+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.0.v20170105-1450"/>

+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.0.v20170111-1955"/>

+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.0.0.201703151744"/>

+      <repository id="eclipse" location="http://download.eclipse.org/releases/oxygen"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.aspectj.feature.group" version="1.8.10.201704242114"/>

+      <unit id="org.eclipse.ajdt.feature.group" version="2.2.4.201704242114"/>

+      <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.2.0.201704242114"/>

+      <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.orbit.category.json" version="1.0.0.7f_e7McLz57EEXeLAn2b0b7y_z-IG"/>

+      <unit id="jnr.ffi" version="2.0.1.v201505052040"/>

+      <unit id="jnr.constants" version="0.8.6.v201505052040"/>

+      <unit id="jnr.enxio" version="0.6.0.v201505052040"/>

+      <unit id="javax.xml" version="1.3.4.v201005080400"/>

+      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201703081533"/>

+      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201703081533"/>

+      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.2.0"/>

+    </location>

+  </locations>

+</target>

releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.tpd

diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.tpd
new file mode 100644
index 0000000..e64f982
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.tpd
@@ -0,0 +1,29 @@
+target "Moka Oxygen Target Platform" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen" eclipse {
+ org.eclipse.platform.feature.group
+ org.eclipse.rcp.feature.group
+ org.eclipse.jdt.feature.group
+ org.eclipse.equinox.p2.discovery.feature.feature.group
+ org.eclipse.equinox.executable.feature.group
+ org.eclipse.papyrus.sdk.feature.feature.group
+}
+
+location "http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/" aspectj{
+	org.aspectj.feature.group
+	org.eclipse.ajdt.feature.group
+	org.eclipse.equinox.weaving.sdk.feature.group
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/" orbit{
+	org.eclipse.orbit.category.json
+	jnr.ffi
+	jnr.constants
+	jnr.enxio
+	javax.xml
+}
+
+location "http://download.eclipse.org/nebula/releases/1.2.0" nebula{
+	org.eclipse.nebula.widgets.xviewer.feature.feature.group
+	org.eclipse.nebula.visualization.feature.feature.group
+}
\ No newline at end of file

releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/pom.xml

diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/pom.xml
new file mode 100644
index 0000000..4b98c5d
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- Parent POM (i.e., the one owned by the releng folder) -->
+	<parent>
+		<groupId>org.eclipse.papyrus.moka</groupId>
+		<artifactId>org.eclipse.papyrus.moka.releng.platforms</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- POM description -->
+	<artifactId>org.eclipse.papyrus.moka.targetplatform.oxygen</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>Moka Oxygen Target Platform</name>
+	
+</project>
\ No newline at end of file

releng/platforms/pom.xml

diff --git a/releng/platforms/pom.xml b/releng/platforms/pom.xml
index 639a006..9709263 100644
--- a/releng/platforms/pom.xml
+++ b/releng/platforms/pom.xml
@@ -19,6 +19,8 @@
 	<modules>
 		<module>org.eclipse.papyrus.moka.targetplatform.neon</module>
 		<module>org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly</module>
+		<module>org.eclipse.papyrus.moka.targetplatform.oxygen</module>
+		<module>org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly</module>
 	</modules>
 
 </project>
\ No newline at end of file

tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF

diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
index 0be4f6c..8918c71 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.test
 Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.12.0",
+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.papyrus.moka.fmi;bundle-version="2.0.0",
- org.eclipse.core.runtime;bundle-version="3.12.0",
+ org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="2.0.0",
  org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.0"
 Bundle-Activator: org.eclipse.papyrus.moka.fmi.test.Activator