[Releng] Update Neon repo list in CDO.setup and the RMAP

2 files changed, 66 insertions, 77 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
index 307434e822..ea0e04ebd7 100644
--- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
@@ -146,47 +146,47 @@
         <repository
             url="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-R"/>
         <repository
-            url="http://download.eclipse.org/modeling/emf/emf/updates/nightly/core"/>
+            url="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/core"/>
         <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones"/>
+            url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
         <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
+            url="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
+            url="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones"/>
+            url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2"/>
         <repository
-            url="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones"/>
+            url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/modeling/emf/transaction/updates/interim"/>
+            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/tools/gef/updates/interim"/>
+            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/graphiti/updates/milestones"/>
+            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/technology/swtbot/snapshots"/>
+            url="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones"/>
         <repository
             url="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+            url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1milestones"/>
         <repository
-            url="http://download.eclipse.org/tools/buckminster/updates-4.4"/>
+            url="http://download.eclipse.org/mmt/qvto/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/technology/nebula/snapshot"/>
+            url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
         <repository
-            url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1milestones"/>
+            url="http://download.eclipse.org/graphiti/updates/milestones"/>
         <repository
-            url="http://download.eclipse.org/modeling/emf/validation/updates/milestones"/>
+            url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
         <repository
-            url="http://download.eclipse.org/mmt/qvto/updates/milestones"/>
+            url="http://download.eclipse.org/tools/gef/updates/interim"/>
         <repository
-            url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
+            url="http://download.eclipse.org/tools/buckminster/updates-4.5"/>
         <repository
-            url="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest"/>
+            url="http://download.eclipse.org/technology/swtbot/snapshots"/>
         <repository
-            url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
+            url="http://download.eclipse.org/technology/nebula/snapshot"/>
         <repository
-            url="http://download.eclipse.org/ecp/rt/150_MS3"/>
+            url="http://download.eclipse.org/ecp/rt/170"/>
         <repository
             url="http://www.elver.org/eclipse/2.1.0/update"/>
         <repository
@@ -197,6 +197,8 @@
         <repository
             url="http://download.eclipse.org/releases/mars"/>
         <repository
+            url="http://download.eclipse.org/eclipse/updates/4.5"/>
+        <repository
             url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1.x"/>
         <repository
             url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap
index 6f566b79f2..50c9bbb49b 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.rmap
+++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap
@@ -44,14 +44,6 @@
 
 	<rm:searchPath name="p2">
 
-		<!-- RELEASE TRAIN
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/releases/{0}">
-				<bc:propertyRef key="train"/>
-			</rm:uri>
-		</rm:provider>
-		-->
-
 		<!-- PLATFORM -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
 			<rm:uri format="http://download.eclipse.org/eclipse/updates/4.6-I-builds">
@@ -59,16 +51,26 @@
 			</rm:uri>
 		</rm:provider>
 
+    <!-- ORBIT -->
+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:uri format="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-R"/>
+    </rm:provider>
+
 		<!-- EMF -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/core">
+			<rm:uri format="http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/core">
 				<bc:propertyRef key="emf.version"/>
 			</rm:uri>
 		</rm:provider>
 
+    <!-- TENEO -->
+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:uri format="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+    </rm:provider>
+
 		<!-- EMF Transaction -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/modeling/emf/transaction/updates/interim"/>
+			<rm:uri format="http://download.eclipse.org/modeling/emf/transaction/updates/milestones"/>
 		</rm:provider>
 
 		<!-- EMF Validation -->
@@ -78,12 +80,7 @@
 
 		<!-- EMF Compare -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-      <rm:uri format="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest"/>
-		</rm:provider>
-
-		<!-- EMF Clientt Platform -->
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/ecp/rt/150_MS3"/>
+      <rm:uri format="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2"/>
 		</rm:provider>
 
 		<!-- MWE -->
@@ -91,19 +88,14 @@
 			<rm:uri format="http://download.eclipse.org/modeling/emft/mwe/updates/milestones"/>
 		</rm:provider>
 
