commit 9c4663364f074121d4f7d46f19746bf762b1e638
author Ed Merks <ed.merks@gmail.com> Fri Jul 24 09:05:52 2015 +0200
committer Ed Merks <ed.merks@gmail.com> Fri Jul 24 09:05:52 2015 +0200
tree 291773cef882fe7356dd1e2ae3162db99addec5c
parent 13a00a4d28fcc43bb863debe21bbe95c7e3052fd

[releng] Fix redirection of XSD.setup to local repo and prepare for 2.11
maintenance

plugins/org.eclipse.xsd/XSD.setup

diff --git a/plugins/org.eclipse.xsd/XSD.setup b/plugins/org.eclipse.xsd/XSD.setup
index 6b3ef22..d454ce8 100644
--- a/plugins/org.eclipse.xsd/XSD.setup
+++ b/plugins/org.eclipse.xsd/XSD.setup
@@ -26,7 +26,7 @@
   <setupTask
       xsi:type="setup:EclipseIniTask"
       option="-Doomph.redirection.xsd.setup"
-      value="=http://git.eclipse.org/c/xsd/org.eclipse.xsd.git/plain/plugins/org.eclipse.xsd/XSD.setup->${xsd.git.clone.location|uri}/org.eclipse.xsd/XSD.setup"
+      value="=http://git.eclipse.org/c/xsd/org.eclipse.xsd.git/plain/plugins/org.eclipse.xsd/XSD.setup->${xsd.git.clone.location|uri}/plugins/org.eclipse.xsd/XSD.setup"
       vm="true"/>
   <setupTask
       xsi:type="setup:PreferenceTask"
@@ -69,7 +69,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="Luna"
+      defaultValue="Mars"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="git:GitCloneTask"
@@ -114,9 +114,14 @@
       <sourceLocator
           rootFolder="${xsd.git.clone.location}"/>
       <repositoryList
+          name="Neon">
+        <repository
+            url="http://download.eclipse.org/modeling/emf/emf/updates/2.11"/>
+      </repositoryList>
+      <repositoryList
           name="Mars">
         <repository
-            url="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones"/>
+            url="http://download.eclipse.org/modeling/emf/emf/updates/2.11"/>
       </repositoryList>
       <repositoryList
           name="Luna">
@@ -225,6 +230,21 @@
   </setupTask>
   <stream name="master">
     <setupTask
+        xsi:type="setup:VariableTask"
+        name="eclipse.target.platform"
+        defaultValue="Neon"
+        storageURI="scope://Workspace"/>
+    <setupTask
+        xsi:type="setup.p2:P2Task">
+      <repository
+          url="http://download.eclipse.org/modeling/emf/emf/updates/2.11"/>
+      <repository
+          url="http://download.eclipse.org/ecoretools/updates/nightly/3.0.x/luna"/>
+    </setupTask>
+  </stream>
+  <stream name="R2_11_maintenance"
+      label="2.11">
+    <setupTask
         xsi:type="setup.p2:P2Task">
       <repository
           url="http://download.eclipse.org/modeling/emf/emf/updates/2.11"/>