[478878] Merge the code and Test builds

Include the tests and their configuration into the base Maven build. Remove the "test specific" targets platforms and update the "build" target platform to include UML2. The test specific build org.eclipse.sirius.tests.parent is not removed but is made empty in order to be able to have Jenkins/hudson jobs which can indiferently launch one layout or the other. Bug: 478878 Change-Id: I9472ab5ee6a5d631cf054d5f809609d7567bec3d Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
author: cbrun 2016-01-29 14:52:49 +0000
committer: Pierre-Charles David 2016-02-19 12:49:32 +0000
commit: 01f8f387b443ff89a75d47e9d90a128972586c4f (patch)
tree: 311298c0b155851412b175243d39fadd0de4f4c4
parent: 3000b64e4b340c905ed62f247dbf386cf29cdcdf (diff)
download: org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.tar.gz
org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.tar.xz
org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.zip
54 files changed, 255 insertions, 1103 deletions
diff --git a/.travis.yml b/.travis.yml
index 0045132d23..7e44f3de4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,5 @@ cache:
   directories:
   - $HOME/.m2
 language: java
-script: "./build-all.sh"
+script: "./build.sh"
 install: true
diff --git a/build-all.sh b/build-all.sh
deleted file mode 100755
index bd39f1298f..0000000000
--- a/build-all.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-set -e
-
-readonly PLATFORM=${1:-mars}
-readonly TESTS_GOAL=${2:-package}
-readonly TESTS_SUITES=${3:-junit,swtbot-sequence,swtbot}
-readonly BASEDIR=$(pwd)
-readonly BUILD_POM="packaging/org.eclipse.sirius.parent/pom.xml"
-readonly TESTS_POM="packaging/org.eclipse.sirius.tests.parent/pom.xml"
-readonly TESTS_SETTINGS="packaging/org.eclipse.sirius.tests.parent/sirius-local-settings.xml"
-readonly USE_P2_MIRRORS="-Declipse.p2.mirrors=true"
-
-# Build Sirius core using the normal Target Platform definition
-mvn -Dplatform-version-name="$PLATFORM" -Declipse.p2.mirrors=$USE_P2_MIRRORS -f "$BUILD_POM" clean package
-
-# Build (and optionally execute) the Sirius test suites, using an
-# adjusted Target Platform which uses the locally build Sirius core
-# instead of the latest published nightly.
-readonly ORIGINAL_SETTINGS=$(mktemp)
-cp "$TESTS_SETTINGS" "$ORIGINAL_SETTINGS"
-sed -i -e "s|@BASEDIR@|$BASEDIR|" "$TESTS_SETTINGS"
-if [ "$OSTYPE" = "msys" ]; then
-    # for windows, replace file:///c/xxx by  file:///c:/xxx
-    sed -r -i -e "s|file:///([A-Za-z]{1})/|file:///\1:/|" "$TESTS_SETTINGS"
-fi
-
-SWT_GTK3=0 mvn -Dplatform-version-name="$PLATFORM"  -Declipse.p2.mirrors=$USE_P2_MIRRORS -s "$TESTS_SETTINGS" -f "$TESTS_POM" -P "$TESTS_SUITES" clean "$TESTS_GOAL"
-mv "$ORIGINAL_SETTINGS" "$TESTS_SETTINGS"
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000000..99123130ff
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+readonly PLATFORM=${1:-mars}
+readonly GOAL=${2:-package}
+readonly TESTS_SUITES=${3:-junit,swtbot-sequence,swtbot}
+readonly BUILD_POM="packaging/org.eclipse.sirius.parent/pom.xml"
+readonly USE_P2_MIRRORS="true"
+
+SWT_GTK3=0 mvn -Dplatform-version-name="$PLATFORM" -Declipse.p2.mirrors="$USE_P2_MIRRORS" -f "$BUILD_POM" -P full,headless,incubation,"$TESTS_SUITES" clean "$GOAL"
diff --git a/packaging/org.eclipse.sirius.parent/pom.xml b/packaging/org.eclipse.sirius.parent/pom.xml
index 219ded73da..7054338d0f 100644
--- a/packaging/org.eclipse.sirius.parent/pom.xml
+++ b/packaging/org.eclipse.sirius.parent/pom.xml
@@ -41,8 +41,41 @@
     <platform-version-name>mars</platform-version-name>
     <target-platform-path>.</target-platform-path>
     <tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/sirius/org.eclipse.sirius.git</tycho.scmUrl>
+    <tests.skipLongTests>false</tests.skipLongTests>
+    <tests.skipUnreliableTests>false</tests.skipUnreliableTests>
+    <tests.timeout>0</tests.timeout>
+    <tests.vmargs.mac />
+    <tests.junit.skip>true</tests.junit.skip>
+    <tests.swtbot.skip>true</tests.swtbot.skip>
+    <tests.junit.include />
+    <tests.swtbot.include />
+    <tests.swtbot-sequence.include />
+    <tests.ignoreFailures>true</tests.ignoreFailures>
   </properties>
 
+<!--Add specific repositories, pluginRepositories and dependencies for Acceleo3 compilation. See http://wiki.eclipse.org/Acceleo/Maven for more details. -->
+  <repositories>
+    <repository>
+      <id>Indigo Release</id>
+      <url>http://www.obeo.fr/download/acceleo/maven/releases/indigo</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>Indigo Release</id>
+      <url>http://www.obeo.fr/download/acceleo/maven/releases/indigo</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.acceleo</groupId>
+      <artifactId>maven</artifactId>
+      <version>3.2.1</version>
+    </dependency>
+  </dependencies>
+
   <modules>
     <!-- All modules are contributed by specific profiles, see below. -->
   </modules>
@@ -220,8 +253,22 @@
           <configuration>
             <defaultP2Metadata>false</defaultP2Metadata>
           </configuration>
-        </plugin>
-      </plugins>
+        </plugin>        
+            <plugin>
+                <groupId>org.eclipse.acceleo</groupId>
+                <artifactId>maven</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <id>acceleo-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>acceleo-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </pluginManagement>
   </build>
 
@@ -330,9 +377,36 @@
 
         <!-- update sites -->
         <module>../../packaging/org.eclipse.sirius.update</module>
