diff --git a/pom.xml b/pom.xml
index 83a67da..6f75cd7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,9 @@
 
 	<modules>
 		<module>diagram-definition</module>
-		<module>rpy</module>
+<!-- 		<module>rpy</module> -->
 		<module>rsa</module>
-		<module>sysml14</module>
+<!-- 		<module>sysml14</module> -->
 	</modules>
 
 	<pluginRepositories>
diff --git a/releng/features/org.eclipse.papyrus.interoperability.main.feature/feature.xml b/releng/features/org.eclipse.papyrus.interoperability.main.feature/feature.xml
index 80f8c09..646f8d3 100644
--- a/releng/features/org.eclipse.papyrus.interoperability.main.feature/feature.xml
+++ b/releng/features/org.eclipse.papyrus.interoperability.main.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.interoperability.main.feature"
       label="Papyrus Main Interoperability Feature"
-      version="1.0.0.qualifier"
+      version="1.1.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
@@ -22,17 +22,17 @@
          id="org.eclipse.papyrus.interoperability.dd.feature"
          version="0.0.0"/>
          
-   <includes
+   <!--includes
          id="org.eclipse.papyrus.interoperability.rpy.feature"
-         version="0.0.0"/>
+         version="0.0.0"/-->
          
    <includes
          id="org.eclipse.papyrus.interoperability.rsa.feature"
          version="0.0.0"/>
          
-   <includes
+   <!--includes
          id="org.eclipse.papyrus.interoperability.sysml14.sysml.feature"
-         version="0.0.0"/>
+         version="0.0.0"/-->
     
 
 </feature>
diff --git a/releng/features/org.eclipse.papyrus.interoperability.main.feature/pom.xml b/releng/features/org.eclipse.papyrus.interoperability.main.feature/pom.xml
index 340a54b..d499197 100644
--- a/releng/features/org.eclipse.papyrus.interoperability.main.feature/pom.xml
+++ b/releng/features/org.eclipse.papyrus.interoperability.main.feature/pom.xml
@@ -10,6 +10,7 @@
 	</parent>
 	
 	<artifactId>org.eclipse.papyrus.interoperability.main.feature</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 </project>
\ No newline at end of file
diff --git a/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/feature.xml b/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/feature.xml
index d6316c8..2471ffc 100644
--- a/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/feature.xml
+++ b/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.interoperability.main.tests.feature"
       label="Papyrus Main Interoperability Tests Feature"
-      version="1.0.0.qualifier"
+      version="1.1.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
@@ -19,17 +19,17 @@
    </license>
    
          
-   <includes
+   <!--includes
          id="org.eclipse.papyrus.interoperability.rpy.tests.feature"
-         version="0.0.0"/>
+         version="0.0.0"/-->
          
    <includes
          id="org.eclipse.papyrus.interoperability.rsa.tests.feature"
          version="0.0.0"/>
          
-   <includes
+   <!--includes
          id="org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature"
-         version="0.0.0"/>
+         version="0.0.0"/-->
          
    <plugin
          id="org.eclipse.papyrus.junit.utils"
@@ -45,7 +45,7 @@
          version="0.0.0"
          unpack="false"/>
          
-   <plugin
+   <!--plugin
          id="org.eclipse.papyrus.tests.framework"
          download-size="0"
          install-size="0"
@@ -57,6 +57,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/-->
 
 </feature>
diff --git a/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/pom.xml b/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/pom.xml
index 408e3ca..60a57f6 100644
--- a/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/pom.xml
+++ b/releng/features/org.eclipse.papyrus.interoperability.main.tests.feature/pom.xml
@@ -11,6 +11,7 @@
 	
 	<groupId>org.eclipse.papyrus.interoperability.tests</groupId>
 	<artifactId>org.eclipse.papyrus.interoperability.main.tests.feature</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 </project>
\ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml b/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml
index 740298e..752f2f7 100644
--- a/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml
+++ b/releng/org.eclipse.papyrus.interoperability.all.p2/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.papyrus.interoperability.main.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.main.feature" version="1.0.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.interoperability.main.feature_1.1.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.main.feature" version="1.1.0.qualifier">
       <category name="org.eclipse.papyrus.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.interoperability.main.feature.source_1.0.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.main.feature.source" version="1.0.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.interoperability.main.feature.source_1.1.0.qualifier.jar" id="org.eclipse.papyrus.interoperability.main.feature.source" version="1.1.0.qualifier">
       <category name="org.eclipse.papyrus.category"/>
    </feature>
    
