wip OOMPH setup
diff --git a/org.eclipse.modisco.oomph/setups/MyProduct.setup b/org.eclipse.modisco.oomph/setups/MyProduct.setup
new file mode 100644
index 0000000..430cfaf
--- /dev/null
+++ b/org.eclipse.modisco.oomph/setups/MyProduct.setup
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<setup:Product

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"

+    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"

+    name="my.product"

+    label="My Product">

+  <annotation

+      source="http://www.eclipse.org/oomph/setup/BrandingInfo">

+    <detail

+        key="folderName">

+      <value>eclipse</value>

+    </detail>

+    <detail

+        key="folderName.macosx">

+      <value>Eclipse</value>

+    </detail>

+  </annotation>

+  <version name="2020-06"

+      label="2020-06"

+      requiredJavaVersion="1.8">

+    <setupTask

+        xsi:type="setup.p2:P2Task"

+        label="${scope.product.label} (${scope.product.version.label})">

+      <requirement

+          name="org.eclipse.platform.ide"/>

+      <requirement

+          name="org.eclipse.platform.feature.group"/>

+      <requirement

+          name="org.eclipse.rcp.feature.group"/>

+      <requirement

+          name="my.product.feature.group"/>

+      <repository

+          url="http://download.eclipse.org/releases/2020-06"/>

+    </setupTask>

+    <description>My Product for 2020-06.</description>

+  </version>

+  <description>My Product provides cool stuff.</description>

+</setup:Product>

diff --git a/org.eclipse.modisco.oomph/setups/MyProject.setup b/org.eclipse.modisco.oomph/setups/MyProject.setup
new file mode 100644
index 0000000..0d29183
--- /dev/null
+++ b/org.eclipse.modisco.oomph/setups/MyProject.setup
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<setup:Project

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"

+    xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"

+    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"

+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"

+    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"

+    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"

+    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"

+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"

+    name="myproject"

+    label="My Project">

+  <setupTask

+      xsi:type="jdt:JRETask"

+      version="JavaSE-1.8"

+      location="${jre.location-1.8}"

+      name="JRE for JavaSE-1.8">

+    <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:EclipseIniTask"

+      option="-Xmx"

+      value="1024m"

+      vm="true">

+    <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:ResourceCreationTask"

+      excludedTriggers="STARTUP MANUAL"

+      content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"

+      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"

+      encoding="UTF-8">

+    <description>Initialize JDT's package explorer to show working sets as its root objects</description>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:VariableTask"

+      name="eclipse.target.platform"

+      defaultValue="2020-06"

+      storageURI="scope://Workspace"/>

+  <setupTask

+      xsi:type="setup.p2:P2Task">

+    <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>

+  </setupTask>

+  <setupTask

+      xsi:type="git:GitCloneTask"

+      id="git.clone.myproject"

+      remoteURI="modisco/org.eclipse.modisco">

+    <annotation

+        source="http://www.eclipse.org/oomph/setup/InducedChoices">

+      <detail

+          key="inherit">

+        <value>eclipse.git.gerrit.remoteURIs</value>

+      </detail>

+      <detail

+          key="label">

+        <value>${scope.project.label} Git or Gerrit repository</value>

+      </detail>

+      <detail

+          key="target">

+        <value>remoteURI</value>

+      </detail>

+    </annotation>

+    <description>${scope.project.label}</description>

+  </setupTask>

+  <setupTask

+      xsi:type="setup.targlets:TargletTask">

+    <targlet

+        name="${scope.project.label}"

+        activeRepositoryList="${eclipse.target.platform}">

+      <requirement

+          name="org.eclipse.sdk.feature.group"/>

+      <requirement

+          name="*"/>

+      <sourceLocator

+          rootFolder="${git.clone.myproject.location}"

+          locateNestedProjects="true"/>

+      <repositoryList

+          name="2020-06">

+        <repository

+            url="http://download.eclipse.org/releases/2020-06"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="2020-03">

+        <repository

+            url="http://download.eclipse.org/releases/2020-03"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-12">

+        <repository

+            url="http://download.eclipse.org/releases/2019-12"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-09">

+        <repository

+            url="http://download.eclipse.org/releases/2019-09"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-06">

+        <repository

+            url="http://download.eclipse.org/releases/2019-06"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-03">

+        <repository

+            url="http://download.eclipse.org/releases/2019-03"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="2018-12">

+        <repository

+            url="http://download.eclipse.org/releases/2018-12"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="2018-09">