-      </modules>
-    </profile>
-    <profile>
+
+        <!-- Test metamodels and modelers -->
+        <module>../../plugins/org.eclipse.sirius.sample.ecore.design</module>
+        <module>../../plugins/org.eclipse.sirius.sample.interactions</module>
+        <module>../../plugins/org.eclipse.sirius.sample.interactions.design</module>
+        <module>../../plugins/org.eclipse.sirius.sample.interactions.edit</module>
+        <module>../../plugins/org.eclipse.sirius.sample.interactions.editor</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.benchmark</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.docbook</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.design</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.edit</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.editor</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.migration</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.migration.design</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.component</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.component.design</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.scxml</module>
+        <module>../../plugins/org.eclipse.sirius.tests.sample.scxml.design</module>
+        <module>../../plugins/org.eclipse.sirius.tests.junit</module>
+        <module>../../plugins/org.eclipse.sirius.tests.tree</module>
+        <module>../../plugins/org.eclipse.sirius.tests.swtbot</module>
+        <!-- features -->
+        <module>../../packaging/org.eclipse.sirius.tests</module>
+
+        <!-- update sites -->
+        <module>../../packaging/org.eclipse.sirius.tests.update</module>
+
+    </modules>
+</profile>
+<profile>
       <id>incubation</id>
       <activation>
         <activeByDefault>true</activeByDefault>
@@ -420,5 +494,104 @@
         </pluginRepository>
       </pluginRepositories>
     </profile>
-  </profiles>
+     <profile>
+         <id>junit</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.junit.skip>false</tests.junit.skip>
+             <tests.timeout>${tests.timeout.junit}</tests.timeout>
+             <tests.junit.include>org/eclipse/sirius/tests/suite/AllSiriusTestSuite.java, org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java</tests.junit.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+         </properties>
+     </profile>
+     <profile>
+         <id>gerrit-junit</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.junit.skip>false</tests.junit.skip>
+             <tests.timeout>${tests.timeout.junit}</tests.timeout>
+             <tests.junit.include>org/eclipse/sirius/tests/suite/GerritJUnitSuite.java, org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java</tests.junit.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+             <tests.ignoreFailures>false</tests.ignoreFailures>
+         </properties>
+     </profile>
+     <profile>
+         <id>swtbot</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.swtbot.skip>false</tests.swtbot.skip>
+             <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+             <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java</tests.swtbot.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+         </properties>
+     </profile>
+     <profile>
+         <id>swtbot-part1</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.swtbot.skip>false</tests.swtbot.skip>
+             <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+             <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/SWTBotPart1Suite.java</tests.swtbot.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+         </properties>
+     </profile>
+     <profile>
+         <id>swtbot-part2</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.swtbot.skip>false</tests.swtbot.skip>
+             <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+             <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/SWTBotPart2Suite.java</tests.swtbot.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+         </properties>
+     </profile>
+     <profile>
+         <id>gerrit-swtbot</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.swtbot.skip>false</tests.swtbot.skip>
+             <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+             <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/GerritSWTBotSuite.java</tests.swtbot.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+             <tests.ignoreFailures>false</tests.ignoreFailures>
+         </properties>
+     </profile>
+     <profile>
+         <id>swtbot-sequence</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.swtbot.skip>false</tests.swtbot.skip>
+             <tests.timeout>${tests.timeout.swtbot-sequence}</tests.timeout>
+             <tests.swtbot-sequence.include>org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java</tests.swtbot-sequence.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+         </properties>
+     </profile>
+     <profile>
+         <id>gerrit-swtbot-sequence</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <properties>
+             <tests.swtbot.skip>false</tests.swtbot.skip>
+             <tests.timeout>${tests.timeout.swtbot-sequence}</tests.timeout>
+             <tests.swtbot-sequence.include>org/eclipse/sirius/tests/swtbot/suite/GerritSequenceSWTBotSuite.java</tests.swtbot-sequence.include>
+             <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+             <tests.ignoreFailures>false</tests.ignoreFailures>
+         </properties>
+     </profile>
+ </profiles>
 </project>
diff --git a/packaging/org.eclipse.sirius.tests.parent/pom.xml b/packaging/org.eclipse.sirius.tests.parent/pom.xml
index f1b4643466..8026e3633a 100644
--- a/packaging/org.eclipse.sirius.tests.parent/pom.xml
+++ b/packaging/org.eclipse.sirius.tests.parent/pom.xml
@@ -59,58 +59,7 @@
     <tests.ignoreFailures>true</tests.ignoreFailures>
   </properties>
 
-  <modules>
-    <!-- Test metamodels and modelers -->
-    <module>../../plugins/org.eclipse.sirius.sample.ecore.design</module>
-    <module>../../plugins/org.eclipse.sirius.sample.interactions</module>
-    <module>../../plugins/org.eclipse.sirius.sample.interactions.design</module>
-    <module>../../plugins/org.eclipse.sirius.sample.interactions.edit</module>
-    <module>../../plugins/org.eclipse.sirius.sample.interactions.editor</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.benchmark</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.docbook</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.design</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.edit</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.editor</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.migration</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.migration.design</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.component</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.component.design</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.scxml</module>
-    <module>../../plugins/org.eclipse.sirius.tests.sample.scxml.design</module>
-    <module>../../plugins/org.eclipse.sirius.tests.junit</module>
-    <module>../../plugins/org.eclipse.sirius.tests.tree</module>
-    <module>../../plugins/org.eclipse.sirius.tests.swtbot</module>
-    <!-- features -->
-    <module>../../packaging/org.eclipse.sirius.tests</module>
-
-    <!-- update sites -->
-    <module>../../packaging/org.eclipse.sirius.tests.update</module>
-  </modules>
-
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <includePackedArtifacts>true</includePackedArtifacts>
-          <resolver>p2</resolver>
-          <dependency-resolution>
-            <optionalDependencies>ignore</optionalDependencies>
-          </dependency-resolution>
-          <target>
-            <artifact>
-              <groupId>org.eclipse.sirius</groupId>
-              <artifactId>sirius-tests-parent</artifactId>
-              <version>4.0.0-SNAPSHOT</version>
-              <classifier>../../releng/org.eclipse.sirius.targets/sirius_tests_${platform-version-name}</classifier>
-            </artifact>
-          </target>
-        </configuration>
-      </plugin>
-    </plugins>
-
     <pluginManagement>
       <plugins>
         <plugin>
