From ddc1830866e80b49138a0adc0119d2a74fc1a927 Mon Sep 17 00:00:00 2001
From: Camille Letavernier
Date: Wed, 4 May 2016 13:00:36 +0200
Subject: [Releng] Update Target Platforms for Neon M7

Change-Id: I3e0cd022c9a421cbe036ea791cab99546fd8d1cd
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>---
 .../org.eclipse.papyrus.dev.eclipse.target.target  | 296 ++++++++--------
 .../org.eclipse.papyrus.dev.portable.target.target |  50 +--
 .../org.eclipse.papyrus.dev.portable.target.tpd    |   2 +-
 ...lipse.papyrus.extra.tests.eclipse.target.target | 378 ++++++++++-----------
 ...ipse.papyrus.extra.tests.portable.target.target |  70 ++--
 ...org.eclipse.papyrus.extra.eclipse.target.target | 308 ++++++++---------
 ...rg.eclipse.papyrus.extra.portable.target.target |  68 ++--
 .../org.eclipse.papyrus.extra.portable.target.tpd  |   6 +-
 ...clipse.papyrus.main.tests.eclipse.target.target | 296 ++++++++--------
 ...lipse.papyrus.main.tests.portable.target.target |  50 +--
 .../org.eclipse.papyrus.main.eclipse.target.target | 218 ++++++------
 ...org.eclipse.papyrus.main.portable.target.target |  48 +--
 .../org.eclipse.papyrus.main.portable.target.tpd   |  14 +-
 .../org.eclipse.papyrus.rcp.eclipse.target.target  | 342 +++++++++----------
 .../org.eclipse.papyrus.rcp.portable.target.target |  78 ++---
 .../org.eclipse.papyrus.rcp.portable.target.tpd    |  10 +-
 16 files changed, 1116 insertions(+), 1118 deletions(-)

(limited to 'releng')

diff --git a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
index 155b1fbb347..2b911539a3b 100644
--- a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
+++ b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Dev" sequenceNumber="1462188733">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
-      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
-      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
-      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
-      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
-      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
-      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
-      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <unit id="org.eclipse.b3.aggregator.engine.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-4.4"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
-      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.oomph.version.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.targlets.feature.group" version="1.4.0.v20160324-0836"/>
-      <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.p2.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.feature.group" version="1.4.0.v20160324-0842"/>
-      <unit id="org.eclipse.oomph.preferences.feature.group" version="1.4.0.v20160323-1057"/>
-      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20160324-055722-1.4.0-M6a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
-      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160321-2203"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus Dev" sequenceNumber="1462359570">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
+      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
+      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
+      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
+      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
+      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <unit id="org.eclipse.b3.aggregator.engine.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-4.4"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
+      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.oomph.version.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.targlets.feature.group" version="1.4.0.v20160324-0836"/>
+      <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.p2.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.feature.group" version="1.4.0.v20160324-0842"/>
+      <unit id="org.eclipse.oomph.preferences.feature.group" version="1.4.0.v20160323-1057"/>
+      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20160324-055722-1.4.0-M6a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
+      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160504-0322"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
index 983c808509a..440da9a28b9 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Dev" sequenceNumber="1462188733">
+<target name="Papyrus Dev" sequenceNumber="1462359570">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
@@ -11,7 +11,7 @@
       <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
       <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -28,31 +28,31 @@
       <repository id="nebula-richtext" location="http://download.eclipse.org/technology/nebula/snapshot/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
       <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
       <repository id="xwt" location="http://download.eclipse.org/xwt/release-1.1.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
@@ -64,20 +64,20 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/snapshots/latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
       <repository id="emfQuery" location="http://download.eclipse.org/modeling/emf/query/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
       <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -85,11 +85,11 @@
       <repository id="subversive" location="http://download.eclipse.org/technology/subversive/4.0/neon-site/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
       <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
       <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -99,8 +99,8 @@
       <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
@@ -142,7 +142,7 @@
       <repository id="egit" location="http://download.eclipse.org/egit/updates-4.3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160321-2203"/>
+      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160504-0322"/>
     </location>
   </locations>
 </target>
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
index e4df197fda8..196553af447 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
@@ -52,4 +52,4 @@ location egit "http://download.eclipse.org/egit/updates-4.3" //
 
 //updateFrom("m2e",0)
 
