Upgraded all dependencies to Indigo M6. Updated versioning to 0.8.5.
diff --git a/releng/org.eclipse.amp.releng/buckminster.cspec b/releng/org.eclipse.amp.releng/buckminster.cspec
index a5e36c3..ff6239b 100644
--- a/releng/org.eclipse.amp.releng/buckminster.cspec
+++ b/releng/org.eclipse.amp.releng/buckminster.cspec
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.amp.releng" componentType="buckminster" version="0.8.1.qualifier">
+<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.amp.releng" componentType="buckminster" version="0.8.5.qualifier">
     <cs:dependencies>
+        <cs:dependency name="org.apache.commons.collections" componentType="osgi.bundle"/>
+        <cs:dependency name="org.eclipse.birt" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.emf" componentType="eclipse.feature"/>
+        <cs:dependency name="org.eclipse.gef" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.swtbot" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.swtbot.eclipse" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.swtbot.eclipse.gef" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.xpand" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.xtend" componentType="eclipse.feature"/>
-        <cs:dependency name="org.eclipse.xtext.ui" componentType="eclipse.feature"/>
-        <cs:dependency name="org.eclipse.xtext.runtime" componentType="eclipse.feature"/>
-        <cs:dependency name="org.eclipse.gef" componentType="eclipse.feature"/>
+        <cs:dependency name="org.eclipse.xtext.sdk" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.zest" componentType="eclipse.feature"/>
-        <cs:dependency name="org.eclipse.birt" componentType="eclipse.feature"/>
         <cs:dependency name="org.junit" componentType="osgi.bundle"/>
         <cs:dependency name="org.junit4" componentType="osgi.bundle"/>
-        <cs:dependency name="org.apache.commons.collections" componentType="osgi.bundle"/>
+        <cs:dependency name="de.itemis.xtext.antlr" componentType="osgi.bundle"/>
     </cs:dependencies>
     <cs:actions>
         <cs:public name="setup.promoter" actor="ant">
diff --git a/releng/org.eclipse.amp.releng/publisher.properties b/releng/org.eclipse.amp.releng/publisher.properties
index 95e419c..b893eca 100644
--- a/releng/org.eclipse.amp.releng/publisher.properties
+++ b/releng/org.eclipse.amp.releng/publisher.properties
@@ -1,4 +1,4 @@
-version=0.8.1
+version=0.8.5
 packages.base=amp.downloads
 tests.base=amp.test.results
 downloads.area=/home/data/httpd/download.eclipse.org/amp/
diff --git a/releng/org.eclipse.amp.releng/releng/amp-platform.cquery b/releng/org.eclipse.amp.releng/releng/amp-platform.cquery
index 3f333ea..b4c7831 100644
--- a/releng/org.eclipse.amp.releng/releng/amp-platform.cquery
+++ b/releng/org.eclipse.amp.releng/releng/amp-platform.cquery
@@ -4,5 +4,5 @@
     <cq:property key="target.arch" value="*"/>
     <cq:property key="target.os" value="*"/>
     <cq:property key="target.ws" value="*"/>
-    <cq:advisorNode namePattern="^" useTargetPlatform="false"/>
+    <cq:advisorNode namePattern="^org\.apache([\.].+)+\.source$" skipComponent="true"/>
 </cq:componentQuery>
diff --git a/releng/org.eclipse.amp.releng/releng/amp-platform.mspec b/releng/org.eclipse.amp.releng/releng/amp-platform.mspec
index d8aba93..701cb41 100644
--- a/releng/org.eclipse.amp.releng/releng/amp-platform.mspec
+++ b/releng/org.eclipse.amp.releng/releng/amp-platform.mspec
@@ -3,5 +3,5 @@
   <mspec:property key="target.os" value="*"/>
   <mspec:property key="target.arch" value="*"/>
   <mspec:property key="target.ws" value="*"/>
-  <mspec:mspecNode namePattern="^org\.eclipse\.amp\.releng$" exclude="true"/>
+	<mspec:mspecNode namePattern="^org\.eclipse\.amp\.releng$" exclude="true"/>
 </mspec:mspec>
diff --git a/releng/org.eclipse.amp.releng/releng/amp-platform.rmap b/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
index db3509e..3d782d4 100644
--- a/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
+++ b/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
@@ -2,11 +2,13 @@
 <rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
   <rm:property key="checkout.location" value="${workspace.root}/"/>
   <rm:property key="eclipse.download" value="file:/home/data/httpd/download.eclipse.org"/>