+        <repository

+            url="http://download.eclipse.org/releases/2018-09"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Photon">

+        <repository

+            url="http://download.eclipse.org/releases/photon"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Oxygen">

+        <repository

+            url="http://download.eclipse.org/releases/oxygen"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Neon">

+        <repository

+            url="http://download.eclipse.org/releases/neon"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Mars">

+        <repository

+            url="http://download.eclipse.org/releases/mars"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Luna">

+        <repository

+            url="http://download.eclipse.org/releases/luna"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Kepler">

+        <repository

+            url="http://download.eclipse.org/releases/kepler"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Juno">

+        <repository

+            url="http://download.eclipse.org/releases/juno"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Indigo">

+        <repository

+            url="http://download.eclipse.org/releases/indigo"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Helios">

+        <repository

+            url="http://download.eclipse.org/releases/helios"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+      <repositoryList

+          name="Galileo">

+        <repository

+            url="http://download.eclipse.org/releases/galileo"/>

+        <repository

+            url="http://download.eclipse.org/cbi/updates/license"/>

+      </repositoryList>

+    </targlet>

+  </setupTask>

+  <setupTask

+      xsi:type="setup.workingsets:WorkingSetTask"

+      prefix="org.eclipse.myproject-">

+    <workingSet

+        name="${scope.project.label}">

+      <predicate

+          xsi:type="predicates:AndPredicate">

+        <operand

+            xsi:type="predicates:RepositoryPredicate"

+            project="org.eclipse.modisco.oomph"/>

+      </predicate>

+    </workingSet>

+    <description>The dynamic working sets for ${scope.project.label}</description>

+  </setupTask>

+  <stream name="master"

+      label="Master">

+    <setupTask

+        xsi:type="setup:EclipseIniTask"

+        option="-Doomph.redirection.myproject"

+        value="=https://git.eclipse.org/c/modisco/org.eclipse.modisco.git/plain/org.eclipse.modisco.oomph/MyProject.setup->${git.clone.myproject.location|uri}/org.eclipse.modisco.oomph/MyProject.setup"

+        vm="true">

+      <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>

+    </setupTask>

+  </stream>

+  <logicalProjectContainer

+      xsi:type="setup:ProjectCatalog"

+      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>

+  <description>My Project provides cool stuff.</description>

+</setup:Project>

diff --git a/org.eclipse.modisco.oomph/setups/MyProjectsCatalog.setup b/org.eclipse.modisco.oomph/setups/MyProjectsCatalog.setup
new file mode 100644
index 0000000..6a91b17
--- /dev/null
+++ b/org.eclipse.modisco.oomph/setups/MyProjectsCatalog.setup
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<setup:ProjectCatalog

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0"

+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"

+    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"

+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore"

+    name="my.projects.catalog"

+    label="My Projects Catalog">

+  <annotation

+      source="http://www.eclipse.org/oomph/setup/BrandingInfo">

+    <detail

+        key="imageURI">

+      <value>platform:/plugin/org.eclipse.oomph.setup.ui/icons/committers.png</value>

+    </detail>

+    <detail

+        key="siteURI">

+      <value>https://projects.eclipse.org/</value>

+    </detail>

+  </annotation>

+  <setupTask

+      xsi:type="setup:CompoundTask"

+      name="Global Variables">

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="eclipse.target.platform"

+        defaultValue="None"

+        storageURI="scope://Workspace"

+        label="Target Platform">

+      <annotation

+          source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>

+      <choice

+          value="2020-06"

+          label="Eclipse 2020-06 - 4.16"/>

+      <choice

+          value="2020-03"

+          label="Eclipse 2020-03 - 4.15"/>

+      <choice

+          value="2019-12"

+          label="Eclipse 2019-12 - 4.14"/>

+      <choice

+          value="2019-09"

+          label="Eclipse 2019-09 - 4.13"/>

+      <choice

+          value="2019-06"

+          label="Eclipse 2019-06 - 4.12"/>

+      <choice

+          value="2019-03"

+          label="Eclipse 2019-03 - 4.11"/>

+      <choice

+          value="2018-12"

+          label="Eclipse 2018-12 - 4.10"/>

+      <choice

+          value="2018-09"

+          label="Eclipse 2018-09 - 4.9"/>

+      <choice

+          value="Photon"

+          label="Eclipse Photon- 4.8"/>

+      <choice

+          value="Oxygen"

