87373: redistribute reviews/bugs/builds Oomph setup tasks [I39a3772f]

Task-Url: https://git.eclipse.org/r/#/c/87373/

Change-Id: Ice7fb1ef8bab11950d1d0dd2f5b67a5535bb8001
Signed-off-by: Frank Becker <eclipse@frank-becker.de>
diff --git a/org.eclipse.mylyn.releng/oomph/Mylyn.setup b/org.eclipse.mylyn.releng/oomph/Mylyn.setup
index 2961da9..e5950c8 100755
--- a/org.eclipse.mylyn.releng/oomph/Mylyn.setup
+++ b/org.eclipse.mylyn.releng/oomph/Mylyn.setup
@@ -113,6 +113,27 @@
         url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
   </setupTask>
   <setupTask
+      xsi:type="setup:CompoundTask"
+      id="mylyn.basline"
+      name="Baseline">
+    <setupTask
+        xsi:type="setup:VariableTask"
+        type="FOLDER"
+        name="mylyn.baseline.location"
+        defaultValue="$${workspace.location/../api.baseline}"
+        storageURI="scope://Workspace"
+        label="Mylyn API baseline location">
+      <description>The root install folder where the Mylyn API Baseline is installed.</description>
+    </setupTask>
+    <setupTask
+        xsi:type="pde:APIBaselineTask"
+        id="mylyn.baseline"
+        name="Mylyn"
+        version="3.21"
+        location="${mylyn.baseline.location}"
+        remoteURI="http://download.eclipse.org/mylyn/drops/3.21.0/mylyn-3.21.0-api.zip"/>
+  </setupTask>
+  <setupTask
       xsi:type="setup.targlets:TargletTask">
     <targlet
         name="Mylyn"
@@ -166,929 +187,882 @@
       </repositoryList>
     </targlet>
   </setupTask>
-  <setupTask
-      xsi:type="setup:CompoundTask"
-      id="mylyn.basline"
-      name="Baseline">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        type="FOLDER"
-        name="mylyn.baseline.location"
-        defaultValue="$${workspace.location/../api.baseline}"
-        storageURI="scope://Workspace"
-        label="Mylyn API baseline location">
-      <description>The root install folder where the Mylyn API Baseline is installed.</description>
-    </setupTask>
-    <setupTask
-        xsi:type="pde:APIBaselineTask"
-        id="mylyn.baseline"
-        name="Mylyn"
-        version="3.21"
-        location="${mylyn.baseline.location}"
-        remoteURI="http://download.eclipse.org/mylyn/drops/3.21.0/mylyn-3.21.0-api.zip"/>
-  </setupTask>
-  <project name="builds"
-      label="Builds">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.builds"
-        value="${git.clone.mylyn.builds.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.builds"
-        remoteURI="mylyn/org.eclipse.mylyn.builds">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Builds Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Builds</description>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.mylyn.builds.location}/org.eclipse.mylyn.hudson.releng/"/>
-      <description>Import Releng Project</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Builds"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.builds.development.feature.group"/>
+  <project name="SourceCodeBugsReviewsAndBuilds"
+      label="Source Code, Bugs, Reviews, and Builds">
+    <project
+        name="builds"
+        label="Builds">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.builds"
+          value="${git.clone.mylyn.builds.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.builds"
+          remoteURI="mylyn/org.eclipse.mylyn.builds">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Builds Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Builds</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
         <sourceLocator
-            rootFolder="${git.clone.mylyn.builds.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Builds">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.builds.core"/>
-      </workingSet>
-    </setupTask>
-    <project
-        name="builds-bugs"
-        label="Bugzilla Bugs for Mylyn Builds">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Builds Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Builds&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+            rootFolder="${git.clone.mylyn.builds.location}/org.eclipse.mylyn.hudson.releng/"/>
+        <description>Import Releng Project</description>
       </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="builds-reviews"
