From 5d402b0d6f07d5ea8b7977731679dc55a000b9ba Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Wed, 5 Oct 2016 17:17:50 -0400
Subject: [PATCH] releng: Use composite Orbit repo to get all orbit
 dependencies

This allows us to get the dependencies from one place and also this
update site is more stable as it is not updated very frequently.

Change-Id: I40de8fd0535270959ccad7b02c9d57aae765bc79
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
---
 releng/CDT.setup                         | 4 +---
 releng/org.eclipse.cdt.target/cdt.target | 9 +++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/releng/CDT.setup b/releng/CDT.setup
index 6113be25689..8c5ea220d62 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -176,7 +176,7 @@
         <repositoryList
             name="Neon">
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/S20160916162009/repository/"/>
           <repository
               url="http://download.eclipse.org/technology/swtbot/snapshots/"/>
           <repository
@@ -193,8 +193,6 @@
               url="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>
           <repository
               url="http://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
-          <repository
-              url="https://hudson.eclipse.org/orbit/job/orbit-recipes/lastSuccessfulBuild/artifact/releng/repository/target/repository"/>
           <repository
               url="https://hudson.eclipse.org/cdt/job/tools-templates-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>
         </repositoryList>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 5d2df286e14..a4ada1d1ab3 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt" sequenceNumber="14">
+<?pde version="3.8"?><target name="cdt" sequenceNumber="15">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.antlr.runtime" version="0.0.0"/>
 <unit id="org.apache.commons.compress" version="0.0.0"/>
 <unit id="org.apache.log4j" version="0.0.0"/>
 <unit id="org.apache.log4j.source" version="0.0.0"/>
@@ -13,12 +14,8 @@
 <unit id="org.hamcrest" version="0.0.0"/>
 <unit id="org.hamcrest.core" version="0.0.0"/>
 <unit id="com.google.gson" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.freemarker" version="0.0.0"/>
-<unit id="org.antlr.runtime" version="0.0.0"/>
-<repository location="https://hudson.eclipse.org/orbit/job/orbit-recipes/lastSuccessfulBuild/artifact/releng/repository/target/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20160916162009/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>