diff --git a/packaging/org.eclipse.sirius.tests.update/pom.xml b/packaging/org.eclipse.sirius.tests.update/pom.xml
index 76fb4dddfb..1712b18fb2 100644
--- a/packaging/org.eclipse.sirius.tests.update/pom.xml
+++ b/packaging/org.eclipse.sirius.tests.update/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.update</artifactId>
diff --git a/packaging/org.eclipse.sirius.tests/pom.xml b/packaging/org.eclipse.sirius.tests/pom.xml
index 3947b66e41..15a3e276bd 100644
--- a/packaging/org.eclipse.sirius.tests/pom.xml
+++ b/packaging/org.eclipse.sirius.tests/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests</artifactId>
diff --git a/plugins/org.eclipse.sirius.sample.ecore.design/pom.xml b/plugins/org.eclipse.sirius.sample.ecore.design/pom.xml
index 60c70ba4c5..788d969d89 100644
--- a/plugins/org.eclipse.sirius.sample.ecore.design/pom.xml
+++ b/plugins/org.eclipse.sirius.sample.ecore.design/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.sample.ecore.design</artifactId>
diff --git a/plugins/org.eclipse.sirius.sample.interactions.design/pom.xml b/plugins/org.eclipse.sirius.sample.interactions.design/pom.xml
index e04664c804..ddd9264793 100644
--- a/plugins/org.eclipse.sirius.sample.interactions.design/pom.xml
+++ b/plugins/org.eclipse.sirius.sample.interactions.design/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.sample.interactions.design</artifactId>
diff --git a/plugins/org.eclipse.sirius.sample.interactions.edit/pom.xml b/plugins/org.eclipse.sirius.sample.interactions.edit/pom.xml
index 512b658903..2a50bfbc00 100644
--- a/plugins/org.eclipse.sirius.sample.interactions.edit/pom.xml
+++ b/plugins/org.eclipse.sirius.sample.interactions.edit/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
   
   <artifactId>org.eclipse.sirius.sample.interactions.edit</artifactId>
diff --git a/plugins/org.eclipse.sirius.sample.interactions.editor/pom.xml b/plugins/org.eclipse.sirius.sample.interactions.editor/pom.xml
index 0e3ff7b595..cf310a6f82 100644
--- a/plugins/org.eclipse.sirius.sample.interactions.editor/pom.xml
+++ b/plugins/org.eclipse.sirius.sample.interactions.editor/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.sample.interactions.editor</artifactId>
diff --git a/plugins/org.eclipse.sirius.sample.interactions/pom.xml b/plugins/org.eclipse.sirius.sample.interactions/pom.xml
index 6c30c91762..f084ccbbd3 100644
--- a/plugins/org.eclipse.sirius.sample.interactions/pom.xml
+++ b/plugins/org.eclipse.sirius.sample.interactions/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.sample.interactions</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.junit/pom.xml b/plugins/org.eclipse.sirius.tests.junit/pom.xml
index ca2044a81c..e61c0165f4 100644
--- a/plugins/org.eclipse.sirius.tests.junit/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.junit/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.junit</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.benchmark/pom.xml b/plugins/org.eclipse.sirius.tests.sample.benchmark/pom.xml
index 0ace9d20af..4e9bda5c3b 100644
--- a/plugins/org.eclipse.sirius.tests.sample.benchmark/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.benchmark/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.benchmark</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.component.design/pom.xml b/plugins/org.eclipse.sirius.tests.sample.component.design/pom.xml
index 546937a428..d2d214c4b2 100644
--- a/plugins/org.eclipse.sirius.tests.sample.component.design/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.component.design/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.component.design</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.component/pom.xml b/plugins/org.eclipse.sirius.tests.sample.component/pom.xml
index 900129982d..a48a9cfbe6 100644
--- a/plugins/org.eclipse.sirius.tests.sample.component/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.component/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.component</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.design/pom.xml b/plugins/org.eclipse.sirius.tests.sample.docbook.design/pom.xml
index 6f7fc27498..bbe5e13955 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook.design/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook.design/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.docbook.design</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.edit/pom.xml b/plugins/org.eclipse.sirius.tests.sample.docbook.edit/pom.xml
index e0790cb46b..70285df55a 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook.edit/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook.edit/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.docbook.edit</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.editor/pom.xml b/plugins/org.eclipse.sirius.tests.sample.docbook.editor/pom.xml
index 26566c8d91..a50208325e 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook.editor/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook.editor/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.docbook.editor</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook/pom.xml b/plugins/org.eclipse.sirius.tests.sample.docbook/pom.xml
index ad81a6cb73..8e1ddea89e 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.docbook</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.migration.design/pom.xml b/plugins/org.eclipse.sirius.tests.sample.migration.design/pom.xml
index 0723f64a5c..4bd00caf1f 100644
--- a/plugins/org.eclipse.sirius.tests.sample.migration.design/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.migration.design/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.migration.design</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.migration/pom.xml b/plugins/org.eclipse.sirius.tests.sample.migration/pom.xml
index 96b947b9b6..b293006efb 100644
--- a/plugins/org.eclipse.sirius.tests.sample.migration/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.migration/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.migration</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.scxml.design/pom.xml b/plugins/org.eclipse.sirius.tests.sample.scxml.design/pom.xml
index c9ad8cb959..74bb95915c 100644
--- a/plugins/org.eclipse.sirius.tests.sample.scxml.design/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.scxml.design/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.scxml.design</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.sample.scxml/pom.xml b/plugins/org.eclipse.sirius.tests.sample.scxml/pom.xml
index 0a9396fbe3..4ae4e04024 100644
--- a/plugins/org.eclipse.sirius.tests.sample.scxml/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.sample.scxml/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.sample.scxml</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/pom.xml b/plugins/org.eclipse.sirius.tests.swtbot/pom.xml
index 55cc0aba3d..ba23090d41 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.swtbot/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.swtbot</artifactId>
diff --git a/plugins/org.eclipse.sirius.tests.tree/pom.xml b/plugins/org.eclipse.sirius.tests.tree/pom.xml
index 0186eb5d69..cbae5a2016 100644
--- a/plugins/org.eclipse.sirius.tests.tree/pom.xml
+++ b/plugins/org.eclipse.sirius.tests.tree/pom.xml
@@ -16,9 +16,9 @@
 
   <parent>
     <groupId>org.eclipse.sirius</groupId>