diff --git a/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target b/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target
index 43031b8..9c8c90b 100755
--- a/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target
+++ b/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target
@@ -1,9 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Interoperability - Oxygen" sequenceNumber="1503763110">
+<target name="Interoperability - Oxygen" sequenceNumber="1520601225">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.infra.onefile" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.commands" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.documentation.profile" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
+      <repository id="Papyrus" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <unit id="org.eclipse.core.runtime" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore.xmi" version="0.0.0"/>
@@ -18,60 +34,12 @@
       <unit id="org.eclipse.ui.forms" version="0.0.0"/>
       <unit id="org.eclipse.m2m.qvt.oml" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.diagram.ui.render" version="0.0.0"/>
-      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
-      <unit id="org.eclipse.xtext" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.common.types" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.shared" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.codetemplates.ui" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.infra.onefile" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.gmfdiag.commands" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.common" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.internationalization" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.doc" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.documentation.profile" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes.source" version="0.0.0"/>
-      <repository id="Papyrus" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/3.1.0?d"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml.feature.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.diagram.feature.source.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.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.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"/>
-      <repository id="sysml" location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
-      <repository id="sysml14" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.dsml.validation.feature.source.feature.group" version="0.0.0"/>
       <repository id="dsml.validation" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/incubation/dsml.validation/updates/oxygen/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="0.0.0"/>
-      <unit id="org.apache.commons.io.source" version="0.0.0"/>
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target b/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target
index b830fc9..5739cb3 100755
--- a/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target
+++ b/releng/targetplatforms/eclipse/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Interoperability Tests - Oxygen" sequenceNumber="1503935134">
+<target name="Interoperability Tests - Oxygen" sequenceNumber="1520603270">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
-      <repository id="sysml14" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.dsml.validation.feature.source.feature.group" version="0.0.0"/>
       <repository id="dsml.validation" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/incubation/dsml.validation/updates/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="0.0.0"/>
-      <unit id="org.apache.commons.io.source" version="0.0.0"/>
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.notation" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.extensionpoints" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare" version="0.0.0"/>
+      <unit id="org.eclipse.emf" version="0.0.0"/>
       <unit id="org.eclipse.equinox.launcher" version="0.0.0"/>
       <unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
-      <unit id="org.eclipse.emf" version="0.0.0"/>
+      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <unit id="org.eclipse.core.runtime" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore.xmi" version="0.0.0"/>
@@ -40,24 +31,11 @@
       <unit id="org.eclipse.ui.forms" version="0.0.0"/>
       <unit id="org.eclipse.m2m.qvt.oml" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.diagram.ui.render" version="0.0.0"/>
-      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
-      <unit id="org.eclipse.xtext" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.common.types" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.shared" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.codetemplates.ui" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.infra.core.log" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.emf" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.clazz" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.statemachine" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.gmfdiag.css" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.clazz" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.diagram.composite" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.architecture" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.onefile" version="0.0.0"/>
@@ -65,43 +43,17 @@
       <unit id="org.eclipse.papyrus.uml.diagram.common" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.m2m.qvto.common" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.internationalization" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.doc" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.documentation.profile" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes.source" version="0.0.0"/>
-      <repository id="Papyrus" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/3.1.0?d"/>
+      <repository id="Papyrus" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.junit.framework.source" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.framework.source" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.junit.utils.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.tests.tools" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.tests.framework" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.tests.framework.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.tests.framework.annotations.source" version="0.0.0"/>
       <repository id="PapyrusDev" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.codegen" version="0.0.0"/>
-      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sysml.feature.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.diagram.feature.source.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.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.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"/>
-      <repository id="sysml" location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target
index de1fb18..a84e61f 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.target
@@ -1,9 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Interoperability - Oxygen" sequenceNumber="1503763110">
+<target name="Interoperability - Oxygen" sequenceNumber="1520601225">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.infra.onefile" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.commands" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.documentation.profile" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
+      <repository id="Papyrus" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <unit id="org.eclipse.core.runtime" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore.xmi" version="0.0.0"/>
@@ -18,60 +34,12 @@
       <unit id="org.eclipse.ui.forms" version="0.0.0"/>
       <unit id="org.eclipse.m2m.qvt.oml" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.diagram.ui.render" version="0.0.0"/>
-      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
-      <unit id="org.eclipse.xtext" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.common.types" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.shared" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.codetemplates.ui" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <repository location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.infra.onefile" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.gmfdiag.commands" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.common" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.internationalization" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.doc" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.documentation.profile" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes.source" version="0.0.0"/>
-      <repository id="Papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/3.1.0/?d"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml.feature.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.diagram.feature.source.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.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.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"/>
-      <repository id="sysml" location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
-      <repository id="sysml14" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.dsml.validation.feature.source.feature.group" version="0.0.0"/>
       <repository id="dsml.validation" location="http://download.eclipse.org/modeling/mdt/papyrus/incubation/dsml.validation/updates/oxygen/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="0.0.0"/>