-location m2e "http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160321-2203" //
+location m2e "http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160504-0322" //
diff --git a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
index 311c7dd5021..28974461dd5 100644
--- a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
+++ b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
@@ -1,189 +1,189 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra Tests" sequenceNumber="1462188279">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <unit id="org.eclipse.b3.aggregator.engine.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-4.4"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.oomph.version.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.targlets.feature.group" version="1.4.0.v20160324-0836"/>
-      <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.p2.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.feature.group" version="1.4.0.v20160324-0842"/>
-      <unit id="org.eclipse.oomph.preferences.feature.group" version="1.4.0.v20160323-1057"/>
-      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20160324-055722-1.4.0-M6a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
-      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160321-2203"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
-      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
-      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
-      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
-      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
-      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
-      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
-      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="1.100.0.v20160330-0740"/>
-      <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201603200413"/>
-      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
-      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.5.0.v20151208-0751"/>
-      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20150911-0923"/>
-      <unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20151123-0826"/>
-      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.0.v20151012-0603"/>
-      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201603211409"/>
-      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201603211409"/>
-      <repository id="acceleo" location="file:/home/data/httpd/download.eclipse.org/acceleo/updates/milestones/3.6/S201603211409"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
-      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-      <unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-      <repository id="rmf" location="file:/home/data/httpd/download.eclipse.org/rmf/updates/releases"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
-      <repository id="eef" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.zest.layouts" version="1.1.300.201603210204"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="sphinx" location="file:/home/data/httpd/download.eclipse.org/sphinx/previews"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus Extra Tests" sequenceNumber="1462359572">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <unit id="org.eclipse.b3.aggregator.engine.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-4.4"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.oomph.version.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.targlets.feature.group" version="1.4.0.v20160324-0836"/>
+      <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.p2.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.feature.group" version="1.4.0.v20160324-0842"/>
+      <unit id="org.eclipse.oomph.preferences.feature.group" version="1.4.0.v20160323-1057"/>
+      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20160324-055722-1.4.0-M6a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
+      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160504-0322"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
+      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
+      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
+      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
+      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
+      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="1.100.0.v20160330-0740"/>
+      <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201604280603"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
+      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.5.0.v20151208-0751"/>
+      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20150911-0923"/>
+      <unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20151123-0826"/>
+      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.0.v20151012-0603"/>
+      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201604291321"/>
+      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201604291321"/>
+      <repository id="acceleo" location="file:/home/data/httpd/download.eclipse.org/acceleo/updates/milestones/3.6/S201604291321"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
+      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <repository id="rmf" location="file:/home/data/httpd/download.eclipse.org/rmf/updates/releases"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
+      <repository id="eef" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.zest.layouts" version="1.1.300.201605020204"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="sphinx" location="file:/home/data/httpd/download.eclipse.org/sphinx/previews"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
index d9db6bdb113..08d0b34fd13 100644
--- a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
+++ b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra Tests" sequenceNumber="1462188279">
+<target name="Papyrus Extra Tests" sequenceNumber="1462359572">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
@@ -36,7 +36,7 @@
       <repository id="egit" location="http://download.eclipse.org/egit/updates-4.3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160321-2203"/>
+      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160504-0322"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
@@ -46,7 +46,7 @@
       <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
       <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -63,31 +63,31 @@
       <repository id="nebula-richtext" location="http://download.eclipse.org/technology/nebula/snapshot/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
       <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
       <repository id="xwt" location="http://download.eclipse.org/xwt/release-1.1.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
@@ -99,20 +99,20 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/snapshots/latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
       <repository id="emfQuery" location="http://download.eclipse.org/modeling/emf/query/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
       <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -120,11 +120,11 @@
       <repository id="subversive" location="http://download.eclipse.org/technology/subversive/4.0/neon-site/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
       <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
       <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -141,10 +141,10 @@
       <repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201603200413"/>
-      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413"/>
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201604280603"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
@@ -155,11 +155,11 @@
       <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201603211409"/>
-      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201603211409"/>
-      <repository id="acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201603211409"/>
+      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201604291321"/>
+      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201604291321"/>
+      <repository id="acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201604291321"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
@@ -175,9 +175,9 @@
       <repository id="eef" location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.zest.layouts" version="1.1.300.201603210204"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