-    <artifactId>sirius-tests-parent</artifactId>
+    <artifactId>sirius-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+    <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.sirius.tests.tree</artifactId>
diff --git a/releng/org.eclipse.sirius.releng/gerrit-verify.sh b/releng/org.eclipse.sirius.releng/gerrit-verify.sh
deleted file mode 100644
index 4fdf7cbce3..0000000000
--- a/releng/org.eclipse.sirius.releng/gerrit-verify.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# ====================================================================
-# Copyright (c) 2015 Obeo
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Obeo - initial API and implementation
-# ====================================================================
-
-
-# Make sure the Xvnc server is completely started by looking for its output in the current job's console
-wait_for_xvnc() {
-    local readonly message="Listening for VNC connections on TCP port"
-    local readonly logFileURL="https://hudson.eclipse.org/sirius/job/sirius.gerrit/$BUILD_NUMBER/PLATFORM=$PLATFORM,SUITE=$SUITE/consoleText"
-
-    sleep 5
-
-    local attempt=1
-    while ! ( curl -s "$logFileURL" | grep -q " $message " ); do
-        sleep 5
-        if [ "$attempt" -gt "4" ]; then
-            echo "Xvnc not ready; abandonning."
-            exit 1
-        else
-            attempt=$(( attempt + 1 ))
-        fi
-    done
-}
-
-# Make sure we have a properly configured window manager for SWTbot tests
-start_window_manager() {
-    /usr/bin/metacity --display="$DISPLAY" --replace --sm-disable &
-    export WM_PID="$!"
-    sleep 1
-    /usr/bin/metacity-message disable-keybindings
-}
-
-kill_window_manager() {
-    if ps --pid "$WM_PID" -o pid,args | grep -q metacity ; then
-        kill "$WM_PID"
-    fi
-}
-
-# Create a well-formed but empty test report so that tests result
-# publication does not fail even in the matrix cells where we do not
-# actually run any tests.
-create_dummy_test_report() {
-    local readonly REPORT_DIR="$WORKSPACE/plugins/org.eclipse.sirius.tests.junit/target/surefire-reports"
-    local readonly REPORT='<?xml version="1.0" encoding="UTF-8"?><testrun name="Sirius Dummy Test Suite" project="org.eclipse.sirius.tests.unit" tests="1" started="0" failures="0" errors="0" ignored="1"><testsuite name="Sirius Dummy Tests" time="0.001"><testcase name="testNothingJustToMakeHudsonHappy" classname="org.eclipse.sirius.tests.unit.DummyTest" time="0.01"/></testsuite></testrun>'
-    mkdir -p "$REPORT_DIR"
-    echo  "$REPORT" > "$REPORT_DIR/empty-test-results.xml"
-}
-
-# Adjust the target platform used to build/execute the tests to consume the local version of the core we just built
-adjust_tests_target_platform() {
-    if [ "$GERRIT_BRANCH" = "master" ]; then
-        export STREAM="latest"
-    else
-        export STREAM=$(echo "$GERRIT_BRANCH" | sed -e 's/v//')
-    fi
-    sed -i -e "s!http://download.eclipse.org/sirius/updates/nightly/$STREAM/$PLATFORM!file://$WORKSPACE/packaging/org.eclipse.sirius.update/target/repository!" "releng/org.eclipse.sirius.targets/sirius_tests_$PLATFORM.target"
-}
-
-invoke_maven() {
-    /shared/common/apache-maven-latest/bin/mvn -V -B -DBUILD_SIGN=false -Dmaven.repo.local="$WORKSPACE/.maven/repo" -DPLATFORM="$PLATFORM" -Dplatform-version-name="$PLATFORM" "$@"
-}
-
-remove_cached_sirius_bundles() {
-    find "$WORKSPACE/.maven/repo/p2/osgi/bundle" -type d -name "org.eclipse.sirius.*" -print0 | xargs -0 rm -rf
-}
-
-readonly REFERENCE_PLATFORM="luna"
-if [ "$PLATFORM" = "$REFERENCE_PLATFORM" -o "$SUITE" = "gerrit-junit" ]; then
-    remove_cached_sirius_bundles
-    # Build Sirius core
-    invoke_maven -f packaging/org.eclipse.sirius.parent/pom.xml clean package
-    export BUILD_RESULT="$?"
-    echo "BUILD_RESULT=$BUILD_RESULT"
-
-    # Build the tests, and run them on the reference platform
-    if [ "$GERRIT_BRANCH" = "master" -a "$PLATFORM" = "$REFERENCE_PLATFORM" ]; then
-        # Build and run Sirius tests
-        wait_for_xvnc
-        start_window_manager
-        adjust_tests_target_platform
-        if [ "$PLATFORM" = "luna" ]; then
-            # Gtk3 support under Luna can lead to crashes (looks like resource leaks inside the X server),
-            # so for the use of Gtk2 in this case.
-            export SWT_GTK3=0
-        fi
-        invoke_maven -f packaging/org.eclipse.sirius.tests.parent/pom.xml -P"$SUITE" clean integration-test
-        readonly TESTS_RESULT="$?"
-        echo "TESTS_RESULT=$TESTS_RESULT"
-        kill_window_manager
-    else
-        # Build Sirius tests but do not execute them
-        adjust_tests_target_platform
-        invoke_maven -f packaging/org.eclipse.sirius.tests.parent/pom.xml clean package
-        readonly TESTS_RESULT="$?"
-        echo "TESTS_RESULT=$TESTS_RESULT"
-        create_dummy_test_report
-    fi
-else
-    export BUILD_RESULT="0"
-    export TESTS_RESULT="0"
-    create_dummy_test_report
-fi
-
-# if [[ "$BUILD_RESULT" = 0 && "$TESTS_RESULT" = 0 ]]; then
-#   exit 0
-# else
-echo "BUILD_RESULT=$BUILD_RESULT"
-echo "TESTS_RESULT=$TESTS_RESULT"
-#   exit 1
-# fi
diff --git a/releng/org.eclipse.sirius.targets/sirius_canary.target b/releng/org.eclipse.sirius.targets/sirius_canary.target
index e964e47591..9d4befd14b 100644
--- a/releng/org.eclipse.sirius.targets/sirius_canary.target
+++ b/releng/org.eclipse.sirius.targets/sirius_canary.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="sirius_canary" sequenceNumber="1453196141">
+<target name="sirius_canary" sequenceNumber="1455886019">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -16,9 +16,9 @@
       <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.ide" version="4.6.0.I20160112-1800"/>
-      <unit id="org.eclipse.platform.sdk" version="4.6.0.I20160112-1800"/>
-      <unit id="org.eclipse.sdk.ide" version="4.6.0.I20160112-1800"/>
+      <unit id="org.eclipse.platform.ide" version="4.6.0.I20160216-1400"/>
+      <unit id="org.eclipse.platform.sdk" version="4.6.0.I20160216-1400"/>
+      <unit id="org.eclipse.sdk.ide" version="4.6.0.I20160216-1400"/>
       <repository id="Eclipse-Neon-Integration" location="http://download.eclipse.org/eclipse/updates/4.6-I-builds"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/sirius_juno.target b/releng/org.eclipse.sirius.targets/sirius_juno.target
index 39a18f751f..b78c2f9f29 100644
--- a/releng/org.eclipse.sirius.targets/sirius_juno.target
+++ b/releng/org.eclipse.sirius.targets/sirius_juno.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="sirius_juno" sequenceNumber="1453196349">
+<target name="sirius_juno" sequenceNumber="1454078490">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.1.201601141612"/>
@@ -72,6 +72,7 @@
       <unit id="org.eclipse.platform" version="4.2.2.v201302041200"/>
       <unit id="org.eclipse.rcp" version="4.2.1.v201302041200"/>
       <unit id="org.eclipse.sdk" version="4.2.2.v201302041200"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="4.0.2.v20130114-0902"/>
       <repository id="Eclipse-Juno" location="http://download.eclipse.org/releases/juno"/>
     </location>
   </locations>