+          label="Eclipse Oxygen - 4.7"/>

+      <choice

+          value="Neon"

+          label="Eclipse Neon - 4.6"/>

+      <choice

+          value="Mars"

+          label="Eclipse Mars - 4.5"/>

+      <choice

+          value="Luna"

+          label="Eclipse Luna - 4.4"/>

+      <choice

+          value="Kepler"

+          label="Eclipse Kepler - 4.3"/>

+      <choice

+          value="Juno"

+          label="Eclipse Juno - 4.2"/>

+      <choice

+          value="Indigo"

+          label="Eclipse Indigo - 3.7"/>

+      <choice

+          value="Helios"

+          label="Eclipse Helios - 3.6"/>

+      <choice

+          value="Galileo"

+          label="Eclipse Galileo - 3.5"/>

+      <choice

+          value="None"

+          label="None"/>

+      <description>Choose the compatibility level of the target platform</description>

+    </setupTask>

+    <setupTask

+        xsi:type="setup:VariableTask"

+        name="eclipse.api.baseline.target.platform"

+        value="None"

+        storageURI="scope://Workspace"

+        label="API Baseline Target Platform">

+      <annotation

+          source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>

+      <choice

+          value="2020-03"

+          label="Eclipse 2020-03 - 4.15"/>

+      <choice

+          value="2019-12"

+          label="Eclipse 2019-12 - 4.14"/>

+      <choice

+          value="2019-09"

+          label="Eclipse 2019-09 - 4.13"/>

+      <choice

+          value="2019-06"

+          label="Eclipse 2019-06 - 4.12"/>

+      <choice

+          value="2019-03"

+          label="Eclipse 2019-03 - 4.11"/>

+      <choice

+          value="2018-12"

+          label="Eclipse 2018-12 - 4.10"/>

+      <choice

+          value="2018-09"

+          label="Eclipse 2018-09 - 4.9"/>

+      <choice

+          value="Photon"

+          label="Eclipse Photon- 4.8"/>

+      <choice

+          value="Oxygen"

+          label="Eclipse Oxygen - 4.7"/>

+      <choice

+          value="Neon"

+          label="Eclipse Neon - 4.6"/>

+      <choice

+          value="Mars"

+          label="Eclipse Mars - 4.5"/>

+      <choice

+          value="Luna"

+          label="Eclipse Luna - 4.4"/>

+      <choice

+          value="Kepler"

+          label="Eclipse Kepler - 4.3"/>

+      <choice

+          value="Juno"

+          label="Eclipse Juno - 4.2"/>

+      <choice

+          value="Indigo"

+          label="Eclipse Indigo - 3.7"/>

+      <choice

+          value="Helios"

+          label="Eclipse Helios - 3.6"/>

+      <choice

+          value="Galileo"

+          label="Eclipse Galileo - 3.5"/>

+      <choice

+          value="None"

+          label="None"/>

+      <description>Choose the compatibility level of the target platform for the modular API baseline</description>

+    </setupTask>

+  </setupTask>

+  <setupTask

+      xsi:type="setup:WorkspaceTask"

+      id="workspace"/>

+  <setupTask

+      xsi:type="setup:ResourceCreationTask"

+      content="MAX_RECENT_WORKSPACES=5&#xD;&#xA;RECENT_WORKSPACES=${workspace.location|property}&#xD;&#xA;RECENT_WORKSPACES_PROTOCOL=3&#xD;&#xA;SHOW_WORKSPACE_SELECTION_DIALOG=true&#xD;&#xA;eclipse.preferences.version=1"

+      targetURL="configuration:/.settings/org.eclipse.ui.ide.prefs"/>

+  <setupTask

+      xsi:type="setup:TextModifyTask"

+      url="configuration:/config.ini">

+    <modification

+        pattern="osgi\.instance\.area\.default=(@user\.home/workspace)">

+      <substitution>${workspace.location|path}</substitution>

+    </modification>

+  </setupTask>

+  <setupTask

+      xsi:type="setup.targlets:TargletTask">

+    <targlet

+        name="Eclipse Platform"

+        activeRepositoryList="${eclipse.target.platform}">

+      <repositoryList

+          name="None"/>

+      <repositoryList

+          name="2020-06">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.16-I-builds"/>

+      </repositoryList>

+      <repositoryList

+          name="2020-03">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.15/R-4.15-202003050155"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-12">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.14/R-4.14-201912100610"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-09">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.13/R-4.13-201909161045"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-06">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-03">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.11/R-4.11-201903070500"/>

