[Releng] Update of the targets and tpds to fix a dependency issue on the Oxygen RCP

Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

10 files changed, 30 insertions, 36 deletions

diff --git a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
index 2b1c556d934..f3298691f89 100644
--- a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
+++ b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Dev" sequenceNumber="1474465908">
+<target name="Papyrus Dev" sequenceNumber="1474895796">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
@@ -139,7 +139,7 @@
       <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.4.1"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160809-1624"/>
+      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160921-2002"/>
     </location>
   </locations>
 </target>
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
index 2ee93bbb84d..4b2b45a7b9d 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?pde?>

 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

-<target name="Papyrus Dev" sequenceNumber="1474465908">

+<target name="Papyrus Dev" sequenceNumber="1474895796">

   <locations>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>

@@ -139,7 +139,7 @@
       <repository id="egit" location="http://download.eclipse.org/egit/updates-4.4.1"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

-      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160809-1624"/>

+      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160921-2002"/>

     </location>

   </locations>

 </target>

diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
index c2e3a3c4cb3..b93d739f4a7 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
@@ -52,4 +52,4 @@ location egit "http://download.eclipse.org/egit/updates-4.4.1" //
 
 //updateFrom("m2e",0)
 
-location m2e "http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160809-1624" //
+location m2e "http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160921-2002" //
diff --git a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
index 89d49258c70..c1f4a73b916 100644
--- a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
+++ b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra Tests" sequenceNumber="1474473006">
+<target name="Papyrus Extra Tests" sequenceNumber="1474895797">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
@@ -36,7 +36,7 @@
       <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.4.1"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160809-1624"/>
+      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160921-2002"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
diff --git a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
index 3dd0ec0bb15..6ee3c24eb4c 100644
--- a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
+++ b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?pde?>

 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

-<target name="Papyrus Extra Tests" sequenceNumber="1474473006">

+<target name="Papyrus Extra Tests" sequenceNumber="1474895797">

   <locations>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>

@@ -36,7 +36,7 @@
       <repository id="egit" location="http://download.eclipse.org/egit/updates-4.4.1"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

-      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160809-1624"/>

+      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160921-2002"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>

diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index 802fdf3795f..df31299e636 100644
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1474465921">
+<target name="Papyrus Tests" sequenceNumber="1474895797">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
@@ -139,7 +139,7 @@
       <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.4.1"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160809-1624"/>
+      <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160921-2002"/>
     </location>
   </locations>
 </target>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index b41aea2413b..5f432c67ad8 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?pde?>

 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

-<target name="Papyrus Tests" sequenceNumber="1474465921">

+<target name="Papyrus Tests" sequenceNumber="1474895797">

   <locations>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>

@@ -139,7 +139,7 @@
       <repository id="egit" location="http://download.eclipse.org/egit/updates-4.4.1"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

-      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160809-1624"/>

+      <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.8/1.8.0.20160921-2002"/>

     </location>

   </locations>

 </target>

diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index 136cff28981..e3cf3c6e76d 100644
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1474473006">
+<target name="Papyrus RCP" sequenceNumber="1474897601">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
@@ -92,14 +92,6 @@
       <repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.net4j.feature.group" version="4.6.0.v20160916-1529"/>
-      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.6.0.v20160920-1352"/>
-      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20160301-1326"/>
-      <unit id="org.eclipse.emf.cdo.feature.group" version="4.6.0.v20160920-1352"/>
-      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.100.v20160913-1507"/>
-      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20160920-0952"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201605040614"/>
       <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201605040614"/>
       <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201605040614"/>
@@ -163,8 +155,13 @@
       <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.5.0.v20160607-1511"/>
-      <repository id="rcpcdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/R20160607-1209"/>
+      <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.6.0.v20160920-1352"/>
+      <unit id="org.eclipse.net4j.feature.group" version="4.6.0.v20160916-1529"/>
+      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.6.0.v20160920-1352"/>
+      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20160301-1326"/>
+      <unit id="org.eclipse.emf.cdo.feature.group" version="4.6.0.v20160920-1352"/>
+      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.100.v20160913-1507"/>
+      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20160920-0952"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20160606-1100"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index 638b7388f38..48105d0c8fd 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?pde?>

 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

-<target name="Papyrus RCP" sequenceNumber="1474473006">

+<target name="Papyrus RCP" sequenceNumber="1474897601">

   <locations>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>

@@ -92,14 +92,6 @@
       <repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

-      <unit id="org.eclipse.net4j.feature.group" version="4.6.0.v20160916-1529"/>

-      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.6.0.v20160920-1352"/>

-      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20160301-1326"/>

-      <unit id="org.eclipse.emf.cdo.feature.group" version="4.6.0.v20160920-1352"/>

-      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.100.v20160913-1507"/>

-      <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20160920-0952"/>

-    </location>

-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.acceleo.runtime.source.feature.group" version="3.6.4.201605040614"/>

       <unit id="org.eclipse.acceleo.source.feature.group" version="3.6.4.201605040614"/>

       <unit id="org.eclipse.acceleo.query.source.feature.group" version="5.0.0.201605040614"/>

@@ -163,8 +155,13 @@
       <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.12/"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

-      <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.5.0.v20160607-1511"/>

-      <repository id="rcpcdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/R20160607-1209"/>

+      <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.6.0.v20160920-1352"/>

+      <unit id="org.eclipse.net4j.feature.group" version="4.6.0.v20160916-1529"/>

+      <unit id="org.eclipse.emf.cdo.server.feature.group" version="4.6.0.v20160920-1352"/>

+      <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="2.1.300.v20160301-1326"/>

+      <unit id="org.eclipse.emf.cdo.feature.group" version="4.6.0.v20160920-1352"/>

+      <unit id="org.eclipse.emf.cdo.server.db.feature.group" version="4.4.100.v20160913-1507"/>

+      <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20160920-0952"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.rcp.configuration.feature.group" version="1.0.200.v20160606-1100"/>

diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
index a474e3b6cca..a4aa59d9364 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
@@ -40,7 +40,7 @@ location emf "http://download.eclipse.org/modeling/emf/emf/updates/2.12/" {
 
 //updateFrom("EMF CDO",0) 
 
-location rcpcdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20160607-1209" {
+location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/S20160920-0952" {
 	org.eclipse.emf.cdo.epp.feature.group
 }