[478878] Remove query-legacy from the tests target platforms

Bug: 478878
Change-Id: I0fc62bd15fd9fb6148fed337faa293b407f2f4c8

15 files changed, 8 insertions, 46 deletions

diff --git a/releng/org.eclipse.sirius.targets/modules/query-legacy.tpd b/releng/org.eclipse.sirius.targets/modules/query-legacy.tpd
deleted file mode 100644
index b05b9bbcf3..0000000000
--- a/releng/org.eclipse.sirius.targets/modules/query-legacy.tpd
+++ /dev/null
@@ -1,7 +0,0 @@
-target "sirius-query-legacy"
-
-with source, requirements
-
-location Sirius-Legacy "http://download.eclipse.org/sirius/updates/legacy/" {
-	org.eclipse.sirius.query.legacy.feature.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
index aea8dc72e9..5605124774 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_canary.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_canary.target
@@ -1,7 +1,11 @@
 <?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"/>
@@ -102,10 +106,6 @@
       <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.query.legacy.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/>
-    </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"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_canary.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_canary.targetplatform
index 86c34f810b..e5d5733612 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_canary.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_canary.targetplatform
@@ -1,7 +1,6 @@
 target "sirius_tests_canary"
 
 include "sirius_canary.targetplatform"
-include "modules/query-legacy.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target b/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
index b3e3a37d88..a0f7f33609 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
@@ -52,10 +52,6 @@
       <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.query.legacy.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/>
-    </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"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_juno.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_juno.targetplatform
index 396c7e7a9c..9745af4a1b 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_juno.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_juno.targetplatform
@@ -1,7 +1,6 @@
 target "sirius_tests_juno"
 
 include "sirius_juno.targetplatform"
-include "modules/query-legacy.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target
index ae8ef6c87e..49c4d97b9f 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_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_tests_kepler" sequenceNumber="1453197338">
+<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"/>
@@ -52,10 +52,6 @@
       <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.query.legacy.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/>
-    </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"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.targetplatform
index 24b2f085f6..17572f26ff 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.targetplatform
@@ -1,7 +1,6 @@
 target "sirius_tests_kepler"
 
 include "sirius_kepler.targetplatform"
-include "modules/query-legacy.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_luna.target b/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
index fb7c093ada..0a6828233e 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
@@ -43,10 +43,6 @@
       <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.query.legacy.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/>
-    </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"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_luna.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_luna.targetplatform
index 9d8978299b..588ef5c922 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_luna.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_luna.targetplatform
@@ -1,7 +1,6 @@
 target "sirius_tests_luna"
 
 include "sirius_luna.targetplatform"
-include "modules/query-legacy.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_mars.target b/releng/org.eclipse.sirius.targets/sirius_tests_mars.target
index 2493542c62..91cdff7a7b 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_mars.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_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_tests_mars" sequenceNumber="1453197457">
+<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"/>
@@ -43,10 +43,6 @@
       <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.query.legacy.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/>
-    </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"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_mars.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_mars.targetplatform
index 328f26571a..73735231ab 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_mars.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_mars.targetplatform
@@ -1,7 +1,6 @@
 target "sirius_tests_mars"
 
 include "sirius_mars.targetplatform"
-include "modules/query-legacy.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_neon.target b/releng/org.eclipse.sirius.targets/sirius_tests_neon.target
index 125901acfb..fc3c17d47f 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_neon.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_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_tests_neon" sequenceNumber="1450085363">
+<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"/>
@@ -39,10 +39,6 @@
       <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.query.legacy.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/>
-    </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"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_neon.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_neon.targetplatform
index 85fc0de70e..4e1296d566 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_neon.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_neon.targetplatform
@@ -1,7 +1,6 @@
 target "sirius_tests_neon"
 
 include "sirius_neon.targetplatform"
-include "modules/query-legacy.tpd"
 
 with source, requirements
 
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_staging.target b/releng/org.eclipse.sirius.targets/sirius_tests_staging.target
index 99daf80992..ee87fdc5d1 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_staging.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_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_tests_staging" sequenceNumber="1449677242">
+<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"/>
@@ -32,10 +32,6 @@
       <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.query.legacy.feature.feature.group" version="0.0.0"/>
-      <repository id="Sirius-Legacy" location="http://download.eclipse.org/sirius/updates/legacy/"/>
-    </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"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_staging.targetplatform b/releng/org.eclipse.sirius.targets/sirius_tests_staging.targetplatform
index 2750451be2..3e914175c0 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_staging.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_staging.targetplatform
@@ -1,7 +1,6 @@
 target "sirius_tests_staging"
 
 include "sirius_staging.targetplatform"
-include "modules/query-legacy.tpd"
 
 with source, requirements