diff --git a/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform b/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform
index 8ea9a9a306..6bdaeb4a97 100644
--- a/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform
@@ -37,4 +37,5 @@ location Eclipse-Juno "http://download.eclipse.org/releases/juno" {
         org.eclipse.platform [4.2.1,4.3.0)
         org.eclipse.rcp [4.2.1,4.3.0)
         org.eclipse.sdk [4.2.2,4.3.0)
+        org.eclipse.uml2.sdk.feature.group [4.0.0,4.1.0)
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_kepler.target b/releng/org.eclipse.sirius.targets/sirius_kepler.target
index a7a912fbec..b30076554f 100644
--- a/releng/org.eclipse.sirius.targets/sirius_kepler.target
+++ b/releng/org.eclipse.sirius.targets/sirius_kepler.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="sirius_kepler" sequenceNumber="1453196376">
+<target name="sirius_kepler" sequenceNumber="1454078490">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.1.201601141612"/>
@@ -72,6 +72,7 @@
       <unit id="org.eclipse.ocl.core.sdk.feature.group" version="4.1.0.v20140120-1508"/>
       <unit id="org.eclipse.platform.feature.group" version="4.3.2.v20140221-1852"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.3.2.v20140221-1852"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="4.1.2.v20140202-2055"/>
       <repository id="Eclipse-Kepler" location="http://download.eclipse.org/releases/kepler"/>
     </location>
   </locations>
diff --git a/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform b/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform
index c329b03683..3278bfefc7 100644
--- a/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform
@@ -37,4 +37,5 @@ location Eclipse-Kepler "http://download.eclipse.org/releases/kepler" {
         org.eclipse.ocl.core.sdk.feature.group [4.0.0,5.0.0)
         org.eclipse.platform.feature.group [4.3.0,4.4.0)
         org.eclipse.sdk.feature.group [4.3.0,4.4.0)
+        org.eclipse.uml2.sdk.feature.group [4.1.1,4.2.0)
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_luna.target b/releng/org.eclipse.sirius.targets/sirius_luna.target
index 97b436d0ea..7f306af755 100644
--- a/releng/org.eclipse.sirius.targets/sirius_luna.target
+++ b/releng/org.eclipse.sirius.targets/sirius_luna.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="sirius_luna" sequenceNumber="1453196437">
+<target name="sirius_luna" sequenceNumber="1454078474">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.1.201601141612"/>
@@ -66,6 +66,7 @@
       <unit id="org.eclipse.platform.feature.group" version="4.4.2.v20150204-1700"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.4.2.v20150204-1700"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="2.6.0.v201405210727"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.0.2.v20150202-0947"/>
       <repository id="Eclipse-Luna" location="http://download.eclipse.org/releases/luna"/>
     </location>
   </locations>
diff --git a/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform b/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform
index 857c0571e6..5598700465 100644
--- a/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform
@@ -34,4 +34,5 @@ location Eclipse-Luna "http://download.eclipse.org/releases/luna" {
         org.eclipse.platform.feature.group [4.4.0,4.5.0)
         org.eclipse.sdk.feature.group [4.4.0,4.5.0)
         org.eclipse.xtext.sdk.feature.group [2.5.0,2.7.0)
+        org.eclipse.uml2.sdk.feature.group [5.0.0,5.1.0)
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_mars.target b/releng/org.eclipse.sirius.targets/sirius_mars.target
index cbd3c48b16..0cc2e2bd2c 100644
--- a/releng/org.eclipse.sirius.targets/sirius_mars.target
+++ b/releng/org.eclipse.sirius.targets/sirius_mars.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="sirius_mars" sequenceNumber="1453197452">
+<target name="sirius_mars" sequenceNumber="1454078474">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -66,6 +66,7 @@
       <unit id="org.eclipse.platform.feature.group" version="4.5.1.v20150904-0015"/>
       <unit id="org.eclipse.sdk.feature.group" version="4.5.1.v20150904-0345"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="2.8.4.v201508050135"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
       <repository id="Eclipse-Mars" location="http://download.eclipse.org/releases/mars"/>
     </location>
   </locations>
diff --git a/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform b/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform
index 82f1d87ff2..0a6013ce40 100644
--- a/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform
@@ -34,4 +34,5 @@ location Eclipse-Mars "http://download.eclipse.org/releases/mars" {
         org.eclipse.platform.feature.group [4.5.0,4.6.0)
         org.eclipse.sdk.feature.group [4.5.0,4.6.0)
         org.eclipse.xtext.sdk.feature.group [2.8.0,2.9.0)
+        org.eclipse.uml2.sdk.feature.group lazy
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_neon.target b/releng/org.eclipse.sirius.targets/sirius_neon.target
index 6e02a64ca5..ecac88e0b6 100644
--- a/releng/org.eclipse.sirius.targets/sirius_neon.target
+++ b/releng/org.eclipse.sirius.targets/sirius_neon.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="sirius_neon" sequenceNumber="1450084770">
+<target name="sirius_neon" sequenceNumber="1454078474">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -63,6 +63,7 @@
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
       <repository id="Eclipse-Neon" location="http://download.eclipse.org/releases/neon"/>
     </location>
   </locations>
diff --git a/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform b/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform
index f701666a05..b06b4c880d 100644
--- a/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_neon.targetplatform
@@ -34,4 +34,5 @@ location Eclipse-Neon "http://download.eclipse.org/releases/neon" {
 	org.eclipse.platform.feature.group lazy
 	org.eclipse.sdk.feature.group lazy
 	org.eclipse.xtext.sdk.feature.group lazy
+	org.eclipse.uml2.sdk.feature.group lazy
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_staging.target b/releng/org.eclipse.sirius.targets/sirius_staging.target
index 59784bb3a5..847d71dc6f 100644
--- a/releng/org.eclipse.sirius.targets/sirius_staging.target
+++ b/releng/org.eclipse.sirius.targets/sirius_staging.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="sirius_staging" sequenceNumber="1449676695">
+<target name="sirius_staging" sequenceNumber="1454078474">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -59,6 +59,7 @@
       <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
       <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
       <repository id="Eclipse-Staging" location="http://download.eclipse.org/releases/staging"/>
     </location>
   </locations>
diff --git a/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform b/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform
index d2036c0511..edfe84244c 100644
--- a/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_staging.targetplatform
@@ -35,4 +35,5 @@ location Eclipse-Staging "http://download.eclipse.org/releases/staging" {
         org.eclipse.acceleo.feature.group lazy
         org.eclipse.acceleo.ide.ui lazy
         org.eclipse.acceleo.query.feature.group lazy
+        org.eclipse.uml2.sdk.feature.group lazy
 }
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_canary.target b/releng/org.eclipse.sirius.targets/sirius_tests_canary.target
deleted file mode 100644
index 5605124774..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_canary.target
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<<<<<<< HEAD
-<target name="sirius_tests_canary" sequenceNumber="1453197181">
-=======
-<target name="sirius_tests_canary" sequenceNumber="1451987502">
->>>>>>> 3341266... [478878] Remove query-legacy from the tests target platforms
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.ide" version="4.6.0.I20160112-1800"/>
-      <unit id="org.eclipse.platform.sdk" version="4.6.0.I20160112-1800"/>
-      <unit id="org.eclipse.sdk.ide" version="4.6.0.I20160112-1800"/>
-      <repository id="Eclipse-Neon-Integration" location="http://download.eclipse.org/eclipse/updates/4.6-I-builds"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="org.junit" version="0.0.0"/>
-      <unit id="org.hamcrest.core" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <unit id="org.apache.log4j" version="0.0.0"/>
-      <unit id="org.easymock" version="0.0.0"/>
-      <repository id="Orbit-Recommended" location="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-R"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
-      <repository id="GEF-LastSuccessful" location="https://hudson.eclipse.org/gef/job/gef-master/lastSuccessfulBuild/artifact/update-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
-      <repository id="SWTBot-LastSuccessful" location="https://hudson.eclipse.org/swtbot/job/swtbot-tycho/ws/org.eclipse.swtbot.updatesite/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-      <repository id="EMF-LastSuccessful" location="https://hudson.eclipse.org/xtext/view/EMF/job/emf-core/lastSuccessfulBuild/artifact/build-result/p2.repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <repository id="UML2-LastSuccessful" location="https://hudson.eclipse.org/uml2/job/mdt-uml2-master/lastSuccessfulBuild/artifact/UML2.p2.repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.ocl.all.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
-      <repository id="OCL-LastSuccessful" location="https://hudson.eclipse.org/ocl/job/buckminster-ocl-core-luna-master/lastSuccessfulBuild/artifact/MDT-OCL.p2.repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
-      <repository id="EMF-Validation-LastSuccessful" location="https://hudson.eclipse.org/validation/job/emf-validation-master/lastSuccessfulBuild/artifact/update-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
-      <repository id="EMF-Query-LastSuccessful" location="https://hudson.eclipse.org/query/job/emf-query-master/lastSuccessfulBuild/artifact/update-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <repository id="EMF-Transaction-LastSuccessful" location="https://hudson.eclipse.org/transaction/job/emf-transaction-master/lastSuccessfulBuild/artifact/update-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime" version="0.0.0"/>
-      <repository id="EEF-1.5" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <repository id="Acceleo-LastSuccessful" location="https://hudson.eclipse.org/acceleo/job/acceleo-master/lastSuccessfulBuild/artifact/releng/org.eclipse.acceleo-updatesite/target/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <repository id="EMF-Compare-Nightly" location="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-LastSuccessful" location="https://hudson.eclipse.org/gmf-notation/job/gmf-notation-master/lastSuccessfulBuild/artifact/update-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-LastSuccessful" location="https://hudson.eclipse.org/gmf-runtime/job/gmf-runtime-master/lastSuccessfulBuild/artifact/update-site/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository id="XText-Latest" location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/latest/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
-      <repository id="Sirius4Tests" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_canary.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_canary.targetplatform
deleted file mode 100644
index e5d5733612..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_canary.targetplatform
+++ /dev/null
@@ -1,22 +0,0 @@
-target "sirius_tests_canary"
-
-include "sirius_canary.targetplatform"
-
-with source, requirements
-
-location Sirius4Tests "http://download.eclipse.org/sirius/updates/nightly/latest/neon" {
-        org.eclipse.sirius.doc.feature.feature.group lazy
-        org.eclipse.sirius.runtime.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.feature.group lazy
-        org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-        org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
-        org.eclipse.sirius.runtime.ocl.feature.group lazy
-        org.eclipse.sirius.runtime.aql.feature.group lazy
-        org.eclipse.sirius.samples.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.feature.group lazy
-        org.eclipse.sirius.tests.support.feature.group lazy
-}
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target b/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
deleted file mode 100644
index a0f7f33609..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_juno" sequenceNumber="1453197307">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.1.201601141612"/>
-      <repository id="EEF-1.5" 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.emf.compare.feature.group" version="2.1.2.201310031412"/>
-      <repository id="EMF-Compare-2_1" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/2.1"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.forms.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="2.1.1.201307101628"/>
-      <repository id="SWTBot-2_1" location="http://download.eclipse.org/technology/swtbot/releases/2.1.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.3.1.v201208210947"/>
-      <repository id="XText-2_3" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
-      <repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
-      <repository id="Sirius4Tests" location="http://download.eclipse.org/sirius/updates/nightly/latest/juno"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="4.0.2.v20130114-0902"/>
-      <unit id="com.ibm.icu" version="4.4.2.v20110823"/>
-      <unit id="org.eclipse.draw2d.feature.group" version="3.9.0.201212170307"/>
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="3.9.0.201212170307"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="2.8.0.v20130125-0546"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="2.8.3.v20130125-0546"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="2.8.0.v20130125-0826"/>
-      <unit id="org.eclipse.emf.feature.group" version="2.8.3.v20130125-0826"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="1.6.0.v20120328-0001-377-8s734C3E7D15D6B"/>
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.6.0.v20120328-0001-67T-96SGR75UNqZNTdeQnghI6uFA"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="1.6.0.v20120328-0001-37708s734E377I3B4C2"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.9.0.201212170307"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.6.0.v20120327-2213-47F08xGD6FxMBN7CJFV3CIKK9t84"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.6.2.201302122140"/>
-      <unit id="org.eclipse.jdt" version="3.8.1.v201302041200"/>
-      <unit id="org.eclipse.ocl.all.feature.group" version="4.0.2.v20130128-1158"/>
-      <unit id="org.eclipse.pde" version="3.8.0.v201302041200"/>
-      <unit id="org.eclipse.platform" version="4.2.2.v201302041200"/>
-      <unit id="org.eclipse.rcp" version="4.2.1.v201302041200"/>
-      <unit id="org.eclipse.sdk" version="4.2.2.v201302041200"/>
-      <repository id="Eclipse-Juno" location="http://download.eclipse.org/releases/juno"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_juno.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_juno.targetplatform
deleted file mode 100644
index 9745af4a1b..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_juno.targetplatform
+++ /dev/null
@@ -1,26 +0,0 @@
-target "sirius_tests_juno"
-
-include "sirius_juno.targetplatform"
-
-with source, requirements
-
-location Sirius4Tests "http://download.eclipse.org/sirius/updates/nightly/latest/juno" {
-        org.eclipse.sirius.doc.feature.feature.group lazy
-        org.eclipse.sirius.runtime.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.feature.group lazy
-        org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-        org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
-        org.eclipse.sirius.runtime.ocl.feature.group lazy
-        org.eclipse.sirius.runtime.aql.feature.group lazy
-        org.eclipse.sirius.samples.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.feature.group lazy
-        org.eclipse.sirius.tests.support.feature.group lazy
-}
-
-location Eclipse-Juno "http://download.eclipse.org/releases/juno" {
-	org.eclipse.uml2.sdk.feature.group [4.0.0,4.1.0)
-}
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target
deleted file mode 100644
index 49c4d97b9f..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_kepler" sequenceNumber="1454061482">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.1.201601141612"/>
-      <repository id="EEF-1.5" 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.emf.compare.feature.group" version="2.1.2.201310031412"/>
-      <repository id="EMF-Compare-2_1" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/2.1"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.forms.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="2.1.1.201307101628"/>
-      <repository id="SWTBot-2_1" location="http://download.eclipse.org/technology/swtbot/releases/2.1.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.4.3.v201309030823"/>
-      <repository id="XText-2_4" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
-      <repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
-      <repository id="Sirius4Tests" location="http://download.eclipse.org/sirius/updates/nightly/latest/kepler"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="4.1.2.v20140202-2055"/>
-      <unit id="com.ibm.icu" version="50.1.1.v201304230130"/>
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="3.9.1.201308190730"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="2.9.2.v20131212-0545"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="2.9.2.v20131212-0545"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="2.9.0.v20140203-1126"/>
-      <unit id="org.eclipse.emf.feature.group" version="2.9.2.v20140203-1126"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.9.2.v20140203-1126"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="1.7.0.201306111400"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.7.0.201306111400"/>
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.7.0.201306111341"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="1.7.0.201306111400"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.9.0.v20140221-1852"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.9.1.201308190730"/>
-      <unit id="org.eclipse.gef.sdk.feature.group" version="3.9.1.201308190730"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.7.0.201306101425"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.7.0.201306111432"/>
-      <unit id="org.eclipse.ocl.all.feature.group" version="4.1.0.v20140120-1508"/>
-      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="4.1.0.v20140120-1508"/>
-      <unit id="org.eclipse.platform.feature.group" version="4.3.2.v20140221-1852"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.3.2.v20140221-1852"/>
-      <repository id="Eclipse-Kepler" location="http://download.eclipse.org/releases/kepler"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.targetplatform
deleted file mode 100644
index 17572f26ff..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.targetplatform
+++ /dev/null
@@ -1,26 +0,0 @@
-target "sirius_tests_kepler"
-
-include "sirius_kepler.targetplatform"
-
-with source, requirements
-
-location Sirius4Tests "http://download.eclipse.org/sirius/updates/nightly/latest/kepler" {
-        org.eclipse.sirius.doc.feature.feature.group lazy
-        org.eclipse.sirius.runtime.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.feature.group lazy
-        org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-        org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
-        org.eclipse.sirius.runtime.ocl.feature.group lazy
-        org.eclipse.sirius.runtime.aql.feature.group lazy
-        org.eclipse.sirius.samples.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.feature.group lazy
-        org.eclipse.sirius.tests.support.feature.group lazy
-}
-
-location Eclipse-Kepler "http://download.eclipse.org/releases/kepler" {
-	org.eclipse.uml2.sdk.feature.group [4.1.1,4.2.0)
-}
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_luna.target b/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
deleted file mode 100644
index 0a6828233e..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_luna" sequenceNumber="1453197367">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.1.201601141612"/>
-      <repository id="EEF-1.5" 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.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.forms.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="2.1.1.201307101628"/>
-      <repository id="SWTBot-2_1" location="http://download.eclipse.org/technology/swtbot/releases/2.1.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
-      <repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
-      <repository id="Sirius4Tests" location="http://download.eclipse.org/sirius/updates/nightly/latest/luna"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="5.0.2.v20150202-0947"/>
-      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
-      <unit id="com.ibm.icu" version="52.1.1.v201501240615"/>
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="3.9.101.201408150207"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="2.10.1.v20150123-0348"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.0.2.201501201328"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="2.10.2.v20150123-0348"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="2.10.1.v20150123-0452"/>
-      <unit id="org.eclipse.emf.feature.group" version="2.10.2.v20150123-0452"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.10.2.v20150123-0452"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="1.8.0.201405281451"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.8.0.201405281451"/>
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.8.0.201405281429"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="1.8.0.201405281451"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.10.2.v20150204-1316"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.9.101.201408150207"/>
-      <unit id="org.eclipse.gef.sdk.feature.group" version="3.9.101.201408150207"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.8.0.201405281433"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.8.1.201408201453"/>
-      <unit id="org.eclipse.ocl.all.feature.group" version="5.0.2.v20140725-2242"/>
-      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="5.0.2.v20140725-2242"/>
-      <unit id="org.eclipse.platform.feature.group" version="4.4.2.v20150204-1700"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.4.2.v20150204-1700"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.6.0.v201405210727"/>
-      <repository id="Eclipse-Luna" location="http://download.eclipse.org/releases/luna"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_luna.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_luna.targetplatform
deleted file mode 100644
index 588ef5c922..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_luna.targetplatform
+++ /dev/null
@@ -1,26 +0,0 @@
-target "sirius_tests_luna"
-
-include "sirius_luna.targetplatform"
-
-with source, requirements
-
-location Sirius4Tests "http://download.eclipse.org/sirius/updates/nightly/latest/luna" {
-        org.eclipse.sirius.doc.feature.feature.group lazy
-        org.eclipse.sirius.runtime.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.feature.group lazy
-        org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-        org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
-        org.eclipse.sirius.runtime.ocl.feature.group lazy
-        org.eclipse.sirius.runtime.aql.feature.group lazy
-        org.eclipse.sirius.samples.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.feature.group lazy
-        org.eclipse.sirius.tests.support.feature.group lazy
-}
-
-location Eclipse-Luna "http://download.eclipse.org/releases/luna" {
-	org.eclipse.uml2.sdk.feature.group [5.0.0,5.1.0)
-}
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_mars.target b/releng/org.eclipse.sirius.targets/sirius_tests_mars.target
deleted file mode 100644
index 91cdff7a7b..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_mars.target
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_mars" sequenceNumber="1454061465">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.forms.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="2.1.1.201307101628"/>
-      <repository id="SWTBot-2_1" location="http://download.eclipse.org/technology/swtbot/releases/2.1.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
-      <repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.1.201601141612"/>
-      <repository id="EEF-1.5" 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.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
-      <repository id="Sirius4Tests" location="http://download.eclipse.org/sirius/updates/nightly/latest/mars"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
-      <unit id="com.ibm.icu" version="54.1.1.v201501272100"/>
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="3.10.1.201508170204"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="2.11.0.v20150805-0538"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.1.1.201509120604"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="2.11.1.v20150805-0538"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="2.11.1.v20150806-0404"/>
-      <unit id="org.eclipse.emf.feature.group" version="2.11.1.v20150806-0404"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.11.1.v20150806-0404"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="1.9.0.201506010221"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.9.0.201506010221"/>
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.9.0.201505312255"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="1.9.0.201506010221"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.11.1.v20150831-1342"/>
-      <unit id="org.eclipse.gef.feature.group" version="3.10.1.201508170204"/>
-      <unit id="org.eclipse.gef.sdk.feature.group" version="3.10.1.201508170204"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.9.0.201505312221"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.9.0.201506060219"/>
-      <unit id="org.eclipse.ocl.all.feature.group" version="5.1.0.v20150525-1635"/>
-      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="5.1.0.v20150525-1635"/>
-      <unit id="org.eclipse.platform.feature.group" version="4.5.1.v20150904-0015"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.5.1.v20150904-0345"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.8.4.v201508050135"/>
-      <repository id="Eclipse-Mars" location="http://download.eclipse.org/releases/mars"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_mars.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_mars.targetplatform
deleted file mode 100644
index 73735231ab..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_mars.targetplatform
+++ /dev/null
@@ -1,26 +0,0 @@
-target "sirius_tests_mars"
-
-include "sirius_mars.targetplatform"
-
-with source, requirements
-
-location Sirius4Tests "http://download.eclipse.org/sirius/updates/nightly/latest/mars" {
-        org.eclipse.sirius.doc.feature.feature.group lazy
-        org.eclipse.sirius.runtime.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.feature.group lazy
-        org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-        org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
-        org.eclipse.sirius.runtime.ocl.feature.group lazy
-        org.eclipse.sirius.runtime.aql.feature.group lazy
-        org.eclipse.sirius.samples.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.feature.group lazy
-        org.eclipse.sirius.tests.support.feature.group lazy
-}
-
-location Eclipse-Mars "http://download.eclipse.org/releases/mars" {
-	org.eclipse.uml2.sdk.feature.group lazy
-}
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_neon.target b/releng/org.eclipse.sirius.targets/sirius_tests_neon.target
deleted file mode 100644
index fc3c17d47f..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_neon.target
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_neon" sequenceNumber="1451987450">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.forms.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="2.1.1.201307101628"/>
-      <repository id="SWTBot-2_1" location="http://download.eclipse.org/technology/swtbot/releases/2.1.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
-      <repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
-      <repository id="Sirius4Tests" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="com.ibm.icu" version="0.0.0"/>
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.eef.runtime" version="0.0.0"/>
-      <unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ocl.all.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Neon" location="http://download.eclipse.org/releases/neon"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_neon.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_neon.targetplatform
deleted file mode 100644
index 4e1296d566..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_neon.targetplatform
+++ /dev/null
@@ -1,26 +0,0 @@
-target "sirius_tests_neon"
-
-include "sirius_neon.targetplatform"
-
-with source, requirements
-
-location Sirius4Tests "http://download.eclipse.org/sirius/updates/nightly/latest/neon" {
-        org.eclipse.sirius.doc.feature.feature.group lazy
-        org.eclipse.sirius.runtime.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.feature.group lazy
-        org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-        org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
-        org.eclipse.sirius.runtime.ocl.feature.group lazy
-        org.eclipse.sirius.runtime.aql.feature.group lazy
-        org.eclipse.sirius.samples.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.feature.group lazy
-        org.eclipse.sirius.tests.support.feature.group lazy
-}
-
-location Eclipse-Neon "http://download.eclipse.org/releases/neon" {
-	org.eclipse.uml2.sdk.feature.group lazy
-}
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_staging.target b/releng/org.eclipse.sirius.targets/sirius_tests_staging.target
deleted file mode 100644
index ee87fdc5d1..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_staging.target
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_staging" sequenceNumber="1451987345">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.forms.feature.group" version="2.1.1.201307101628"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="2.1.1.201307101628"/>
-      <repository id="SWTBot-2_1" location="http://download.eclipse.org/technology/swtbot/releases/2.1.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.common.interpreter" version="0.0.0"/>
-      <repository id="Sirius-Incubation-Nightly" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="EEF-NG-Latest" location="http://download.eclipse.org/modeling/emft/eef/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
-      <repository id="Sirius4Tests" location="http://download.eclipse.org/sirius/updates/nightly/latest/luna"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="com.ibm.icu" version="0.0.0"/>
-      <unit id="org.eclipse.draw2d.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.eef.runtime" version="0.0.0"/>
-      <unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ocl.all.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.ide.ui" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <repository id="Eclipse-Staging" location="http://download.eclipse.org/releases/staging"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_staging.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_staging.targetplatform
deleted file mode 100644
index 3e914175c0..0000000000
--- a/releng/org.eclipse.sirius.targets/sirius_tests_staging.targetplatform
+++ /dev/null
@@ -1,26 +0,0 @@
-target "sirius_tests_staging"
-
-include "sirius_staging.targetplatform"
-
-with source, requirements
-
-location Sirius4Tests "http://download.eclipse.org/sirius/updates/nightly/latest/luna" {
-        org.eclipse.sirius.doc.feature.feature.group lazy
-        org.eclipse.sirius.runtime.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.feature.group lazy
-        org.eclipse.sirius.runtime.ide.eef.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.runtime.ide.ui.feature.group lazy
-        org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
-        org.eclipse.sirius.runtime.ocl.feature.group lazy
-        org.eclipse.sirius.runtime.aql.feature.group lazy
-        org.eclipse.sirius.samples.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
-        org.eclipse.sirius.specifier.ide.ui.feature.group lazy
-        org.eclipse.sirius.tests.support.feature.group lazy
-}
-
-location Eclipse-Staging "http://download.eclipse.org/releases/staging" {
-	org.eclipse.uml2.sdk.feature.group lazy
-}
author	cbrun	2016-01-29 14:52:49 +0000
committer	Pierre-Charles David	2016-02-19 12:49:32 +0000
commit	01f8f387b443ff89a75d47e9d90a128972586c4f (patch)
tree	311298c0b155851412b175243d39fadd0de4f4c4
parent	3000b64e4b340c905ed62f247dbf386cf29cdcdf (diff)
download	org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.tar.gz org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.tar.xz org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.zip