+      </repositoryList>

+      <repositoryList

+          name="2018-12">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815"/>

+      </repositoryList>

+      <repositoryList

+          name="2018-09">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.9/R-4.9-201809060745"/>

+      </repositoryList>

+      <repositoryList

+          name="Photon">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500"/>

+      </repositoryList>

+      <repositoryList

+          name="Oxygen">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640"/>

+      </repositoryList>

+      <repositoryList

+          name="Neon">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400"/>

+      </repositoryList>

+      <repositoryList

+          name="Mars">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500"/>

+      </repositoryList>

+      <repositoryList

+          name="Luna">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.4/R-4.4.2-201502041700"/>

+      </repositoryList>

+      <repositoryList

+          name="Kepler">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.3/R-4.3.2-201402211700"/>

+      </repositoryList>

+      <repositoryList

+          name="Juno">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.2/R-4.2.2-201302041200"/>

+      </repositoryList>

+      <repositoryList

+          name="Indigo">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/3.7/R-3.7.2-201202080800"/>

+      </repositoryList>

+      <repositoryList

+          name="Helios">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/3.6/R-3.6.2-201102101200"/>

+      </repositoryList>

+      <repositoryList

+          name="Galileo">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/3.5/R-3.5.2-201002111343"/>

+      </repositoryList>

+    </targlet>

+  </setupTask>

+  <setupTask

+      xsi:type="setup.targlets:TargletTask"

+      id="api.baseline.targlet"

+      targetName="Modular API Baseline Target"

+      activateTarget="false">

+    <targlet

+        name="Eclipse Platform"

+        activeRepositoryList="${eclipse.api.baseline.target.platform}"

+        includeSources="false">

+      <repositoryList

+          name="None"/>

+      <repositoryList

+          name="2020-03">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.15/R-4.15-202003050155"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-12">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.14/R-4.14-201912100610"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-09">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.13/R-4.13-201909161045"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-06">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.12/R-4.12-201906051800"/>

+      </repositoryList>

+      <repositoryList

+          name="2019-03">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.11/R-4.11-201903070500"/>

+      </repositoryList>

+      <repositoryList

+          name="2018-12">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.10/R-4.10-201812060815"/>

+      </repositoryList>

+      <repositoryList

+          name="2018-09">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.9/R-4.9-201809060745"/>

+      </repositoryList>

+      <repositoryList

+          name="Photon">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500"/>

+      </repositoryList>

+      <repositoryList

+          name="Oxygen">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640"/>

+      </repositoryList>

+      <repositoryList

+          name="Neon">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400"/>

+      </repositoryList>

+      <repositoryList

+          name="Mars">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500"/>

+      </repositoryList>

+      <repositoryList

+          name="Luna">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.4/R-4.4.2-201502041700"/>

+      </repositoryList>

+      <repositoryList

+          name="Kepler">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.3/R-4.3.2-201402211700"/>

+      </repositoryList>

+      <repositoryList

+          name="Juno">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/4.2/R-4.2.2-201302041200"/>

+      </repositoryList>

+      <repositoryList

+          name="Indigo">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/3.7/R-3.7.2-201202080800"/>

+      </repositoryList>

+      <repositoryList

+          name="Helios">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/3.6/R-3.6.2-201102101200"/>

+      </repositoryList>

+      <repositoryList

+          name="Galileo">

+        <repository

+            url="http://download.eclipse.org/eclipse/updates/3.5/R-3.5.2-201002111343"/>

+      </repositoryList>

+    </targlet>

+  </setupTask>

+  <setupTask

+      xsi:type="pde:APIBaselineFromTargetTask"

+      predecessor="api.baseline.targlet"

+      name="Modular API Baseline"

+      targetName="Modular API Baseline Target">

+    <description>An API baseline based on the target platform named 'Modular API Baseline Target'</description>

+  </setupTask>

+  <project href="user:/MyProjectsCatalog.setup?name='user.project',label='&lt;User>',description='A container project for local user projects that are virtual members of the My Projects Catalog project catalog'#/"/>

+  <description>My Projects Catalog provides cool projects.</description>

+</setup:ProjectCatalog>

diff --git a/org.eclipse.modisco.oomph/setups/modisco.setup b/org.eclipse.modisco.oomph/setups/modisco.setup
index be0dec6..300b614 100644
--- a/org.eclipse.modisco.oomph/setups/modisco.setup
+++ b/org.eclipse.modisco.oomph/setups/modisco.setup
@@ -5,6 +5,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
     xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
