Change the targets after the nattable 1.4 to 1.5 migration.
+ Modify the Manifest and targets for the oep.infra.emf 2.2.0 to 3.0.0
evolution

Change-Id: I6c0e9b7ba9020b16dd3f08436ceaaac9491c5ca6
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
diff --git a/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF
index 3995795..40c94ac 100644
--- a/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.papyrus.interoperability.common/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
  org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.emf;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
diff --git a/diagram-definition/releng/main/targetplatform/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen.target b/diagram-definition/releng/main/targetplatform/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen.target
index 8e663be..e71af69 100644
--- a/diagram-definition/releng/main/targetplatform/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen.target
+++ b/diagram-definition/releng/main/targetplatform/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen/org.eclipse.papyrus.interoperability.dd.targetplatform.oxygen.target
@@ -8,8 +8,6 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -38,5 +36,14 @@
 <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
 <repository location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/>
 </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.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+</location>
 </locations>
 </target>
diff --git a/releng/Papyrus - All - Tests.launch b/releng/Papyrus - All - Tests.launch
index 2149632..db0ac19 100644
--- a/releng/Papyrus - All - Tests.launch
+++ b/releng/Papyrus - All - Tests.launch
@@ -4,7 +4,7 @@
 <stringAttribute key="M2_GOALS" value="clean verify"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="buildAll"/>
+<stringAttribute key="M2_PROFILES" value="buildAllTests"/>
 <listAttribute key="M2_PROPERTIES">
 <listEntry value="papyrus.repo.interoperability.main=file:/${project_loc:releng}/../org.eclipse.papyrus.interoperability.all.p2/target/repository"/>
 </listAttribute>
diff --git a/releng/Papyrus - DD - Main.launch b/releng/Papyrus - DD - Main.launch
index 3d2f996..bdbaf4f 100644
--- a/releng/Papyrus - DD - Main.launch
+++ b/releng/Papyrus - DD - Main.launch
@@ -14,5 +14,5 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:releng}/"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:releng}/main"/>
 </launchConfiguration>
diff --git a/releng/Papyrus - Rpy - Test.launch b/releng/Papyrus - Rpy - Test.launch
index 6c442bd..e5ba5a2 100755
--- a/releng/Papyrus - Rpy - Test.launch
+++ b/releng/Papyrus - Rpy - Test.launch
@@ -4,7 +4,7 @@
 <stringAttribute key="M2_GOALS" value="clean verify"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="Rpy"/>
+<stringAttribute key="M2_PROFILES" value="RpyTests"/>
 <listAttribute key="M2_PROPERTIES">
 <listEntry value="papyrus.repo.interoperability.main=file:/${project_loc:releng}/../rpy/releng/org.eclipse.papyrus.interoperability.rpy.p2/target/repository"/>
 </listAttribute>
diff --git a/releng/Papyrus - SysML14 - Main tests.launch b/releng/Papyrus - SysML14 - Main tests.launch
index 9720b89..7b59142 100644
--- a/releng/Papyrus - SysML14 - Main tests.launch
+++ b/releng/Papyrus - SysML14 - Main tests.launch
@@ -4,7 +4,7 @@
 <stringAttribute key="M2_GOALS" value="clean verify"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
 <booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="SysML14"/>
+<stringAttribute key="M2_PROFILES" value="SysML14Tests"/>
 <listAttribute key="M2_PROPERTIES">
 <listEntry value="papyrus.repo.interoperability.main=file:/${project_loc:releng}/../sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/target/repository"/>
 </listAttribute>
diff --git a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
index a53c79d..48704ec 100644
--- a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
+++ b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317046">
+<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317047">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/>
@@ -13,16 +13,16 @@
 <repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sysml.diagram.feature.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sysml.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sysml.nattable.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -37,6 +37,7 @@
 <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/releases/oxygen"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -47,14 +48,21 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
 </location>
-<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
 <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
-<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+</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.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
 </location>
 </locations>
 </target>
diff --git a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
index 60ad3a9..59cfe92 100644
--- a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
+++ b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -37,9 +37,7 @@
 <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/releases/oxygen"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -50,13 +48,11 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.dev.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.dev.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.junit.feature.source.feature.group" version="0.0.0"/>
 <repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
 </location>
 <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -64,5 +60,14 @@
 <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
 <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
 </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.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+</location>
 </locations>
 </target>
diff --git a/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target b/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
index 48273e6..04e7fd3 100755
--- a/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
+++ b/rpy/releng/main/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317051">
+<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317052">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/>
@@ -8,8 +8,6 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -51,10 +49,19 @@
 <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
 <repository location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/>
 </location>
-<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
 <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
-<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+</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.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
 </location>
 </locations>
 </target>
diff --git a/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target b/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
index 4177aaf..439884d 100644
--- a/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
+++ b/rpy/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen/org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen.target
@@ -37,13 +37,11 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
+<repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.dev.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.dev.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.junit.feature.source.feature.group" version="0.0.0"/>
 <repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -51,12 +49,8 @@
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/releases/oxygen"/>
 </location>
 <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -64,5 +58,14 @@
 <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
 <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
 </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.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+</location>
 </locations>
 </target>
diff --git a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
index c09f216..90a107f 100644
--- a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
+++ b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
@@ -47,9 +47,16 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
 </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.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+</location>
 </locations>
 </target>
diff --git a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
index 5e482d3..a7d2302 100644
--- a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
+++ b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
@@ -50,14 +50,21 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.dev.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.papyrus.dev.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.junit.feature.source.feature.group" version="0.0.0"/>
 <repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
 </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.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
+<repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+</location>
 </locations>
 </target>