Update target platform to Mars M4

Change-Id: Icdfb616677bc270cc51ca1a055a448ff30a7447b
Signed-off-by: Axel Richard <axel.richard@obeo.fr>

6 files changed, 55 insertions, 54 deletions

diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/egit.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/egit.tpd
index 8d2d4833e..2b536b910 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/egit.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/egit.tpd
@@ -1,6 +1,6 @@
 target "EGit"
 
-with source requirements
+with source, requirements
 
 location "http://download.eclipse.org/egit/updates" {
 	org.eclipse.egit.feature.group lazy
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/fuzzy-tests.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/fuzzy-tests.tpd
index 64d12753b..6e99403bb 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/fuzzy-tests.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/fuzzy-tests.tpd
@@ -1,6 +1,6 @@
 target "Fuzzy testing framework from EMF Store"
 
-with source requirements
+with source, requirements
 
 location "http://download.eclipse.org/emf-store/milestones/archive/0.9.3.M6" {
 	org.eclipse.emf.emfstore.modelmutator.feature.feature.group
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/licence.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/licence.tpd
index cd9d394af..01d1980f6 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/licence.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/licence.tpd
@@ -1,6 +1,6 @@
 target "CBI Licenses"
 
-with source requirements
+with source, requirements
 
 location "http://download.eclipse.org/cbi/updates/license" {
 	org.eclipse.license.feature.group [1.0.1,1.1.0)
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
index 0dd0dc3f6..77935e1a5 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
@@ -1,6 +1,6 @@
 target "Orbit"
 
-with source requirements
+with source, requirements
 
 location "http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/" {
 	com.google.guava [11.0.2,11.0.3)
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
index 01e5441d9..881150bd1 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Mars SDK" sequenceNumber="1405430239">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.emfstore.modelmutator.feature.feature.group" version="0.9.3.M6"/>
-      <unit id="org.eclipse.emf.emfstore.fuzzy.feature.feature.group" version="0.9.3.M6"/>
-      <repository location="http://download.eclipse.org/emf-store/milestones/archive/0.9.3.M6"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.junit4" version="4.8.1.v20100525"/>
-      <repository location="http://download.eclipse.org/releases/indigo"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
-      <unit id="org.junit" version="4.11.0.v201303080030"/>
-      <unit id="javaewah" version="0.7.9.v201401101600"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
-      <repository location="http://axelrichard.github.io/fr.obeo.performance/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.ecoretools.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/luna"/>
-    </location>
-  </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?pde?>

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

+<target name="EMF Compare based on Mars SDK" sequenceNumber="1418806227">

+  <locations>

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

+      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>

+      <repository location="http://download.eclipse.org/cbi/updates/license"/>

+    </location>

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

+      <unit id="org.eclipse.emf.emfstore.modelmutator.feature.feature.group" version="0.9.3.M6"/>

+      <unit id="org.eclipse.emf.emfstore.fuzzy.feature.feature.group" version="0.9.3.M6"/>

+      <repository location="http://download.eclipse.org/emf-store/milestones/archive/0.9.3.M6"/>

+    </location>

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

+      <unit id="org.junit4" version="4.8.1.v20100525"/>

+      <repository location="http://download.eclipse.org/releases/indigo"/>

+    </location>

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

+      <unit id="com.google.guava" version="11.0.2.v201303041551"/>

+      <unit id="org.junit" version="4.11.0.v201303080030"/>

+      <unit id="javaewah" version="0.7.9.v201401101600"/>

+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>

+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>

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

+    </location>

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

+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>

+      <repository location="http://download.eclipse.org/egit/updates"/>

+    </location>

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

+      <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>

+      <repository location="http://axelrichard.github.io/fr.obeo.performance/"/>

+    </location>

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

+      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>

+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>

+      <repository location="http://download.eclipse.org/releases/mars"/>

+    </location>

+  </locations>

+</target>

diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd
index 364355159..4da82bc70 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd
@@ -6,15 +6,16 @@ include "fragments/orbit.tpd"
 include "fragments/egit.tpd"
 include "fragments/perf.tpd"
 
-with source requirements
 
-location "http://download.eclipse.org/releases/luna" {
+with source, requirements
+
+location "http://download.eclipse.org/releases/mars" {
 	org.eclipse.platform.sdk lazy
 	org.eclipse.emf.sdk.feature.group lazy
 	org.eclipse.emf.transaction.sdk.feature.group lazy
 	org.eclipse.uml2.feature.group lazy
 	org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
-	org.eclipse.emf.ecoretools.feature.group lazy
+	org.eclipse.emf.ecoretools.sdk.feature.group lazy
 	org.eclipse.papyrus.sdk.feature.feature.group lazy
 	org.eclipse.team.svn.feature.group lazy
 }