-  <rm:property key="xpand.p2.repository" value="${eclipse.download}/modeling/m2t/xpand/updates/nightly"/>
-  <rm:property key="mwe.p2.repository" value="${eclipse.download}/modeling/emft/mwe/updates/nightly"/>
   <rm:locator pattern="^org\.eclipse\.amp\.(releng|build)$" searchPathRef="local.releng"/>
+  <rm:locator pattern="^org\.eclipse\.mwe(\..+)?" searchPathRef="eclipse" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.xpand(\..+)?" searchPathRef="eclipse" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.xtend(\..+)?" searchPathRef="eclipse" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.xtext(\..+)?" searchPathRef="eclipse" failOnError="false"/>
+  <rm:locator pattern="^de\.itemis\.xtext\.antlr" searchPathRef="itemis"/>
   <rm:locator pattern="^org\.eclipse(\..+)?$" searchPathRef="eclipse" failOnError="false"/>
-  <rm:locator pattern="^org\.lwjgl(\..+)?" searchPathRef="lwjgl"/>
   <rm:locator pattern="^org\.ascape\.ui\.swing" searchPathRef="ascape.external"/>
   <rm:locator pattern="^org\.ascape\.common\.lib" searchPathRef="ascape.external"/>
   <rm:locator pattern="^org\.ascape\.core" searchPathRef="ascape.external"/>
@@ -14,7 +16,8 @@
   <rm:locator pattern="^org\.eclipse\.swtbot(\..+)?" searchPathRef="swtbot"/>
   <rm:locator searchPathRef="eclipse" failOnError="false"/>
   <rm:locator searchPathRef="platform" failOnError="false"/>
-  <rm:locator searchPathRef="orbit"/>
+  <rm:locator searchPathRef="orbit" failOnError="false"/>
+  <rm:locator searchPathRef="itemis"/>
   <rm:searchPath name="local.releng">
     <rm:provider componentTypes="buckminster" readerType="local" mutable="false">
       <rm:uri format="{0}/releng/{1}">
@@ -26,21 +29,27 @@
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="eclipse">
+  <rm:searchPath name="helios">
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
       <rm:uri format="{0}/releases/helios?importType=binary">
         <bc:propertyRef key="eclipse.download"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="platform">
-    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-      <rm:uri format="{0}/eclipse/updates/3.6">
+  <rm:searchPath name="eclipse">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:uri format="{0}/releases/indigo?importType=binary">
         <bc:propertyRef key="eclipse.download"/>
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
-
+  <rm:searchPath name="platform">
+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:uri format="{0}/eclipse/updates/3.7">
+        <bc:propertyRef key="eclipse.download"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
   <rm:searchPath name="mwe">
     <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
       <rm:uri format="{0}">
@@ -62,16 +71,9 @@
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="emf">
-    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-      <rm:uri format="{0}/modeling/emf/emf/updates/2.6milestones">
-        <bc:propertyRef key="eclipse.download"/>
-      </rm:uri>
-    </rm:provider>
-  </rm:searchPath>
   <rm:searchPath name="orbit">
     <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
-      <rm:uri format="{0}/tools/orbit/downloads/drops/R20100519200754/repository">
+      <rm:uri format="{0}/tools/orbit/downloads/drops/S20110304120314/repository">
         <bc:propertyRef key="eclipse.download"/>
       </rm:uri>
     </rm:provider>
@@ -98,18 +100,12 @@
       <rm:uri format="http://lwjgl.org/update"/>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="gef3d">
-    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn">
-      <rm:uri format="http://dev.eclipse.org/svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-        <bc:propertyRef key="buckminster.component"/>
-      </rm:uri>
-    </rm:provider>
-  </rm:searchPath>
-  <rm:searchPath name="gef3d-build">
-    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn">
-      <rm:uri format="file:///svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-        <bc:propertyRef key="buckminster.component"/>
-      </rm:uri>
-    </rm:provider>
-  </rm:searchPath>
+  	
+	<!-- NOTE: ***We need to get 1.0.2 which is no longer on Indigo.*** -->
+	<rm:searchPath name="itemis">
+		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
+			<rm:uri format="http://download.itemis.com/updates" />
+		</rm:provider>
+	</rm:searchPath>
+  
 </rm:rmap>
