From f426fe3e1067a7e0c8fde54fa9c5a1bcecf6b401 Mon Sep 17 00:00:00 2001
From: Ed Merks
Date: Thu, 11 Aug 2016 08:20:50 +0200
Subject: Fix EGit.setup to work with latest master

This involves an updated API baseline site
and better update sites for the targlet task.
Also, an Eclipse Ini task is introduced for easier testing of changes.

Bug: 461542
Change-Id: Ie1349a3c2e6bcf1ee56a4c3d86e75d3e6cca6705
Signed-off-by: Ed Merks <ed.merks@gmail.com>
---
 tools/oomph/EGit.setup | 65 ++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup
index 27a9744698..c7a30c4f1c 100644
--- a/tools/oomph/EGit.setup
+++ b/tools/oomph/EGit.setup
@@ -33,6 +33,11 @@
       option="-Xmx"
       value="1g"
       vm="true"/>
+  <setupTask
+      xsi:type="setup:EclipseIniTask"
+      option="-Doomph.redirection.egit="
+      value="https://git.eclipse.org/c/egit/egit.git/plain/tools/oomph/EGit.setup->${git.clone.egit.location|uri}/tools/oomph/EGit.setup"
+      vm="true"/>
   <setupTask
       xsi:type="setup:ResourceCreationTask"
       excludedTriggers="STARTUP MANUAL"
@@ -55,10 +60,15 @@
   <setupTask
       xsi:type="pde:APIBaselineTask"
       name="EGit"
-      version="4.0.1"
+      version="4.4.1"
       location="${workspace.location/../api.baseline}"
-      remoteURI="http://download.eclipse.org/egit/updates-4.0.1/org.eclipse.egit.repository-4.0.1.201506240215-r.zip"/>
+      remoteURI="http://download.eclipse.org/egit/updates-4.4.1/org.eclipse.egit.repository-4.4.1.201607150455-r.zip"/>
   <stream name="master">
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="eclipse.target.platform"
+        defaultValue="Neon"
+        storageURI="scope://Workspace"/>
     <setupTask
         xsi:type="git:GitCloneTask"
         id="git.clone.jgit"
@@ -115,46 +125,29 @@
         <requirement
             name="org.eclipse.pde.feature.group"/>
         <requirement
-            name="org.eclipse.jgit.ant"/>
-        <requirement
-            name="org.eclipse.jgit.ant.test"/>
-        <requirement
-            name="org.eclipse.jgit.http.test"/>
-        <requirement
-            name="org.eclipse.jgit.http.apache.feature.group"/>
-        <requirement
-            name="org.eclipse.jgit.junit.feature.group"/>
-        <requirement
-            name="org.eclipse.jgit.pgm.feature.group"/>
-        <requirement
-            name="org.eclipse.jgit.pgm.source.feature.group"/>
-        <requirement
-            name="org.eclipse.jgit.pgm.test"/>
-        <requirement
-            name="org.eclipse.jgit.target"/>
-        <requirement
-            name="org.eclipse.jgit.test"/>
+            name="org.eclipse.swtbot.eclipse.feature.group"/>
         <requirement
-            name="org.eclipse.egit.feature.group"/>
+            name="org.eclipse.swtbot.feature.group"/>
         <requirement
-            name="org.eclipse.egit.core.test"/>
+            name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/>
         <requirement
-            name="org.eclipse.egit.mylyn.feature.group"/>
-        <requirement
-            name="org.eclipse.egit.mylyn.ui.test"/>
-        <requirement
-            name="org.eclipse.egit.target"/>
-        <requirement
-            name="org.eclipse.egit.ui.test"/>
-        <requirement
-            name="org.eclipse.egit.source.feature.group"/>
-        <requirement
-            name="org.eclipse.swtbot.eclipse.core"/>
+            name="*"/>
         <sourceLocator
             rootFolder="${git.clone.jgit.location}"
             locateNestedProjects="true"/>
         <sourceLocator
             rootFolder="${git.clone.egit.location}"/>
+        <repositoryList
+            name="Neon">
+          <repository
+              url="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-R"/>
+          <repository
+              url="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730"/>
+          <repository
+              url="http://download.eclipse.org/technology/swtbot/snapshots"/>
+          <repository
+              url="http://download.eclipse.org/mylyn/releases/latest"/>
+        </repositoryList>
         <repositoryList
             name="Mars">
           <repository
@@ -190,7 +183,7 @@
               pattern="org\.eclipse\.egit.*"/>
           <operand
               xsi:type="workingsets:ExclusionPredicate"
-              excludedWorkingSet="//@streams[name='master']/@setupTasks.3/@workingSets.2 //@streams[name='master']/@setupTasks.3/@workingSets.3"/>
+              excludedWorkingSet="//@streams[name='master']/@setupTasks.4/@workingSets.2 //@streams[name='master']/@setupTasks.4/@workingSets.3"/>
         </predicate>
       </workingSet>
       <workingSet
@@ -202,7 +195,7 @@
               pattern="org\.eclipse\.jgit.*"/>
           <operand
               xsi:type="workingsets:ExclusionPredicate"
-              excludedWorkingSet="//@streams[name='master']/@setupTasks.3/@workingSets.2 //@streams[name='master']/@setupTasks.3/@workingSets.3"/>
+              excludedWorkingSet="//@streams[name='master']/@setupTasks.4/@workingSets.2 //@streams[name='master']/@setupTasks.4/@workingSets.3"/>
         </predicate>
       </workingSet>
       <workingSet
-- 
cgit v1.2.3