From ec533341b63e316cef75f4d4ebeeb7ed5b00d2e1 Mon Sep 17 00:00:00 2001
From: Jonah Graham
Date: Thu, 8 Mar 2018 21:55:09 +0000
Subject: [releng] Update CDT in preparation for Photon M6

The most significant change for CDT is the upgrade of
com.spotify.docker.client which has knock on effects
due to the API changes.

Includes:
- Updating target platform
- removing Neon and Oxygen as potential target platforms
in OOMPH setup
- Updating CDT standalone debugger
- Changes in API for docker changes

Change-Id: I68d4f93de3a0e6141c7a37a34f9e8fdb2313fbd8
---
 .../debug.product                                  |  3 +-
 .../launcher/ContainerPropertyVolumesModel.java    |  3 +-
 releng/CDT.setup                                   | 41 +++++++---------------
 releng/org.eclipse.cdt.target/cdt.target           | 12 +++----
 4 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index 04e883a5337..e63965469e7 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -183,8 +183,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="javax.servlet.jsp"/>
       <plugin id="javax.xml"/>
       <plugin id="org.apache.batik.css"/>
+      <plugin id="org.apache.batik.i18n"/>
       <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.batik.util.gui"/>
       <plugin id="org.apache.commons.codec"/>
       <plugin id="org.apache.commons.jxpath"/>
       <plugin id="org.apache.commons.logging"/>
@@ -195,7 +195,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.apache.lucene.analyzers-common"/>
       <plugin id="org.apache.lucene.analyzers-smartcn"/>
       <plugin id="org.apache.lucene.core"/>
-      <plugin id="org.apache.lucene.misc"/>
       <plugin id="org.eclipse.cdt.core"/>
       <plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
       <plugin id="org.eclipse.cdt.core.linux.x86" fragment="true"/>
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java
index ad4ccbf6cba..da357e1217f 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerPropertyVolumesModel.java
@@ -90,7 +90,8 @@ public class ContainerPropertyVolumesModel
 						selectedDataVolumes.remove(dvm);
 					}
 					final List<DataVolumeModel> volumes = new ArrayList<>();
-					for (String volume : this.imageInfo.config().volumes()) {
+					for (String volume : this.imageInfo.config().volumes()
+							.keySet()) {
 						volumes.add(new DataVolumeModel(volume));
 					}
 					setDataVolumes(volumes);
diff --git a/releng/CDT.setup b/releng/CDT.setup
index 1b4a9c881c5..a072994b476 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -66,7 +66,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="Oxygen"
+      defaultValue="Photon"
       storageURI="scope://Workspace"/>
   <stream name="master">
     <setupTask
@@ -167,54 +167,37 @@
             name="org.eclipse.tools.templates.ui"/>
         <requirement
             name="org.eclipse.ui.trace"/>
+        <requirement
+            name="tm-feature.feature.group"/>
         <sourceLocator
             rootFolder="${git.clone.cdt.location}"
             locateNestedProjects="true"/>
         <repositoryList
-            name="Neon">
+            name="Photon">
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository"/>
           <repository
               url="http://download.eclipse.org/technology/swtbot/snapshots/"/>
           <repository
-              url="http://download.eclipse.org/tm/updates/4.0/"/>
-          <repository
-              url="http://download.eclipse.org/eclipse/updates/4.6/"/>
+              url="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
           <repository
-              url="http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones"/>
+              url="http://download.eclipse.org/releases/photon"/>
           <repository
               url="http://download.eclipse.org/cbi/updates/license"/>
           <repository
-              url="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
+              url="http://download.eclipse.org/eclipse/updates/4.8milestones/"/>
           <repository
               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/cdt/job/tools-templates-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>
-        </repositoryList>
-        <repositoryList
-            name="Oxygen">
-          <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository"/>
-          <repository
-              url="http://download.eclipse.org/technology/swtbot/snapshots/"/>
-          <repository
-              url="http://download.eclipse.org/tm/updates/4.0/"/>
+              url="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/I-3.10.0-20180201205936/repository"/>
           <repository
-              url="http://download.eclipse.org/eclipse/updates/4.7/"/>
-          <repository
-              url="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
-          <repository
-              url="http://download.eclipse.org/cbi/updates/license"/>
-          <repository
-              url="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
-          <repository
-              url="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>
-          <repository
-              url="http://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
+              url="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
           <repository
               url="https://hudson.eclipse.org/cdt/job/tools-templates-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>
+          <repository
+              url="http://download.eclipse.org/tm4e/snapshots/"/>
         </repositoryList>
       </targlet>
     </setupTask>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index ae82d0eab43..087c0ee5d61 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt" sequenceNumber="24">
+<?pde version="3.8"?><target name="cdt" sequenceNumber="25">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.antlr.runtime" version="0.0.0"/>
@@ -15,7 +15,7 @@
 <unit id="org.hamcrest.core" version="0.0.0"/>
 <unit id="com.google.gson" version="0.0.0"/>
 <unit id="org.freemarker" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/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"/>
@@ -32,7 +32,7 @@
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <!-- Needed for org.eclipse.emf.edit -->
 <!-- Need to pull in org.eclipse.cdt.utils.pty for org.eclipse.remote.core to build -->
-<repository location="http://download.eclipse.org/releases/oxygen"/>
+<repository location="http://download.eclipse.org/releases/photon"/>
 </location>
 
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -43,7 +43,7 @@
 <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.8milestones/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
@@ -56,13 +56,13 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M5-20170201000249/repository/"/>
+<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/I-3.10.0-20180201205936/repository"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.3milestones/"/>
+<repository location="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
-- 
cgit v1.2.3