diff --git a/releng/org.eclipse.amp.releng/releng/amp.cquery b/releng/org.eclipse.amp.releng/releng/amp.cquery
index 2bc9e63..2fd9470 100644
--- a/releng/org.eclipse.amp.releng/releng/amp.cquery
+++ b/releng/org.eclipse.amp.releng/releng/amp.cquery
@@ -3,4 +3,5 @@
     <cq:rootRequest name="org.eclipse.amp.build" componentType="eclipse.feature"/>
     <cq:advisorNode namePattern="^org\.eclipse\.amp([\.].+)+\.source$" skipComponent="true"/>
     <cq:advisorNode namePattern="^org\.eclipse\.amp\.releng$" useMaterialization="false" useWorkspace="false"/>
+    <cq:advisorNode namePattern="^org\.apache([\.].+)+\.source$" skipComponent="true"/>
 </cq:componentQuery>
diff --git a/releng/org.eclipse.amp.releng/releng/amp.rmap b/releng/org.eclipse.amp.releng/releng/amp.rmap
index 59bd806..593f41d 100644
--- a/releng/org.eclipse.amp.releng/releng/amp.rmap
+++ b/releng/org.eclipse.amp.releng/releng/amp.rmap
@@ -2,18 +2,19 @@
 <rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
 	<rm:property key="checkout.location" value="${workspace.root}/org.eclipse.amp" />
 	<rm:property key="eclipse.download" value="http://download.eclipse.org" />
+	<rm:locator pattern="^org\.eclipse\.emf\.mwe(\..+)?" searchPathRef="mwe" />
 
-	<rm:locator pattern="^org\.eclipse\.amp\.releng$" searchPathRef="amp.releng.local" failOnError="false"  />
-	<rm:locator pattern="^org\.eclipse\.amp\.build$" searchPathRef="amp.build.local" failOnError="false"  />
-	<rm:locator pattern="^org\.eclipse\.amp([\.\-].+)\.test$" searchPathRef="amp.tests.local" failOnError="false"  />
+	<rm:locator pattern="^org\.eclipse\.amp\.releng$" searchPathRef="amp.releng.local" failOnError="false" />
+	<rm:locator pattern="^org\.eclipse\.amp\.build$" searchPathRef="amp.build.local" failOnError="false" />
+	<rm:locator pattern="^org\.eclipse\.amp([\.\-].+)\.test$" searchPathRef="amp.tests.local" failOnError="false" />
 	<rm:locator pattern="^org\.eclipse\.amp([\.\-].*)\.examples([\.\-].+)?" searchPathRef="amp.examples.local"
 		failOnError="false" />
 	<rm:locator pattern="^org\.eclipse\.amp([\.\-].+)?" searchPathRef="amp" failOnError="false" />
-	<rm:locator pattern="^org\.eclipse\.emf\.java" searchPathRef="amp.dependencies.local" failOnError="false"  />
-	<rm:locator pattern="^org\.eclipse\.amp\.doc" searchPathRef="amp.doc.local" failOnError="false"  />
-	<rm:locator pattern="^org\.eclipse\.amp\.ua" searchPathRef="amp.doc.local" failOnError="false"  />
-	<rm:locator pattern="^org\.eclipse\.amp(\..+)?" searchPathRef="amp.local" failOnError="false"  />
-	
+	<rm:locator pattern="^org\.eclipse\.emf\.java" searchPathRef="amp.dependencies.local" failOnError="false" />
+	<rm:locator pattern="^org\.eclipse\.amp\.doc" searchPathRef="amp.doc.local" failOnError="false" />
+	<rm:locator pattern="^org\.eclipse\.amp\.ua" searchPathRef="amp.doc.local" failOnError="false" />
+	<rm:locator pattern="^org\.eclipse\.amp(\..+)?" searchPathRef="amp.local" failOnError="false" />
+
 	<rm:locator pattern="^org\.eclipse\.amp\.releng$" searchPathRef="amp.releng" />
 	<rm:locator pattern="^org\.eclipse\.amp\.build$" searchPathRef="amp.build" />
 	<rm:locator pattern="^org\.eclipse\.amp([\.\-].+)\.test$" searchPathRef="amp.tests" />
@@ -24,13 +25,13 @@
 	<rm:locator pattern="^org\.eclipse\.amp\.doc" searchPathRef="amp.doc" />
 	<rm:locator pattern="^org\.eclipse\.amp\.ua" searchPathRef="amp.doc" />
 	<rm:locator pattern="^org\.eclipse\.amp(\..+)?" searchPathRef="amp" />
-	
+	<rm:locator pattern="^org\.eclipse\.xtext(\..+)?" searchPathRef="itemis" failOnError="false" />
+	<rm:locator pattern="^de\.itemis\.xtext\.antlr?" searchPathRef="itemis" />
+
 	<rm:locator pattern="^org\.eclipse\.gef3d(\..+)?" searchPathRef="gef3d" failOnError="false" />
