From d734245a79a6378d992268b6d2fc2a206122a540 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber
Date: Fri, 29 Jun 2018 21:39:16 +0200
Subject: Releng: Fix 4.7-oxygen.target, add 4.8-photon.target

Change-Id: Ic4c18da482a21885d75838098be93a029b1e0e36
Signed-off-by: Martin Oberhuber <mober.at+eclipse@gmail.com>---
 admin/target-defs/eclipse-4.7.x-oxygen.target | 15 +++----
 admin/target-defs/eclipse-4.8.x-photon.target | 61 +++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 admin/target-defs/eclipse-4.8.x-photon.target

diff --git a/admin/target-defs/eclipse-4.7.x-oxygen.target b/admin/target-defs/eclipse-4.7.x-oxygen.target
index 28dfe648d..a636185a6 100644
--- a/admin/target-defs/eclipse-4.7.x-oxygen.target
+++ b/admin/target-defs/eclipse-4.7.x-oxygen.target
@@ -10,13 +10,13 @@
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.7.1.M20171009-0410"/>
+<unit id="org.eclipse.platform.ide" version="4.7.3.M20180330-0640"/>
 <unit id="org.eclipse.test.feature.group" version="3.7.200.v20170511-1043"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.egit.feature.group" version="4.9.1.201712030800-r"/>
-<repository location="http://download.eclipse.org/staging/oxygen"/>
+<unit id="org.eclipse.egit.feature.group" version="4.9.2.201712150930-r"/>
+<repository location="http://download.eclipse.org/releases/oxygen"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -33,7 +33,6 @@
 <unit id="org.eclipse.tm.terminal.connector.remote.sdk.feature.feature.group" version="4.3.0.201706140544"/>
 <unit id="org.eclipse.tm.terminal.connector.serial.sdk.feature.feature.group" version="4.3.0.201706140544"/>
 <unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.3.0.201706140544"/>
-<unit id="org.eclipse.tm.terminal.view.rse.sdk.feature.feature.group" version="4.3.0.201706140544"/>
 <repository location="http://download.eclipse.org/tm/terminal/updates/4.3"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -42,8 +41,8 @@
 <repository location="http://download.eclipse.org/tm/updates/4.3milestones"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.sdk.feature.group" version="9.3.2.201709131603"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/oxygen/milestones"/>
+<unit id="org.eclipse.cdt.sdk.feature.group" version="9.4.3.201802261533"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/9.4"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
@@ -57,7 +56,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.launchbar.feature.group" version="2.2.0.201711162100"/>
-<repository location="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository"/>
+<repository location="http://download.eclipse.org/tools/cdt/launchbar/oxygen.2"/>
 </location>
 </locations>
-</target>
+</target>
\ No newline at end of file
diff --git a/admin/target-defs/eclipse-4.8.x-photon.target b/admin/target-defs/eclipse-4.8.x-photon.target
new file mode 100644
index 000000000..b6ce3c722
--- /dev/null
+++ b/admin/target-defs/eclipse-4.8.x-photon.target
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Eclipse 4.8.x (Photon)" sequenceNumber="38">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
+<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" 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 includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.8.0.I20180611-0500"/>
+<unit id="org.eclipse.test.feature.group" version="3.7.300.v20180524-2246"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="5.0.0.201806131550-r"/>
+<repository location="http://download.eclipse.org/staging/photon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.6.0.201706141832"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.6.0.201706141832"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.6.0.201706141832"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.6.0.201706141832"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.connector.cdtserial.sdk.feature.feature.group" version="4.3.0.201803121138"/>
+<unit id="org.eclipse.tm.terminal.connector.remote.sdk.feature.feature.group" version="4.3.0.201803121138"/>
+<unit id="org.eclipse.tm.terminal.connector.serial.sdk.feature.feature.group" version="4.3.0.201803121138"/>
+<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="4.4.0.201803121138"/>
+<repository location="http://download.eclipse.org/tm/terminal/updates/4.4milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.feature.group" version="3.7.3.201704251225"/>
+<unit id="org.eclipse.rse.terminals.feature.group" version="3.8.0.201704251225"/>
+<repository location="http://download.eclipse.org/tm/updates/4.3milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.sdk.feature.group" version="9.5.0.201806170908"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/9.5"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="3.0.0.201803121903"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/photon/milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.launchbar.feature.group" version="2.2.0.201805041956"/>
+<repository location="https://ci.eclipse.org/cdt/view/LaunchBar/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>
+</location>
+</locations>
+</target>
\ No newline at end of file
-- 
cgit v1.2.3