+      <unit id="org.eclipse.zest.layouts" version="1.1.300.201605020204"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="graphiti" location="http://download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
diff --git a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
index 0a6cb4b8a31..71c6143804e 100644
--- a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
+++ b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
@@ -1,154 +1,154 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra" sequenceNumber="1462188383">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
-      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
-      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
-      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
-      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
-      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
-      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
-      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="1.100.0.v20160330-0740"/>
-      <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201603200413"/>
-      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
-      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.5.0.v20151208-0751"/>
-      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20150911-0923"/>
-      <unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20151123-0826"/>
-      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.0.v20151012-0603"/>
-      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201603211409"/>
-      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201603211409"/>
-      <repository id="acceleo" location="file:/home/data/httpd/download.eclipse.org/acceleo/updates/milestones/3.6/S201603211409"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
-      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-      <unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-      <repository id="rmf" location="file:/home/data/httpd/download.eclipse.org/rmf/updates/releases"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
-      <repository id="eef" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.zest.layouts" version="1.1.300.201603210204"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="sphinx" location="file:/home/data/httpd/download.eclipse.org/sphinx/previews"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus Extra" sequenceNumber="1462359572">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
+      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
+      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
+      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
+      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
+      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="1.100.0.v20160330-0740"/>
+      <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201604280603"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
+      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.5.0.v20151208-0751"/>
+      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20150911-0923"/>
+      <unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20151123-0826"/>
+      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.0.v20151012-0603"/>
+      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201604291321"/>
+      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201604291321"/>
+      <repository id="acceleo" location="file:/home/data/httpd/download.eclipse.org/acceleo/updates/milestones/3.6/S201604291321"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
+      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <repository id="rmf" location="file:/home/data/httpd/download.eclipse.org/rmf/updates/releases"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
+      <repository id="eef" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.zest.layouts" version="1.1.300.201605020204"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="sphinx" location="file:/home/data/httpd/download.eclipse.org/sphinx/previews"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
index a45afb62abd..686f4a9c47d 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra" sequenceNumber="1462188383">
+<target name="Papyrus Extra" sequenceNumber="1462359572">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
@@ -11,7 +11,7 @@
       <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
       <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -28,31 +28,31 @@
       <repository id="nebula-richtext" location="http://download.eclipse.org/technology/nebula/snapshot/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
       <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
       <repository id="xwt" location="http://download.eclipse.org/xwt/release-1.1.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
@@ -64,20 +64,20 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/snapshots/latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
       <repository id="emfQuery" location="http://download.eclipse.org/modeling/emf/query/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
       <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -85,11 +85,11 @@
       <repository id="subversive" location="http://download.eclipse.org/technology/subversive/4.0/neon-site/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
       <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
       <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -106,10 +106,10 @@
       <repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201603200413"/>
-      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413"/>
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201604280603"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
@@ -120,11 +120,11 @@
       <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201603211409"/>
-      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201603211409"/>
-      <repository id="acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201603211409"/>
+      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201604291321"/>
+      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201604291321"/>
+      <repository id="acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201604291321"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
@@ -140,9 +140,9 @@
       <repository id="eef" location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.zest.layouts" version="1.1.300.201603210204"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