-      <unit id="org.apache.commons.io.source" version="0.0.0"/>
-      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.tpd b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.tpd
index 52fb9e6..6e22417 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.tpd
@@ -15,69 +15,29 @@
  org.eclipse.ui.forms lazy
  org.eclipse.m2m.qvt.oml lazy
  org.eclipse.gmf.runtime.diagram.ui.render lazy
- 
+}
+
+//manualUpdate
+location Papyrus "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" {
+ org.eclipse.papyrus.infra.onefile lazy
+ org.eclipse.papyrus.infra.gmfdiag.commands lazy
+ org.eclipse.papyrus.uml.diagram.common lazy
+ org.eclipse.papyrus.uml.m2m.qvto.common lazy
+ org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes lazy
+ org.eclipse.papyrus.uml.documentation.profile lazy
+ org.eclipse.papyrus.infra.gmfdiag.common lazy
+ org.eclipse.papyrus.eclipse.project.editors lazy
+}
+
+location "http://download.eclipse.org/releases/oxygen/" {
  org.eclipse.m2m.qvt.oml.project lazy
- org.eclipse.xtext lazy
- org.eclipse.xtext.common.types lazy
- org.eclipse.xtext.ui lazy
- org.eclipse.xtext.ui.shared lazy
- org.eclipse.xtext.ui.codetemplates.ui lazy
- 
  org.eclipse.uml2.uml.edit lazy
  org.eclipse.uml2.uml.resources lazy
  org.eclipse.xtext.xbase.lib lazy
  org.eclipse.xtend.lib lazy
- 
-}
-
-//manualUpdate
-location Papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/3.1.0/?d" {
- org.eclipse.papyrus.infra.onefile lazy
- org.eclipse.papyrus.infra.gmfdiag.commands lazy
- org.eclipse.papyrus.uml.diagram.common lazy
- 
- org.eclipse.papyrus.uml.m2m.qvto.common lazy
- org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes lazy
- org.eclipse.papyrus.uml.internationalization lazy
- org.eclipse.papyrus.infra.doc lazy
- 
- org.eclipse.papyrus.uml.documentation.profile lazy
- org.eclipse.papyrus.infra.gmfdiag.common lazy
- org.eclipse.papyrus.eclipse.project.editors lazy
- 
- org.eclipse.papyrus.uml.m2m.qvto.common.source lazy
- org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes.source lazy
-}
-
-//manualUpdate
-location sysml "https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/" {
- org.eclipse.papyrus.sysml.feature.feature.group lazy
- org.eclipse.papyrus.sysml.feature.source.feature.group lazy
- org.eclipse.papyrus.sysml.diagram.feature.source.feature.group lazy
- org.eclipse.papyrus.sysml.diagram.feature.feature.group lazy
- org.eclipse.papyrus.sysml.properties.feature.feature.group lazy
- org.eclipse.papyrus.sysml.properties.feature.source.feature.group lazy
- org.eclipse.papyrus.sysml.modelexplorer.feature.feature.group lazy
- org.eclipse.papyrus.sysml.modelexplorer.feature.source.feature.group lazy
- org.eclipse.papyrus.sysml.nattable.feature.feature.group lazy
- org.eclipse.papyrus.sysml.nattable.feature.source.feature.group lazy
- 
-}
-
-//manualUpdate
-location sysml14 "https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/" {
- org.eclipse.papyrus.sysml14.feature.feature.group lazy
- org.eclipse.papyrus.sysml14.feature.source.feature.group lazy
 }
 
 location dsml.validation "http://download.eclipse.org/modeling/mdt/papyrus/incubation/dsml.validation/updates/oxygen/" {
  org.eclipse.papyrus.dsml.validation.feature.feature.group lazy
  org.eclipse.papyrus.dsml.validation.feature.source.feature.group lazy
 }
-
-//manualUpdate 
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/" {
- org.apache.commons.io lazy
- org.apache.commons.io.source lazy
-
-}
\ No newline at end of file
diff --git a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target
index a6f438a..45bd087 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.target
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Interoperability Tests - Oxygen" sequenceNumber="1503935134">
+<target name="Interoperability Tests - Oxygen" sequenceNumber="1520603270">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sysml14.feature.source.feature.group" version="0.0.0"/>
-      <repository id="sysml14" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.dsml.validation.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.dsml.validation.feature.source.feature.group" version="0.0.0"/>
       <repository id="dsml.validation" location="http://download.eclipse.org/modeling/mdt/papyrus/incubation/dsml.validation/updates/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="0.0.0"/>