+<<<<<<< Upstream, based on master
     xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"
     xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
     xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
@@ -510,4 +511,462 @@
       xsi:type="setup:ProjectCatalog"
       href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
   <description>The development environment for QVTd</description>
+=======
+    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
+    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
+    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
+    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
+    name="modisco"
+    label="MoDisco">
+  <setupTask
+      xsi:type="setup:VariableTask"
+      name="eclipse.target.platform"
+      defaultValue="2020-03"
+      storageURI="scope://Workspace"/>
+  <setupTask
+      xsi:type="git:GitCloneTask"
+      id="modisco.git.clone"
+      remoteURI="modisco/org.eclipse.modisco.git">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/InducedChoices">
+      <detail
+          key="inherit">
+        <value>eclipse.git.gerrit.remoteURIs</value>
+      </detail>
+      <detail
+          key="label">
+        <value>MoDisco Git or Gerrit Repository</value>
+      </detail>
+      <detail
+          key="target">
+        <value>remoteURI</value>
+      </detail>
+    </annotation>
+    <description>MoDisco Git repository clone</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:CompoundTask"
+      name="Eclipse Installation">
+    <setupTask
+        xsi:type="jdt:JRETask"
+        version="JavaSE-1.8"
+        location="${jre.location-1.8}"/>
+    <setupTask
+        xsi:type="setup:EclipseIniTask"
+        option="-Xmx"
+        value="2048m"
+        vm="true"/>
+    <setupTask
+        xsi:type="setup:ResourceCreationTask"
+        excludedTriggers="STARTUP MANUAL"
+        content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
+        targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
+        encoding="UTF-8"/>
+    <setupTask
+        xsi:type="setup.targlets:TargletTask">
+      <targlet
+          name="MoDisco Target Platform"
+          activeRepositoryList="${eclipse.target.platform}">
+        <requirement
+            name="org.eclipse.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.query.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.transaction.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.validation.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.uml2.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.ocl.all.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.acceleo.runtime.feature.group"/>
+        <requirement
+            name="org.eclipse.m2m.atl.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.eclipse.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.ide.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.forms.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.cdo.feature.group"/>
+        <requirement
+            name="org.eclipse.net4j.feature.group"/>
+        <requirement
+            name="org.eclipse.net4j.db.derby"/>
+        <requirement
+            name="org.eclipse.birt.chart.feature.group"/>
+        <requirement
+            name="org.antlr.runtime"/>
+        <requirement
+            name="org.apache.commons.cli"/>
+        <requirement
+            name="org.apache.lucene"/>
+        <requirement
+            name="org.apache.lucene.core"/>
+        <requirement
+            name="org.apache.lucene.misc"/>
+        <requirement
+            name="org.apache.lucene.queries"/>
+        <requirement
+            name="org.hamcrest"/>
+        <requirement
+            name="org.prefuse"/>
+        <repositoryList
+            name="Latest">
+          <repository
+              url="http://download.eclipse.org/releases/latest"/>
+          <repository
+              url="https://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+        </repositoryList>
+        <repositoryList
+            name="2020-06">
+          <repository
+              url="http://download.eclipse.org/releases/2020-06"/>
+          <repository
+              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.22"/>
+          <repository
+              url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.12.0"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2020-03">
+          <repository
+              url="http://download.eclipse.org/releases/2020-03"/>
+          <repository
+              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.21"/>
+          <repository
+              url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.11.0"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/"/>
+          <repository
+              url="https://download.eclipse.org/technology/swtbot/releases/latest"/>
+          <repository
+              url="https://download.eclipse.org/acceleo/updates/releases/3.7/R201902261618"/>
+          <repository
+              url="http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-12">
+          <repository
+              url="http://download.eclipse.org/releases/2019-12"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-09">
+          <repository
+              url="http://download.eclipse.org/releases/2019-09"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-06">
+          <repository
+              url="http://download.eclipse.org/releases/2019-06"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-03">
+          <repository
+              url="http://download.eclipse.org/releases/2019-03"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2018-12">
+          <repository
+              url="http://download.eclipse.org/releases/2018-12"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2018-09">
+          <repository
+              url="http://download.eclipse.org/releases/2018-09"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="Photon">
+          <repository
+              url="http://download.eclipse.org/releases/photon"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="Oxygen">
+          <repository
+              url="http://download.eclipse.org/releases/oxygen"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="Neon">
+          <repository
+              url="http://download.eclipse.org/releases/neon"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="Mars">
+          <repository
+              url="http://download.eclipse.org/releases/mars"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="Luna">
+          <repository
+              url="http://download.eclipse.org/releases/luna"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+          <repository
+              url="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/luna"/>
+        </repositoryList>
+      </targlet>
+    </setupTask>
+    <setupTask
+        xsi:type="setup.p2:P2Task"
+        label="Developer IDE ">
+      <requirement
+          name="org.eclipse.emf.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.egit.feature.group"/>
+      <requirement
+          name="org.eclipse.ocl.all.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
+      <description>Mandatory IDE for MoDisco Developers</description>
+    </setupTask>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:CompoundTask"
+      name="Java Compiler">
+    <setupTask
+        xsi:type="setup:PreferenceTask"
+        key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
+        value="ignore"/>
+  </setupTask>
+  <project name="dev"
+      label="Development">
+    <setupTask
+        xsi:type="projects:ProjectsImportTask">
+      <sourceLocator
+          rootFolder="${modisco.git.clone.location}"
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.gmt.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.*.feature"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.oomph"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.updatesite"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.releng.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="bug.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="test.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="benchmark.*"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
+      <description>Development Projects</description>
+    </setupTask>
+    <setupTask
+        xsi:type="setup.workingsets:WorkingSetTask">
+      <workingSet
+          name="MoDisco Plugins">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org.eclipse.modisco.*"/>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.*.feature"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco*.tests"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.updatesite"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.oomph"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.modisco.releng.*"/>
+          </operand>
+        </predicate>
+      </workingSet>
+      <workingSet
+          name="MoDisco Tests">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.modisco.*.tests"/>
+      </workingSet>
+    </setupTask>
+    <stream
+        name="master"
+        label="Master (Latest)"/>
+    <stream
+        name="1.5.1"
+        label="1.5.1 (2020-03)"/>
+    <stream
+        name="1.5.0"
+        label="1.5.0 (2019-12)"/>
+    <description>The development environment for the MoDisco project</description>
+  </project>
+  <project name="Releng">
+    <setupTask
+        xsi:type="setup.p2:P2Task"
+        label="Releng Tools">
+      <requirement
+          name="org.eclipse.m2e.feature.feature.group"/>
+    </setupTask>
+    <setupTask
+        xsi:type="projects:ProjectsImportTask">
+      <sourceLocator
+          rootFolder="${modisco.git.clone.location}"
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.gmt.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="bug.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="test.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="benchmark.*"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
+      <description>Releng projects</description>
+    </setupTask>
+    <setupTask
+        xsi:type="setup.workingsets:WorkingSetTask">
+      <workingSet
+          name="MoDisco Features">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.modisco*.feature"/>
+      </workingSet>
+      <workingSet
+          name="MoDisco Releng + Doc">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.modisco.*.doc"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.modisco.oomph"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.modisco.releng"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.modisco.updatesite"/>
+      </workingSet>
+    </setupTask>
+    <stream
+        name="master"
+        label="Master (Latest)"/>
+    <stream
+        name="1.5.1"
+        label="1.5.1 (2020-03)"/>
+    <stream
+        name="1.5.0"
+        label="1.5.0 (2019-12)"/>
+  </project>
+  <logicalProjectContainer
+      xsi:type="setup:ProjectCatalog"
+      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
+  <description>The development environment for MoDisco</description>
+>>>>>>> 04f56e9 wip OOMPH setup
 </setup:Project>
diff --git a/org.eclipse.modisco.oomph/setups/org.eclipse.setup b/org.eclipse.modisco.oomph/setups/org.eclipse.setup
new file mode 100644
index 0000000..eceae1e
--- /dev/null
+++ b/org.eclipse.modisco.oomph/setups/org.eclipse.setup
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<setup:Index

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"

+    name="My Index">

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/ProjectSet.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Targlets.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Workbench.ecore#/"/>

+  <discoverablePackage

+      href="http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore#/"/>

+  <productCatalog

+      href="catalog:/self-product-catalog.setup#/"/>

+  <productCatalog

+      href="user:/user.products.setup?class='http://www.eclipse.org/oomph/setup/1.0%23//ProductCatalog',name='user.products',label='%3CUser%20Products%3E',description='A%20container%20catalog%20for%20local%20user-defined%20products'#/"/>

+</setup:Index>