+      <unit id="org.eclipse.zest.layouts" version="1.1.300.201605020204"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="graphiti" location="http://download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
index cbd469e609b..7bb87d6a597 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
@@ -10,7 +10,7 @@ location aeri "http://download.eclipse.org/technology/epp/logging/milestones/" {
 
 //updateFrom("EMF COMPARE",0) 
 
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603" {
 	org.eclipse.emf.compare.diagram.gmf.source.feature.group
 	org.eclipse.emf.compare.source.feature.group
 	org.eclipse.emf.compare.uml2.source.feature.group
@@ -28,7 +28,7 @@ location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"
 
 //updateFrom("M2T ACCELEO",0) 
 
-location acceleo "http://download.eclipse.org/acceleo/updates/milestones/3.6/S201603211409" {
+location acceleo "http://download.eclipse.org/acceleo/updates/milestones/3.6/S201604291321" {
 	org.eclipse.acceleo.runtime.source.feature.group
 	org.eclipse.acceleo.source.feature.group
 	org.eclipse.acceleo.query.source.feature.group
@@ -56,7 +56,7 @@ location eef "http://download.eclipse.org/modeling/emft/eef/updates/releases/1.5
 
 //updateFrom("GEF",0) 
 
-location gef "http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868" {
+location gef "http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912" {
 	org.eclipse.zest.layouts
 }
 
diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index f6fedae93d6..6e6b2d64381 100644
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1462188151">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
-      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
-      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
-      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
-      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
-      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
-      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
-      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <unit id="org.eclipse.b3.aggregator.engine.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
-      <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-4.4"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
-      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.oomph.version.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.targlets.feature.group" version="1.4.0.v20160324-0836"/>
-      <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.p2.feature.group" version="1.4.0.v20160323-1057"/>
-      <unit id="org.eclipse.oomph.setup.feature.group" version="1.4.0.v20160324-0842"/>
-      <unit id="org.eclipse.oomph.preferences.feature.group" version="1.4.0.v20160323-1057"/>
-      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20160324-055722-1.4.0-M6a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
-      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160321-2203"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus Tests" sequenceNumber="1462359572">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
+      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
+      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
+      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
+      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
+      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <unit id="org.eclipse.b3.aggregator.editor.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <unit id="org.eclipse.b3.aggregator.engine.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
+      <repository id="b3" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/b3/updates-4.4"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
+      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.oomph.version.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.targlets.feature.group" version="1.4.0.v20160324-0836"/>
+      <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.p2.feature.group" version="1.4.0.v20160323-1057"/>
+      <unit id="org.eclipse.oomph.setup.feature.group" version="1.4.0.v20160324-0842"/>
+      <unit id="org.eclipse.oomph.preferences.feature.group" version="1.4.0.v20160323-1057"/>
+      <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20160324-055722-1.4.0-M6a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
+      <repository id="tpd" location="http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160504-0322"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 5df6d4727d9..2f0b872a6d0 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1462188151">
+<target name="Papyrus Tests" sequenceNumber="1462359572">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
@@ -11,7 +11,7 @@
       <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
       <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -28,31 +28,31 @@
       <repository id="nebula-richtext" location="http://download.eclipse.org/technology/nebula/snapshot/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
       <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
       <repository id="xwt" location="http://download.eclipse.org/xwt/release-1.1.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
@@ -64,20 +64,20 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/snapshots/latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
       <repository id="emfQuery" location="http://download.eclipse.org/modeling/emf/query/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
       <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -85,11 +85,11 @@
       <repository id="subversive" location="http://download.eclipse.org/technology/subversive/4.0/neon-site/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
       <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
       <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -99,8 +99,8 @@
       <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
@@ -142,7 +142,7 @@
       <repository id="egit" location="http://download.eclipse.org/egit/updates-4.3"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160321-2203"/>
+      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.7/1.7.0.20160504-0322"/>
     </location>
   </locations>
 </target>
diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
index ad8e0038e25..f32ab651568 100644
--- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
+++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1462187415">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
-      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
-      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
-      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
-      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
-      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
-      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
-      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus Main" sequenceNumber="1462359572">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
+      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
+      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
+      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
+      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
+      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
index 44b160ddd1c..ec167db4743 100644
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1462187415">
+<target name="Papyrus Main" sequenceNumber="1462359572">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
@@ -11,7 +11,7 @@
       <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
       <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -28,31 +28,31 @@
       <repository id="nebula-richtext" location="http://download.eclipse.org/technology/nebula/snapshot/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
       <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
       <repository id="xwt" location="http://download.eclipse.org/xwt/release-1.1.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
@@ -64,20 +64,20 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/snapshots/latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
       <repository id="emfQuery" location="http://download.eclipse.org/modeling/emf/query/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
       <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -85,11 +85,11 @@
       <repository id="subversive" location="http://download.eclipse.org/technology/subversive/4.0/neon-site/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
       <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
       <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -99,8 +99,8 @@
       <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
index 9f14bb1cb80..e0405a0affe 100644
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -52,13 +52,13 @@ location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/update
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/" {
 	org.eclipse.sdk.feature.group
 }
 
 //updateFrom("MDT OCL 6.0",0) 
 
-location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840" {
+location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517" {
 	org.eclipse.ocl.examples.classic.feature.group
 	org.eclipse.ocl.examples.feature.group
 }
@@ -71,7 +71,7 @@ location xwt "http://download.eclipse.org/xwt/release-1.1.0" {
 
 //updateFrom("Xtext, Xtend",0) 
 
-location xtext "http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/" {
+location xtext "http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/" {
 	org.eclipse.xtext.sdk.feature.group
 	org.eclipse.xtend.sdk.feature.group
 	org.eclipse.xtext.redist.feature.group
@@ -90,7 +90,7 @@ location nattable "http://download.eclipse.org/nattable/snapshots/latest/reposit
 
 //updateFrom("EMFT MWE",0)
 
-location mwe "http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/" {
+location mwe "http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/" {
 	org.eclipse.emf.mwe2.language.sdk.feature.group
 }
 
@@ -102,7 +102,7 @@ location emfQuery "http://download.eclipse.org/modeling/emf/query/updates/milest
 
 //updateFrom("WebTools",0) 
 
-location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/" {
+location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/" {
 	org.eclipse.wst.xml_sdk.feature.feature.group
 	org.eclipse.wst.xml_ui.feature.feature.group
 }
@@ -141,7 +141,7 @@ location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/update
 
 //updateFrom("GEF",0)
 
-location gef "http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868" {
+location gef "http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912" {
 	org.eclipse.gef.feature.group
 }
 
@@ -149,4 +149,4 @@ location gef "http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_g
 
 //updateFrom("Mylyn",0)
 
-location mylyn "http://download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"
+location mylyn "http://download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"
\ No newline at end of file
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index 9fb0fc031cb..29df144225a 100644
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -1,171 +1,171 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1462187855">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
-      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
-      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
-      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
-      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
-      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
-      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
-      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
-      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="1.100.0.v20160330-0740"/>
-      <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201603211409"/>
-      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201603211409"/>
-      <repository id="acceleo" location="file:/home/data/httpd/download.eclipse.org/acceleo/updates/milestones/3.6/S201603211409"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
-      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-      <unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
-      <repository id="rmf" location="file:/home/data/httpd/download.eclipse.org/rmf/updates/releases"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
-      <repository id="eef" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.zest.layouts" version="1.1.300.201603210204"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="sphinx" location="file:/home/data/httpd/download.eclipse.org/sphinx/previews"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="4.3.0.201604071810-r"/>
-      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.19.0.v20160111-2059"/>
-      <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.19.0.v20160111-2059"/>
-      <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.19.0.v20160111-2059"/>
-      <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.19.0.v20160316-2133"/>
-      <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.19.0.v20160316-2105"/>
-      <unit id="org.eclipse.mylyn_feature.feature.group" version="3.19.0.v20160331-1842"/>
-      <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.8.0.v20160315-1828"/>
-      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201603200413"/>
-      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xsd.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.5.0.v20151216-1631"/>
-      <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
-      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.5.0.v20151208-0751"/>
-      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20150911-0923"/>
-      <unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20151123-0826"/>
-      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.0.v20151012-0603"/>
-      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20160317-0200"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20160316-1445"/>
-      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20160308-2123"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus RCP" sequenceNumber="1462359573">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160321-0408"/>
+      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
+      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201603220642"/>
+      <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201603220642"/>
+      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201603220642/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201501260813"/>
+      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/archives/Q12015/release/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201604151927"/>
+      <repository id="nebula-richtext" location="file:/home/data/httpd/download.eclipse.org/technology/nebula/snapshot/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
+      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
+      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/release-1.1.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201604282001"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201604282001"/>
+      <repository id="nattable" location="file:/home/data/httpd/download.eclipse.org/nattable/snapshots/latest/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
+      <repository id="emfQuery" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/query/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
+      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.team.svn.feature.group" version="4.0.0.I20160427-1700"/>
+      <repository id="subversive" location="file:/home/data/httpd/download.eclipse.org/technology/subversive/4.0/neon-site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
+      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.0.201506090515"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.0.201506090515"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="1.100.0.v20160330-0740"/>
+      <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201604291321"/>
+      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201604291321"/>
+      <repository id="acceleo" location="file:/home/data/httpd/download.eclipse.org/acceleo/updates/milestones/3.6/S201604291321"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
+      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <unit id="org.eclipse.rmf.reqif10.pror.sdk.feature.feature.group" version="0.13.0.201509161042"/>
+      <repository id="rmf" location="file:/home/data/httpd/download.eclipse.org/rmf/updates/releases"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
+      <repository id="eef" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.zest.layouts" version="1.1.300.201605020204"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository id="sphinx" location="file:/home/data/httpd/download.eclipse.org/sphinx/previews"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egit.feature.group" version="4.3.0.201604071810-r"/>
+      <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.3"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.19.0.v20160111-2059"/>
+      <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.19.0.v20160111-2059"/>
+      <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.19.0.v20160111-2059"/>
+      <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.19.0.v20160316-2133"/>
+      <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.19.0.v20160316-2105"/>
+      <unit id="org.eclipse.mylyn_feature.feature.group" version="3.19.0.v20160331-1842"/>
+      <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.8.0.v20160315-1828"/>
+      <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201604280603"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.5.0.v20151216-1631"/>
+      <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20151216-1631"/>
+      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.5.0.v20151208-0751"/>
+      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20150911-0923"/>
+      <unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20151123-0826"/>
+      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.0.v20151012-0603"/>
+      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20160428-0800"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20160427-1608"/>
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20160425-1748"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index 5d337bb54d4..48e18967623 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1462187855">
+<target name="Papyrus RCP" sequenceNumber="1462359573">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository"/>
@@ -11,7 +11,7 @@
       <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.6.0/S201603210408"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201512152038"/>
+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201605031913"/>
       <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -28,27 +28,27 @@
       <repository id="nebula-richtext" location="http://download.eclipse.org/technology/nebula/snapshot/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160321-0821"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
       <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201512160041"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
       <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160224-1849"/>
-      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160321-2145"/>
-      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201603211840"/>
+      <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160420-1352"/>
+      <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160502-1845"/>
+      <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201605021517"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.xwt.feature.feature.group" version="1.1.0.v20150608-1518"/>
       <repository id="xwt" location="http://download.eclipse.org/xwt/release-1.1.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201603220719"/>
-      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201603220719"/>
-      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201603220719/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201604290858"/>
+      <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201604290858"/>
+      <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201604290858/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201604282001"/>
@@ -60,20 +60,20 @@
       <repository id="nattable" location="http://download.eclipse.org/nattable/snapshots/latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201603221017"/>
-      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201603221009/"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201604291319"/>
+      <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201604291319/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201512142117"/>
+      <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.10.0.201605030032"/>
       <repository id="emfQuery" location="http://download.eclipse.org/modeling/emf/query/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201603171933"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201603171933"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M6-20160324010110/repository/"/>
+      <unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.8.0.v201604291650"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201604291650"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M7-20160503010110/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201512142118"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201605030103"/>
       <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -81,7 +81,7 @@
       <repository id="subversive" location="http://download.eclipse.org/technology/subversive/4.0/neon-site/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201512142135"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
       <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -95,11 +95,11 @@
       <repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201603211409"/>
-      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201603211409"/>
-      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201603211409"/>
-      <repository id="acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201603211409"/>
+      <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201604291321"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201604291321"/>
+      <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.6.4.201604291321"/>
+      <repository id="acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201604291321"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.upr.utp.feature.feature.group" version="0.9.0.20141027-1408-incubation"/>
@@ -115,9 +115,9 @@
       <repository id="eef" location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.zest.layouts" version="1.1.300.201603210204"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201603210204"/>
-      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M6_gef-master_1868"/>
+      <unit id="org.eclipse.zest.layouts" version="1.1.300.201605020204"/>
+      <unit id="org.eclipse.gef.feature.group" version="3.11.0.201605020204"/>
+      <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/milestones/4.0.0M7_gef-master_1912"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="graphiti" location="http://download.eclipse.org/graphiti/updates/milestones/S-0.13.0M6-201603231003/"/>
@@ -140,15 +140,15 @@
       <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201603200413"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201603200413"/>
-      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.2.0.201604280603"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.2.0.201604280603"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xsd.sdk.feature.group" version="2.12.0.v20160321-0508"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160321-0508"/>
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
       <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -161,11 +161,11 @@
       <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20160317-0200"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20160316-1445"/>
-      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20160308-2123"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160317-0200"/>
-      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/"/>
+      <unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20160428-0800"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20160427-1608"/>
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.100.v20160425-1748"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160428-0800"/>
+      <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/"/>
     </location>
   </locations>
 </target>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
index 12df82cd1fd..53bc1ccd6ef 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
@@ -10,7 +10,7 @@ location egit "http://download.eclipse.org/egit/updates-4.3" {
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/" {
 	org.eclipse.e4.core.tools.feature.feature.group
 }
 
@@ -28,7 +28,7 @@ location mylyn "http://download.eclipse.org/mylyn/drops/3.19.0/v20160331-2042" {
 
 //updateFrom("EMF COMPARE",0) 
 
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201603200413" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201604280603" {
 	org.eclipse.emf.compare.ide.ui.source.feature.group
 }
 
@@ -46,9 +46,7 @@ location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/S20151216-1133"
 
 //updateFrom("Eclipse",0)
 
-location platform "http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200/" {
+location platform "http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M7-201604280800/" {
 	org.eclipse.rcp.configuration.feature.group
 	org.eclipse.equinox.executable.feature.group
-}
-
-
+}
\ No newline at end of file
-- 
cgit v1.2.3