-      <unit id="org.apache.commons.io.source" version="0.0.0"/>
-      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.notation" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.extensionpoints" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare" version="0.0.0"/>
+      <unit id="org.eclipse.emf" version="0.0.0"/>
       <unit id="org.eclipse.equinox.launcher" version="0.0.0"/>
       <unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
-      <unit id="org.eclipse.emf" version="0.0.0"/>
+      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <unit id="org.eclipse.core.runtime" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore.xmi" version="0.0.0"/>
@@ -40,24 +31,11 @@
       <unit id="org.eclipse.ui.forms" version="0.0.0"/>
       <unit id="org.eclipse.m2m.qvt.oml" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.diagram.ui.render" version="0.0.0"/>
-      <unit id="org.eclipse.m2m.qvt.oml.project" version="0.0.0"/>
-      <unit id="org.eclipse.xtext" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.common.types" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.shared" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.codetemplates.ui" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
       <repository location="http://download.eclipse.org/releases/oxygen/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.infra.core.log" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.emf" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.clazz" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.statemachine" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.gmfdiag.css" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.clazz" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.diagram.composite" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.architecture" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.onefile" version="0.0.0"/>
@@ -65,43 +43,17 @@
       <unit id="org.eclipse.papyrus.uml.diagram.common" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.m2m.qvto.common" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.internationalization" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.doc" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.uml.documentation.profile" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes.source" version="0.0.0"/>
-      <repository id="Papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/3.1.0/?d"/>
+      <repository id="Papyrus" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.junit.framework.source" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.framework.source" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.junit.utils.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.m2m.qvto.tests.tools" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.tests.framework" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.tests.framework.source" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.tests.framework.annotations.source" version="0.0.0"/>
       <repository id="PapyrusDev" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
     </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.codegen" version="0.0.0"/>
-      <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sysml" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sysml.feature.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.diagram.feature.source.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.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.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"/>
-      <repository id="sysml" location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/"/>
-    </location>
   </locations>
 </target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.tpd b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.tpd
index f8c602c..2a67df7 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.tests.targetplatform.oxygen.tpd
@@ -3,25 +3,16 @@
 include "../org.eclipse.papyrus.interoperability.all.targetplatform.oxygen/org.eclipse.papyrus.interoperability.all.targetplatform.oxygen.tpd"
 
 location "http://download.eclipse.org/releases/oxygen/" {
- org.eclipse.uml2.uml lazy
- org.eclipse.gmf.runtime.notation lazy
- org.eclipse.papyrus.uml.extensionpoints lazy
- org.eclipse.emf.compare lazy
+ org.eclipse.emf lazy
  org.eclipse.equinox.launcher lazy
  org.eclipse.ui.ide.application lazy
- 
- org.eclipse.emf lazy
- 
+
 }
 
 //manualUpdate
-location Papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/3.1.0/?d" {
- org.eclipse.papyrus.infra.core.log lazy
- org.eclipse.papyrus.infra.emf lazy
- org.eclipse.papyrus.uml.diagram.clazz lazy
- org.eclipse.papyrus.uml.diagram.statemachine lazy
- 
+location Papyrus "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" {
  org.eclipse.papyrus.infra.gmfdiag.css lazy
+ org.eclipse.papyrus.uml.diagram.clazz lazy
  org.eclipse.papyrus.uml.diagram.composite lazy
  org.eclipse.papyrus.uml.architecture lazy
  
@@ -30,26 +21,8 @@
 //manualUpdate
 location PapyrusDev "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"{
  org.eclipse.papyrus.junit.framework lazy
- org.eclipse.papyrus.junit.framework.source lazy
  org.eclipse.papyrus.junit.utils lazy
+ org.eclipse.papyrus.junit.framework.source lazy
  org.eclipse.papyrus.junit.utils.source lazy
- org.eclipse.papyrus.uml.m2m.qvto.tests.tools lazy
- org.eclipse.papyrus.tests.framework lazy
- org.eclipse.papyrus.tests.framework.source lazy
- 
- org.eclipse.papyrus.tests.framework.annotations.source lazy
 
-}
-
-//manualUpdate
-location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" { // gen
- org.eclipse.gmf.codegen lazy
-}
-
-//manualUpdate
-location sysml "https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository/" {
- org.eclipse.papyrus.sysml lazy
- 
-}
-
-
+}
\ No newline at end of file