-	<rm:locator pattern="^org\.eclipse\.gef3d(\..+)?" searchPathRef="gef3d-build" />
 	<rm:locator pattern="^org\.eclipse\.draw3d(\..+)?" searchPathRef="gef3d" failOnError="false" />
-	<rm:locator pattern="^org\.eclipse\.draw3d(\..+)?" searchPathRef="gef3d-build" />
-	<rm:locator pattern="^org\.ascape\.core" searchPathRef="amp"/>
-	<rm:locator pattern="^org\.ascape\.ui\.amp" searchPathRef="amp"/>
+	<rm:locator pattern="^org\.ascape\.core" searchPathRef="amp" />
+	<rm:locator pattern="^org\.ascape\.ui\.amp" searchPathRef="amp" />
 	<!-- Note: Third party *NOT* Eclipse IP approved for providing. Make sure that these don't show up in any delivered builds. -->
 	<rm:locator searchPathRef="lwjgl" pattern="^org\.lwjgl(\..+)?" />
 	<rm:locator searchPathRef="ascape.external" pattern="^org\.ascape\..*" />
@@ -249,6 +250,7 @@
 			<rm:property key="git.auto.fetch" value="true" />
 		</rm:provider>
 	</rm:searchPath>
+
 	<rm:searchPath name="gef3d">
 		<rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn" mutable="false">
 			<rm:uri format="http://dev.eclipse.org/svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
@@ -256,14 +258,11 @@
 			</rm:uri>
 		</rm:provider>
 	</rm:searchPath>
-	<rm:searchPath name="gef3d-build">
-		<rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn" mutable="false">
-			<rm:uri format="file:///svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-				<bc:propertyRef key="buckminster.component" />
-			</rm:uri>
-		</rm:provider>
-	</rm:searchPath>
-	
+
+	<!-- <rm:searchPath name="gef3d"> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" 
+		mutable="false"> <rm:uri format="file:/Volumes/Resources/Developer/workspaces/gef3d/buckminster.build.output/org.eclipse.gef3d.releng_1.0.0-eclipse.feature/site.p2"/> 
+		</rm:provider> </rm:searchPath> -->
+
 	<!-- NOTE: ***Not for inclusion in Eclipse provided builds. Only used for building tests and examples.*** -->
 	<rm:searchPath name="ascape.external">
 		<rm:provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
@@ -280,9 +279,23 @@
 
 	<!-- NOTE: ***Not for inclusion in Eclipse provided builds. Provides support for externally hosted plugin dependencies.*** -->
 	<rm:searchPath name="lwjgl">
-		<rm:provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
+		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
 			<rm:uri format="http://lwjgl.org/update" />
 		</rm:provider>
 	</rm:searchPath>
-	
+
+	<!-- NOTE: ***We need to get 1.0.2 which is no longer on Indigo.*** -->
+	<rm:searchPath name="itemis">
+		<rm:provider readerType="p2" componentTypes="eclipse.feature,osgi.bundle" mutable="false" source="false">
+			<rm:uri format="http://download.itemis.com/updates" />
+		</rm:provider>
+	</rm:searchPath>
+
+	<rm:searchPath name="mwe">
+		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+			<rm:uri format="${eclipse.download}/modeling/emft/mwe/updates/nightly">
+			</rm:uri>
+		</rm:provider>
+	</rm:searchPath>
+
 </rm:rmap>
diff --git a/releng/org.eclipse.amp.releng/releng/local.properties b/releng/org.eclipse.amp.releng/releng/local.properties
index bb8ff28..412eaf9 100644
--- a/releng/org.eclipse.amp.releng/releng/local.properties
+++ b/releng/org.eclipse.amp.releng/releng/local.properties
@@ -9,9 +9,9 @@
 qualifier.replacement.*=generator:lastModified
 generator.lastModified.format='v'yyyyMMddHHmm
 
-target.os=*
-target.ws=*
-target.arch=*
+target.os=macosx
+target.ws=cocoa
+target.arch=x86_64
 
 # define the site generation properties
 site.pack200=true
@@ -20,6 +20,7 @@
 signing.type=eclipse.local
 eclipse.staging.area=${workspace.root}/amp-nightly/eclipse.staging
 
+eclipse.p2.optional=true
+buckminster.download.source=true
+
 # define the range generation rules for required bundles
-pde.match.rule.default=compatible
-pde.match.rule.retain.lower=true