-        label="Gerrit Reviews for Mylyn Builds">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Builds Reviews in ${git.clone.mylyn.builds.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.builds (owner:self OR reviewer:self)"/>
-        </query>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="builds-builds"
-        label="Hudson Builds for Mylyn Builds">
-      <setupTask
-          xsi:type="mylyn:MylynBuildsTask"
-          serverURL="https://hudson.eclipse.org/mylyn"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <buildPlan
-            name="mylyn-builds-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="commons"
-      label="Commons">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.commons"
-        value="${git.clone.mylyn.commons.location}"
-        documentation="The location of the Mylyn Commons Git clone."/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.commons"
-        remoteURI="mylyn/org.eclipse.mylyn.commons"
-        userID="">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Commons Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Commons</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Commons"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.commons.development.feature.group"/>
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.commons.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Commons">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.commons.core"/>
-      </workingSet>
-    </setupTask>
-    <project
-        name="commons-bugs"
-        label="Bugzilla Bugs for Mylyn Commons">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Commons Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Commons&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="commons-reviews"
-        label="Gerrit Reviews for Mylyn Commons">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Commons Reviews in ${git.clone.mylyn.commons.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.commons (owner:self OR reviewer:self)"/>
-        </query>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="commons-builds"
-        label="Hudson Builds for Mylyn Commons">
-      <setupTask
-          xsi:type="mylyn:MylynBuildsTask"
-          serverURL="https://hudson.eclipse.org/mylyn"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <buildPlan
-            name="mylyn-commons-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="context"
-      label="Context">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.jdt.core"
-        remoteURI="jdt/eclipse.jdt.core"
-        pushURI=""
-        checkoutBranch="master">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>JDT Core Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>JDT Core</description>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.jdt.core.location}/org.eclipse.jdt.annotation_v1/"/>
-      <description>Import JDT Annotations v1.1</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:PreferenceTask"
-        key="/project/org.eclipse.jdt.annotation_v1/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
-        value="ignore"/>
-    <setupTask
-        xsi:type="jdt:JRETask"
-        version="J2SE-1.5"
-        location="${jre.location-1.5}"/>
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.context"
-        value="${git.clone.mylyn.context.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.context"
-        remoteURI="mylyn/org.eclipse.mylyn.context"
-        checkoutBranch="master">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Context Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Context</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Context"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.context.development.feature.group"/>
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.context.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Context">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.context.core"/>
-      </workingSet>
-    </setupTask>
-    <project
-        name="context-bugs"
-        label="Bugzilla Bugs for Mylyn Context">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Context Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Context&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="context-reviews"
-        label="Gerrit Reviews for Mylyn Context">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Context Reviews in ${git.clone.mylyn.context.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.context (owner:self OR reviewer:self)"/>
-        </query>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="context-builds"
-        label="Hudson Builds for Mylyn Context">
-      <setupTask
-          xsi:type="mylyn:MylynBuildsTask"
-          serverURL="https://hudson.eclipse.org/mylyn"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <buildPlan
-            name="mylyn-context-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="docs"
-      label="Docs">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.docs"
-        value="${git.clone.mylyn.docs.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.docs"
-        remoteURI="mylyn/org.eclipse.mylyn.docs">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Docs Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Docs</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Docs"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.docs.development.feature.group"/>
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.docs.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Docs">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.wikitext.core"/>
-      </workingSet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:ResourceCreationTask"
-        excludedTriggers="BOOTSTRAP"
-        predecessor="git.clone.mylyn.docs"
-        content="&lt;!-- Placeholder file. Real toc file will be generated during the build -->"
-        targetURL="platform:/resource/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn WikiText User Guide-toc.xml"
-        encoding="UTF-8">
-      <description>Create a placeholder file &quot;Mylyn WikiText User Guide-toc.xml&quot;</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:ResourceCreationTask"
-        excludedTriggers="BOOTSTRAP"
-        predecessor="git.clone.mylyn.docs"
-        content="&lt;!-- Placeholder file. Real toc file will be generated during the build -->"
-        targetURL="platform:/resource/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText Developer Guide-toc.xml"
-        encoding="UTF-8">
-      <description>Create a placeholder file &quot;WikiText Developer Guide-toc.xml&quot;</description>
-    </setupTask>
-    <project
-        name="docs-bugs"
-        label="Bugzilla Bugs for Mylyn Docs">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Docs Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Docs&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="docs-reviews"
-        label="Gerrit Reviews for Mylyn Docs">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Docs Reviews in ${git.clone.mylyn.docs.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.docs (owner:self OR reviewer:self)"/>
-        </query>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="docs-builds"
-        label="Hudson Builds for Mylyn Docs">
-      <setupTask
-          xsi:type="mylyn:MylynBuildsTask"
-          serverURL="https://hudson.eclipse.org/mylyn"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <buildPlan
-            name="mylyn-docs-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="incubator"
-      label="Incubator">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.incubator"
-        value="${git.clone.mylyn.incubator.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.incubator"
-        remoteURI="mylyn/org.eclipse.mylyn.incubator">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Incubator Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Incubator</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Incubator"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.incubator.development.feature.group"/>
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.incubator.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Incubator">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.sandbox.ui"/>
-      </workingSet>
-    </setupTask>
-    <project
-        name="incubator-bugs"
-        label="Bugzilla Bugs for Mylyn Incubator">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Incubator Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Incubator&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="incubator-reviews"
-        label="Gerrit Reviews for Mylyn Incubator">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Incubator Reviews in ${git.clone.mylyn.incubator.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.incubator (owner:self OR reviewer:self)"/>
-        </query>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="incubator-builds"
-        label="Hudson Builds for Mylyn Incubator">
-      <setupTask
-          xsi:type="mylyn:MylynBuildsTask"
-          serverURL="https://hudson.eclipse.org/mylyn"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <buildPlan
-            name="mylyn-incubator-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-      <description></description>
-    </project>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="releng"
-      label="Releng">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.releng"
-        value="${git.clone.mylyn.releng.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.releng"
-        remoteURI="mylyn/org.eclipse.mylyn">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Releng Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Releng</description>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.releng/"/>
-      <sourceLocator
-          rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn-parent/"/>
-      <sourceLocator
-          rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.maven-parent/"/>
-      <sourceLocator
-          rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.tests/"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Releng">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.releng"/>
-      </workingSet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Releng"
-          activeRepositoryList="${eclipse.target.platform}">
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.releng.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.mylyn"
-        value="=http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.git/plain/org.eclipse.mylyn.releng/oomph/Mylyn.setup->${git.clone.mylyn.releng.location|uri}/org.eclipse.mylyn.releng/oomph/Mylyn.setup"/>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="reviews"
-      label="Reviews">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.reviews"
-        value="${git.clone.mylyn.reviews.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.reviews"
-        remoteURI="mylyn/org.eclipse.mylyn.reviews">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Reviews Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Reviews</description>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.mylyn.reviews.location}/org.eclipse.mylyn.gerrit.releng/"/>
-      <description>Import Releng Project</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Reviews"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.reviews.development.feature.feature.group"/>
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.reviews.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Reviews">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.reviews.core"/>
-      </workingSet>
-    </setupTask>
-    <project
-        name="reviews-bugs"
-        label="Bugzilla Bugs for Mylyn Reviews">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Reviews Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Reviews&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="reviews-reviews"
-        label="Gerrit Reviews for Mylyn Reviews">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Reviews Reviews in ${git.clone.mylyn.reviews.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.reviews (owner:self OR reviewer:self)"/>
-        </query>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="reviews-builds"
-        label="Hudson Builds for Mylyn Reviews">
-      <setupTask
-          xsi:type="mylyn:MylynBuildsTask"
-          serverURL="https://hudson.eclipse.org/mylyn"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <buildPlan
-            name="mylyn-reviews-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="tasks"
-      label="Tasks">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.tasks"
-        value="${git.clone.mylyn.tasks.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.tasks"
-        remoteURI="mylyn/org.eclipse.mylyn.tasks"
-        checkoutBranch="master">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Tasks Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Tasks</description>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.mylyn.tasks.location}/org.eclipse.mylyn.bugzilla.releng/"/>
-      <description>Import Releng Project</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Tasks"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.sdk_feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.test_feature.feature.group"/>
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.tasks.location}"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Tasks">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.mylyn.tasks.core"/>
-          <operand
-              xsi:type="predicates:NotPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.mylyn\.bugzilla\.rest.*"/>
-          </operand>
-        </predicate>
-      </workingSet>
-    </setupTask>
-    <project
-        name="bugzilla"
-        label="Bugzilla Connector (REST)">
       <setupTask
           xsi:type="setup.targlets:TargletTask">
         <targlet
-            name="Mylyn Tasks Bugzilla"
+            name="Mylyn Builds"
             activeRepositoryList="${eclipse.target.platform}">
           <requirement
-              name="org.eclipse.mylyn.bugzilla.rest.feature.group"/>
+              name="org.eclipse.mylyn.builds.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.builds.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Builds">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.builds.core"/>
+        </workingSet>
+      </setupTask>
+      <project
+          name="builds-bugs"
+          label="Bugzilla Bugs for Mylyn Builds">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Builds Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Builds&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="builds-reviews"
+          label="Gerrit Reviews for Mylyn Builds">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Builds Reviews in ${git.clone.mylyn.builds.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.builds (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="builds-builds"
+          label="Hudson Builds for Mylyn Builds">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-builds-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="commons"
+        label="Commons">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.commons"
+          value="${git.clone.mylyn.commons.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.commons"
+          remoteURI="mylyn/org.eclipse.mylyn.commons">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Commons Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Commons</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Commons"
+            activeRepositoryList="${eclipse.target.platform}">
           <requirement
-              name="org.eclipse.mylyn.bugzilla.rest.development.feature.feature.group"/>
+              name="org.eclipse.mylyn.commons.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.commons.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Commons">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.commons.core"/>
+        </workingSet>
+      </setupTask>
+      <project
+          name="commons-bugs"
+          label="Bugzilla Bugs for Mylyn Commons">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Commons Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Commons&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="commons-reviews"
+          label="Gerrit Reviews for Mylyn Commons">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Commons Reviews in ${git.clone.mylyn.commons.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.commons (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="commons-builds"
+          label="Hudson Builds for Mylyn Commons">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-commons-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="context"
+        label="Context">
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.jdt.core"
+          remoteURI="jdt/eclipse.jdt.core"
+          pushURI=""
+          checkoutBranch="master">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>JDT Core Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>JDT Core</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.jdt.core.location}/org.eclipse.jdt.annotation_v1/"/>
+        <description>Import JDT Annotations v1.1</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:PreferenceTask"
+          key="/project/org.eclipse.jdt.annotation_v1/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
+          value="ignore"/>
+      <setupTask
+          xsi:type="jdt:JRETask"
+          version="J2SE-1.5"
+          location="${jre.location-1.5}"/>
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.context"
+          value="${git.clone.mylyn.context.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.context"
+          remoteURI="mylyn/org.eclipse.mylyn.context"
+          checkoutBranch="master">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Context Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Context</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Context"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.context.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.context.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Context">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.context.core"/>
+        </workingSet>
+      </setupTask>
+      <project
+          name="context-bugs"
+          label="Bugzilla Bugs for Mylyn Context">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Context Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Context&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="context-reviews"
+          label="Gerrit Reviews for Mylyn Context">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Context Reviews in ${git.clone.mylyn.context.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.context (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="context-builds"
+          label="Hudson Builds for Mylyn Context">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-context-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="docs"
+        label="Docs">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.docs"
+          value="${git.clone.mylyn.docs.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.docs"
+          remoteURI="mylyn/org.eclipse.mylyn.docs">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Docs Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Docs</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Docs"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.docs.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.docs.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Docs">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.wikitext.core"/>
+        </workingSet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:ResourceCreationTask"
+          excludedTriggers="BOOTSTRAP"
+          predecessor="git.clone.mylyn.docs"
+          content="&lt;!-- Placeholder file. Real toc file will be generated during the build -->"
+          targetURL="platform:/resource/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn WikiText User Guide-toc.xml"
+          encoding="UTF-8">
+        <description>Create a placeholder file &quot;Mylyn WikiText User Guide-toc.xml&quot;</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:ResourceCreationTask"
+          excludedTriggers="BOOTSTRAP"
+          predecessor="git.clone.mylyn.docs"
+          content="&lt;!-- Placeholder file. Real toc file will be generated during the build -->"
+          targetURL="platform:/resource/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText Developer Guide-toc.xml"
+          encoding="UTF-8">
+        <description>Create a placeholder file &quot;WikiText Developer Guide-toc.xml&quot;</description>
+      </setupTask>
+      <project
+          name="docs-bugs"
+          label="Bugzilla Bugs for Mylyn Docs">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Docs Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Docs&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="docs-reviews"
+          label="Gerrit Reviews for Mylyn Docs">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Docs Reviews in ${git.clone.mylyn.docs.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.docs (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="docs-builds"
+          label="Hudson Builds for Mylyn Docs">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-docs-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="incubator"
+        label="Incubator">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.incubator"
+          value="${git.clone.mylyn.incubator.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.incubator"
+          remoteURI="mylyn/org.eclipse.mylyn.incubator">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Incubator Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Incubator</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Incubator"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.incubator.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.incubator.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Incubator">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.sandbox.ui"/>
+        </workingSet>
+      </setupTask>
+      <project
+          name="incubator-bugs"
+          label="Bugzilla Bugs for Mylyn Incubator">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Incubator Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Incubator&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="incubator-reviews"
+          label="Gerrit Reviews for Mylyn Incubator">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Incubator Reviews in ${git.clone.mylyn.incubator.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.incubator (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="incubator-builds"
+          label="Hudson Builds for Mylyn Incubator">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-incubator-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+        <description></description>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="releng"
+        label="Releng">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.releng"
+          value="${git.clone.mylyn.releng.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.releng"
+          remoteURI="mylyn/org.eclipse.mylyn">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Releng Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Releng</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.releng/"/>
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn-parent/"/>
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.maven-parent/"/>
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.tests/"/>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Releng">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.releng"/>
+        </workingSet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Releng"
+            activeRepositoryList="${eclipse.target.platform}">
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.releng.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:EclipseIniTask"
+          option="-Doomph.redirection.mylyn"
+          value="=http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.git/plain/org.eclipse.mylyn.releng/oomph/Mylyn.setup->${git.clone.mylyn.releng.location|uri}/org.eclipse.mylyn.releng/oomph/Mylyn.setup"/>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="reviews"
+        label="Reviews">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.reviews"
+          value="${git.clone.mylyn.reviews.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.reviews"
+          remoteURI="mylyn/org.eclipse.mylyn.reviews">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Reviews Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Reviews</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.reviews.location}/org.eclipse.mylyn.gerrit.releng/"/>
+        <description>Import Releng Project</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Reviews"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.reviews.development.feature.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.reviews.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Reviews">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.reviews.core"/>
+        </workingSet>
+      </setupTask>
+      <project
+          name="reviews-bugs"
+          label="Bugzilla Bugs for Mylyn Reviews">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Reviews Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Reviews&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="reviews-reviews"
+          label="Gerrit Reviews for Mylyn Reviews">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Reviews Reviews in ${git.clone.mylyn.reviews.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.reviews (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="reviews-builds"
+          label="Hudson Builds for Mylyn Reviews">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-reviews-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="tasks"
+        label="Tasks">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.tasks"
+          value="${git.clone.mylyn.tasks.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.tasks"
+          remoteURI="mylyn/org.eclipse.mylyn.tasks"
+          checkoutBranch="master">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Tasks Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Tasks</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.tasks.location}/org.eclipse.mylyn.bugzilla.releng/"/>
+        <description>Import Releng Project</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Tasks"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.sdk_feature.feature.group"/>
+          <requirement
+              name="org.eclipse.mylyn.test_feature.feature.group"/>
           <sourceLocator
               rootFolder="${git.clone.mylyn.tasks.location}"/>
         </targlet>
@@ -1096,294 +1070,1016 @@
       <setupTask
           xsi:type="setup.workingsets:WorkingSetTask">
         <workingSet
-            name="Mylyn Bugzilla Connector">
+            name="Mylyn Tasks">
           <predicate
               xsi:type="predicates:AndPredicate">
             <operand
                 xsi:type="predicates:RepositoryPredicate"
                 project="org.eclipse.mylyn.tasks.core"/>
             <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.mylyn\.bugzilla\.rest.*"/>
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.mylyn\.bugzilla\.rest.*"/>
+            </operand>
           </predicate>
         </workingSet>
       </setupTask>
+      <project
+          name="bugzilla"
+          label="Bugzilla Connector (REST)">
+        <setupTask
+            xsi:type="setup.targlets:TargletTask">
+          <targlet
+              name="Mylyn Tasks Bugzilla"
+              activeRepositoryList="${eclipse.target.platform}">
+            <requirement
+                name="org.eclipse.mylyn.bugzilla.rest.feature.group"/>
+            <requirement
+                name="org.eclipse.mylyn.bugzilla.rest.development.feature.feature.group"/>
+            <sourceLocator
+                rootFolder="${git.clone.mylyn.tasks.location}"/>
+          </targlet>
+        </setupTask>
+        <setupTask
+            xsi:type="setup.workingsets:WorkingSetTask">
+          <workingSet
+              name="Mylyn Bugzilla Connector">
+            <predicate
+                xsi:type="predicates:AndPredicate">
+              <operand
+                  xsi:type="predicates:RepositoryPredicate"
+                  project="org.eclipse.mylyn.tasks.core"/>
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.mylyn\.bugzilla\.rest.*"/>
+            </predicate>
+          </workingSet>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="tasks-bugs"
+          label="Bugzilla Bugs for Mylyn Tasks">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Tasks Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Tasks&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="tasks-reviews"
+          label="Gerrit Reviews for Mylyn Tasks">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Tasks Reviews in ${git.clone.mylyn.tasks.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.tasks (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="tasks-builds"
+          label="Hudson Builds for Mylyn Tasks">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-tasks-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="versions"
+        label="Versions">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.versions"
+          value="${git.clone.mylyn.versions.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.versions"
+          remoteURI="mylyn/org.eclipse.mylyn.versions">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Versions Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Versions</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Versions"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.versions.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.versions.location}"/>
+          <repositoryList
+              name="Oxygen">
+            <repository
+                url="http://subclipse.tigris.org/update_1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="Neon">
+            <repository
+                url="http://subclipse.tigris.org/update_1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="Mars">
+            <repository
+                url="http://subclipse.tigris.org/update_1.8.x"/>
+          </repositoryList>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Versions">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.versions.core"/>
+        </workingSet>
+      </setupTask>
+      <project
+          name="versions-bugs"
+          label="Bugzilla Bugs for Mylyn Versions">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            repositoryURL="https://bugs.eclipse.org/bugs"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Versions Bugs"
+              url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Versions&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="versions-reviews"
+          label="Gerrit Reviews for Mylyn Versions">
+        <setupTask
+            xsi:type="mylyn:MylynQueriesTask"
+            connectorKind="org.eclipse.mylyn.gerrit"
+            repositoryURL="https://git.eclipse.org/r"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <query
+              summary="Mylyn Versions Reviews in ${git.clone.mylyn.versions.checkoutBranch}">
+            <attribute
+                key="gerrit query type"
+                value="custom"/>
+            <attribute
+                key="gerrit query string"
+                value="project:mylyn/org.eclipse.mylyn.versions (owner:self OR reviewer:self)"/>
+          </query>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <project
+          name="versions-builds"
+          label="Hudson Builds for Mylyn Versions">
+        <setupTask
+            xsi:type="mylyn:MylynBuildsTask"
+            serverURL="https://hudson.eclipse.org/mylyn"
+            userID="${bugzilla.id}"
+            password="${eclipse.user.password}">
+          <buildPlan
+              name="mylyn-versions-nightly"/>
+          <description>Hudson Mylyn HIPP Instance</description>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+      <description></description>
+    </project>
+    <description>All in One</description>
+  </project>
+  <project name="SourceCodeAndBuilds"
+      label="Source Code and Builds">
+    <project
+        name="builds"
+        label="Builds">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.builds"
+          value="${git.clone.mylyn.builds.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.builds"
+          remoteURI="mylyn/org.eclipse.mylyn.builds">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Builds Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Builds</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.builds.location}/org.eclipse.mylyn.hudson.releng/"/>
+        <description>Import Releng Project</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Builds"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.builds.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.builds.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Builds">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.builds.core"/>
+        </workingSet>
+      </setupTask>
       <stream
           name="master"
           label="Master"/>
     </project>
     <project
-        name="tasks-bugs"
-        label="Bugzilla Bugs for Mylyn Tasks">
+        name="commons"
+        label="Commons">
       <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Tasks Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Tasks&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.commons"
+          value="${git.clone.mylyn.commons.location}"
+          documentation="The location of the Mylyn Commons Git clone."/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.commons"
+          remoteURI="mylyn/org.eclipse.mylyn.commons"
+          userID="">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Commons Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Commons</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Commons"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.commons.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.commons.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Commons">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.commons.core"/>
+        </workingSet>
       </setupTask>
       <stream
           name="master"
           label="Master"/>
     </project>
     <project
-        name="tasks-reviews"
-        label="Gerrit Reviews for Mylyn Tasks">
+        name="context"
+        label="Context">
       <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Tasks Reviews in ${git.clone.mylyn.tasks.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.tasks (owner:self OR reviewer:self)"/>
-        </query>
+          xsi:type="git:GitCloneTask"
+          id="git.clone.jdt.core"
+          remoteURI="jdt/eclipse.jdt.core"
+          pushURI=""
+          checkoutBranch="master">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>JDT Core Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>JDT Core</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.jdt.core.location}/org.eclipse.jdt.annotation_v1/"/>
+        <description>Import JDT Annotations v1.1</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:PreferenceTask"
+          key="/project/org.eclipse.jdt.annotation_v1/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
+          value="ignore"/>
+      <setupTask
+          xsi:type="jdt:JRETask"
+          version="J2SE-1.5"
+          location="${jre.location-1.5}"/>
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.context"
+          value="${git.clone.mylyn.context.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.context"
+          remoteURI="mylyn/org.eclipse.mylyn.context"
+          checkoutBranch="master">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Context Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Context</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Context"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.context.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.context.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Context">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.context.core"/>
+        </workingSet>
       </setupTask>
       <stream
           name="master"
           label="Master"/>
     </project>
     <project
-        name="tasks-builds"
-        label="Hudson Builds for Mylyn Tasks">
+        name="docs"
+        label="Docs">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.docs"
+          value="${git.clone.mylyn.docs.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.docs"
+          remoteURI="mylyn/org.eclipse.mylyn.docs">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Docs Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Docs</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Docs"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.docs.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.docs.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Docs">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.wikitext.core"/>
+        </workingSet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:ResourceCreationTask"
+          excludedTriggers="BOOTSTRAP"
+          predecessor="git.clone.mylyn.docs"
+          content="&lt;!-- Placeholder file. Real toc file will be generated during the build -->"
+          targetURL="platform:/resource/org.eclipse.mylyn.wikitext.help.ui/help/Mylyn WikiText User Guide-toc.xml"
+          encoding="UTF-8">
+        <description>Create a placeholder file &quot;Mylyn WikiText User Guide-toc.xml&quot;</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:ResourceCreationTask"
+          excludedTriggers="BOOTSTRAP"
+          predecessor="git.clone.mylyn.docs"
+          content="&lt;!-- Placeholder file. Real toc file will be generated during the build -->"
+          targetURL="platform:/resource/org.eclipse.mylyn.wikitext.help.ui/help/devguide/WikiText Developer Guide-toc.xml"
+          encoding="UTF-8">
+        <description>Create a placeholder file &quot;WikiText Developer Guide-toc.xml&quot;</description>
+      </setupTask>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="incubator"
+        label="Incubator">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.incubator"
+          value="${git.clone.mylyn.incubator.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.incubator"
+          remoteURI="mylyn/org.eclipse.mylyn.incubator">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Incubator Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Incubator</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Incubator"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.incubator.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.incubator.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Incubator">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.sandbox.ui"/>
+        </workingSet>
+      </setupTask>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="releng"
+        label="Releng">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.releng"
+          value="${git.clone.mylyn.releng.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.releng"
+          remoteURI="mylyn/org.eclipse.mylyn">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Releng Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Releng</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.releng/"/>
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn-parent/"/>
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.maven-parent/"/>
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.releng.location}/org.eclipse.mylyn.tests/"/>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Releng">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.releng"/>
+        </workingSet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Releng"
+            activeRepositoryList="${eclipse.target.platform}">
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.releng.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup:EclipseIniTask"
+          option="-Doomph.redirection.mylyn"
+          value="=http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.git/plain/org.eclipse.mylyn.releng/oomph/Mylyn.setup->${git.clone.mylyn.releng.location|uri}/org.eclipse.mylyn.releng/oomph/Mylyn.setup"/>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="reviews"
+        label="Reviews">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.reviews"
+          value="${git.clone.mylyn.reviews.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.reviews"
+          remoteURI="mylyn/org.eclipse.mylyn.reviews">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Reviews Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Reviews</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.reviews.location}/org.eclipse.mylyn.gerrit.releng/"/>
+        <description>Import Releng Project</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Reviews"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.reviews.development.feature.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.reviews.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Reviews">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.reviews.core"/>
+        </workingSet>
+      </setupTask>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="tasks"
+        label="Tasks">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.tasks"
+          value="${git.clone.mylyn.tasks.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.tasks"
+          remoteURI="mylyn/org.eclipse.mylyn.tasks"
+          checkoutBranch="master">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Tasks Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Tasks</description>
+      </setupTask>
+      <setupTask
+          xsi:type="projects:ProjectsImportTask">
+        <sourceLocator
+            rootFolder="${git.clone.mylyn.tasks.location}/org.eclipse.mylyn.bugzilla.releng/"/>
+        <description>Import Releng Project</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Tasks"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.sdk_feature.feature.group"/>
+          <requirement
+              name="org.eclipse.mylyn.test_feature.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.tasks.location}"/>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Tasks">
+          <predicate
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:RepositoryPredicate"
+                project="org.eclipse.mylyn.tasks.core"/>
+            <operand
+                xsi:type="predicates:NotPredicate">
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.mylyn\.bugzilla\.rest.*"/>
+            </operand>
+          </predicate>
+        </workingSet>
+      </setupTask>
+      <project
+          name="bugzilla"
+          label="Bugzilla Connector (REST)">
+        <setupTask
+            xsi:type="setup.targlets:TargletTask">
+          <targlet
+              name="Mylyn Tasks Bugzilla"
+              activeRepositoryList="${eclipse.target.platform}">
+            <requirement
+                name="org.eclipse.mylyn.bugzilla.rest.feature.group"/>
+            <requirement
+                name="org.eclipse.mylyn.bugzilla.rest.development.feature.feature.group"/>
+            <sourceLocator
+                rootFolder="${git.clone.mylyn.tasks.location}"/>
+          </targlet>
+        </setupTask>
+        <setupTask
+            xsi:type="setup.workingsets:WorkingSetTask">
+          <workingSet
+              name="Mylyn Bugzilla Connector">
+            <predicate
+                xsi:type="predicates:AndPredicate">
+              <operand
+                  xsi:type="predicates:RepositoryPredicate"
+                  project="org.eclipse.mylyn.tasks.core"/>
+              <operand
+                  xsi:type="predicates:NamePredicate"
+                  pattern="org\.eclipse\.mylyn\.bugzilla\.rest.*"/>
+            </predicate>
+          </workingSet>
+        </setupTask>
+        <stream
+            name="master"
+            label="Master"/>
+      </project>
+      <stream
+          name="master"
+          label="Master"/>
+    </project>
+    <project
+        name="versions"
+        label="Versions">
+      <setupTask
+          xsi:type="setup:StringSubstitutionTask"
+          name="git.clone.mylyn.versions"
+          value="${git.clone.mylyn.versions.location}"/>
+      <setupTask
+          xsi:type="git:GitCloneTask"
+          id="git.clone.mylyn.versions"
+          remoteURI="mylyn/org.eclipse.mylyn.versions">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          <detail
+              key="inherit">
+            <value>eclipse.git.gerrit.remoteURIs</value>
+          </detail>
+          <detail
+              key="label">
+            <value>Mylyn Versions Git or Gerrit Repository</value>
+          </detail>
+          <detail
+              key="target">
+            <value>remoteURI</value>
+          </detail>
+        </annotation>
+        <configSections
+            name="core">
+          <properties
+              key="autocrlf"
+              value="false"/>
+        </configSections>
+        <description>Mylyn Versions</description>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.targlets:TargletTask">
+        <targlet
+            name="Mylyn Versions"
+            activeRepositoryList="${eclipse.target.platform}">
+          <requirement
+              name="org.eclipse.mylyn.versions.development.feature.group"/>
+          <sourceLocator
+              rootFolder="${git.clone.mylyn.versions.location}"/>
+          <repositoryList
+              name="Oxygen">
+            <repository
+                url="http://subclipse.tigris.org/update_1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="Neon">
+            <repository
+                url="http://subclipse.tigris.org/update_1.8.x"/>
+          </repositoryList>
+          <repositoryList
+              name="Mars">
+            <repository
+                url="http://subclipse.tigris.org/update_1.8.x"/>
+          </repositoryList>
+        </targlet>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.workingsets:WorkingSetTask">
+        <workingSet
+            name="Mylyn Versions">
+          <predicate
+              xsi:type="predicates:RepositoryPredicate"
+              project="org.eclipse.mylyn.versions.core"/>
+        </workingSet>
+      </setupTask>
+      <stream
+          name="master"
+          label="Master"/>
+      <description></description>
+    </project>
+    <project
+        name="all.builds"
+        label="Builds for All Mylyn Projects">
       <setupTask
           xsi:type="mylyn:MylynBuildsTask"
           serverURL="https://hudson.eclipse.org/mylyn"
           userID="${bugzilla.id}"
           password="${eclipse.user.password}">
         <buildPlan
+            name="connectivity-mylyn.org"/>
+        <buildPlan
+            name="mylyn-builds-nightly"/>
+        <buildPlan
+            name="mylyn-commons-nightly"/>
+        <buildPlan
+            name="mylyn-context-nightly"/>
+        <buildPlan
+            name="mylyn-docs-nightly"/>
+        <buildPlan
+            name="mylyn-incubator-nightly"/>
+        <buildPlan
+            name="mylyn-reviews-nightly"/>
+        <buildPlan
+            name="mylyn-snapshot-publish"/>
+        <buildPlan
             name="mylyn-tasks-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <stream
-        name="master"
-        label="Master"/>
-  </project>
-  <project name="versions"
-      label="Versions">
-    <setupTask
-        xsi:type="setup:StringSubstitutionTask"
-        name="git.clone.mylyn.versions"
-        value="${git.clone.mylyn.versions.location}"/>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.mylyn.versions"
-        remoteURI="mylyn/org.eclipse.mylyn.versions">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Mylyn Versions Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <configSections
-          name="core">
-        <properties
-            key="autocrlf"
-            value="false"/>
-      </configSections>
-      <description>Mylyn Versions</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Mylyn Versions"
-          activeRepositoryList="${eclipse.target.platform}">
-        <requirement
-            name="org.eclipse.mylyn.versions.development.feature.group"/>
-        <sourceLocator
-            rootFolder="${git.clone.mylyn.versions.location}"/>
-        <repositoryList
-            name="Oxygen">
-          <repository
-              url="http://subclipse.tigris.org/update_1.8.x"/>
-        </repositoryList>
-        <repositoryList
-            name="Neon">
-          <repository
-              url="http://subclipse.tigris.org/update_1.8.x"/>
-        </repositoryList>
-        <repositoryList
-            name="Mars">
-          <repository
-              url="http://subclipse.tigris.org/update_1.8.x"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="Mylyn Versions">
-        <predicate
-            xsi:type="predicates:RepositoryPredicate"
-            project="org.eclipse.mylyn.versions.core"/>
-      </workingSet>
-    </setupTask>
-    <project
-        name="versions-bugs"
-        label="Bugzilla Bugs for Mylyn Versions">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          repositoryURL="https://bugs.eclipse.org/bugs"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Versions Bugs"
-            url="https://bugs.eclipse.org/bugs/buglist.cgi?product=Mylyn%20Versions&amp;emailassigned_to1=1&amp;emailcc1=1&amp;emaillongdesc1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=${bugzilla.id}"/>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="versions-reviews"
-        label="Gerrit Reviews for Mylyn Versions">
-      <setupTask
-          xsi:type="mylyn:MylynQueriesTask"
-          connectorKind="org.eclipse.mylyn.gerrit"
-          repositoryURL="https://git.eclipse.org/r"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
-        <query
-            summary="Mylyn Versions Reviews in ${git.clone.mylyn.versions.checkoutBranch}">
-          <attribute
-              key="gerrit query type"
-              value="custom"/>
-          <attribute
-              key="gerrit query string"
-              value="project:mylyn/org.eclipse.mylyn.versions (owner:self OR reviewer:self)"/>
-        </query>
-      </setupTask>
-      <stream
-          name="master"
-          label="Master"/>
-    </project>
-    <project
-        name="versions-builds"
-        label="Hudson Builds for Mylyn Versions">
-      <setupTask
-          xsi:type="mylyn:MylynBuildsTask"
-          serverURL="https://hudson.eclipse.org/mylyn"
-          userID="${bugzilla.id}"
-          password="${eclipse.user.password}">
         <buildPlan
             name="mylyn-versions-nightly"/>
-        <description>Hudson Mylyn HIPP Instance</description>
+        <buildPlan
+            name="mylyn-3.19.x-release"/>
+        <buildPlan
+            name="mylyn-3.20.x-release"/>
+        <buildPlan
+            name="mylyn-3.21.x-release"/>
+        <buildPlan
+            name="mylyn-3.22.x-release"/>
+        <buildPlan
+            name="mylyn-integration"/>
+        <buildPlan
+            name="mylyn-integration-connectors"/>
+      </setupTask>
+      <setupTask
+          xsi:type="mylyn:MylynBuildsTask"
+          serverURL="http://ci.mylyn.org"
+          userID="${mylyn.org.id}"
+          password="${mylyn.org.password}">
+        <buildPlan
+            name="mylyn-3.19.x"/>
+        <buildPlan
+            name="mylyn-3.20.x"/>
+        <buildPlan
+            name="mylyn-3.21.x"/>
+        <buildPlan
+            name="mylyn-3.22.x"/>
+        <buildPlan
+            name="mylyn-all-snapshot"/>
+        <buildPlan
+            name="mylyn-builds-snapshot"/>
+        <buildPlan
+            name="mylyn-commons-snapshot"/>
+        <buildPlan
+            name="mylyn-context-snapshot"/>
+        <buildPlan
+            name="mylyn-docs-snapshot"/>
+        <buildPlan
+            name="mylyn-incubator-snapshot"/>
+        <buildPlan
+            name="mylyn-reviews-snapshot"/>
+        <buildPlan
+            name="mylyn-tasks-snapshot"/>
+        <buildPlan
+            name="mylyn-versions-snapshot"/>
+        <buildPlan
+            name="update-simrel-contribution"/>
+        <buildPlan
+            name="mylyn-puppet"/>
+        <buildPlan
+            name="mylyn-puppet-bugzilla"/>
+        <buildPlan
+            name="mylyn-puppet-gerrit"/>
+        <buildPlan
+            name="mylyn-puppet-hudson"/>
       </setupTask>
       <stream
           name="master"
           label="Master"/>
     </project>
-    <stream
-        name="master"
-        label="Master"/>
-    <description></description>
-  </project>
-  <project name="all.builds"
-      label="Builds for All Mylyn Projects">
-    <setupTask
-        xsi:type="mylyn:MylynBuildsTask"
-        serverURL="https://hudson.eclipse.org/mylyn"
-        userID="${bugzilla.id}"
-        password="${eclipse.user.password}">
-      <buildPlan
-          name="connectivity-mylyn.org"/>
-      <buildPlan
-          name="mylyn-builds-nightly"/>
-      <buildPlan
-          name="mylyn-commons-nightly"/>
-      <buildPlan
-          name="mylyn-context-nightly"/>
-      <buildPlan
-          name="mylyn-docs-nightly"/>
-      <buildPlan
-          name="mylyn-incubator-nightly"/>
-      <buildPlan
-          name="mylyn-reviews-nightly"/>
-      <buildPlan
-          name="mylyn-snapshot-publish"/>
-      <buildPlan
-          name="mylyn-tasks-nightly"/>
-      <buildPlan
-          name="mylyn-versions-nightly"/>
-      <buildPlan
-          name="mylyn-3.19.x-release"/>
-      <buildPlan
-          name="mylyn-3.20.x-release"/>
-      <buildPlan
-          name="mylyn-3.21.x-release"/>
-      <buildPlan
-          name="mylyn-3.22.x-release"/>
-      <buildPlan
-          name="mylyn-integration"/>
-      <buildPlan
-          name="mylyn-integration-connectors"/>
-    </setupTask>
-    <setupTask
-        xsi:type="mylyn:MylynBuildsTask"
-        serverURL="http://ci.mylyn.org"
-        userID="${mylyn.org.id}"
-        password="${mylyn.org.password}">
-      <buildPlan
-          name="mylyn-3.19.x"/>
-      <buildPlan
-          name="mylyn-3.20.x"/>
-      <buildPlan
-          name="mylyn-3.21.x"/>
-      <buildPlan
-          name="mylyn-3.22.x"/>
-      <buildPlan
-          name="mylyn-all-snapshot"/>
-      <buildPlan
-          name="mylyn-builds-snapshot"/>
-      <buildPlan
-          name="mylyn-commons-snapshot"/>
-      <buildPlan
-          name="mylyn-context-snapshot"/>
-      <buildPlan
-          name="mylyn-docs-snapshot"/>
-      <buildPlan
-          name="mylyn-incubator-snapshot"/>
-      <buildPlan
-          name="mylyn-reviews-snapshot"/>
-      <buildPlan
-          name="mylyn-tasks-snapshot"/>
-      <buildPlan
-          name="mylyn-versions-snapshot"/>
-      <buildPlan
-          name="update-simrel-contribution"/>
-      <buildPlan
-          name="mylyn-puppet"/>
-      <buildPlan
-          name="mylyn-puppet-bugzilla"/>
-      <buildPlan
-          name="mylyn-puppet-gerrit"/>
-      <buildPlan
-          name="mylyn-puppet-hudson"/>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
+    <description>Advanced Setup</description>
   </project>
   <logicalProjectContainer
       xsi:type="setup:ProjectCatalog"