-		<!-- EcoreTools -->
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
-		</rm:provider>
-
-		<!-- GEF -->
+		<!-- GMF Tooling -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/tools/gef/updates/interim"/>
+			<rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones"/>
 		</rm:provider>
 
-		<!-- Graphiti -->
+		<!-- GMF Runtime -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/graphiti/updates/milestones"/>
+			<rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
 		</rm:provider>
 
 		<!-- GMF Notation -->
@@ -111,42 +103,34 @@
 			<rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones"/>
 		</rm:provider>
 
-		<!-- GMF Runtime -->
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones"/>
-		</rm:provider>
-
-		<!-- GMF Tooling -->
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones"/>
-		</rm:provider>
+    <!-- XPAND -->
+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:uri format="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones"/>
+    </rm:provider>
 
 		<!-- OCL -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
 			<rm:uri format="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones"/>
 		</rm:provider>
 
-		<!-- QVTO -->
+		<!-- UML2 -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/mmt/qvto/updates/milestones"/>
+			<rm:uri format="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1milestones"/>
 		</rm:provider>
 
-		<!-- UML2 -->
+		<!-- QVTO -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1milestones"/>
+			<rm:uri format="http://download.eclipse.org/mmt/qvto/updates/milestones"/>
 		</rm:provider>
 
-		<!-- XPAND -->
+		<!-- EcoreTools -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/modeling/m2t/xpand/updates/milestones"/>
+			<rm:uri format="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
 		</rm:provider>
 
-		<!-- SWTBOT -->
+		<!-- Graphiti -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<!-- ################################################################ -->
-			<!-- ## Do not forget to adjust dawn tests feature.properties (1x) ## -->
-			<!-- ################################################################ -->
-			<rm:uri format="http://download.eclipse.org/technology/swtbot/snapshots"/>
+			<rm:uri format="http://download.eclipse.org/graphiti/updates/milestones"/>
 		</rm:provider>
 
 		<!-- MYLYN -->
@@ -154,29 +138,32 @@
 			<rm:uri format="http://download.eclipse.org/mylyn/snapshots/weekly"/>
 		</rm:provider>
 
-		<!-- BUCKMINSTER -->
+		<!-- GEF -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/tools/buckminster/headless-4.4"/>
+			<rm:uri format="http://download.eclipse.org/tools/gef/updates/interim"/>
 		</rm:provider>
 
-		<!-- NEBULA -->
+		<!-- BUCKMINSTER -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/technology/nebula/snapshot"/>
+			<rm:uri format="http://download.eclipse.org/tools/buckminster/headless-4.5"/>
 		</rm:provider>
 
-		<!-- ORBIT -->
+		<!-- SWTBOT -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-  		<rm:uri format="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-R"/>
+			<!-- ################################################################ -->
+			<!-- ## Do not forget to adjust dawn tests feature.properties (1x) ## -->
+			<!-- ################################################################ -->
+			<rm:uri format="http://download.eclipse.org/technology/swtbot/snapshots"/>
 		</rm:provider>
 
-		<!-- TENEO -->
+		<!-- NEBULA -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+			<rm:uri format="http://download.eclipse.org/technology/nebula/snapshot"/>
 		</rm:provider>
 
-		<!-- ORACLE.COM -->
+		<!-- EMF Client Platform -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.oracle.com/otn_software/oepe/12.1.3.6/mars/repository"/>
+			<rm:uri format="http://download.eclipse.org/ecp/rt/170"/>
 		</rm:provider>
 
 		<!-- EVLER.ORG -->
@@ -187,9 +174,9 @@
 			<rm:uri format="http://www.elver.org/eclipse/2.1.0/update"/>
 		</rm:provider>
 
-		<!-- OOMPH -->
+		<!-- ORACLE.COM -->
 		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/oomph/updates/latest"/>
+			<rm:uri format="http://download.oracle.com/otn_software/oepe/12.1.3.6/mars/repository"/>
 		</rm:provider>
 
 	</rm:searchPath>