[Releng] More Oxygen adjustments to the build

3 files changed, 531 insertions, 166 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
index 733669f224..c24dfb7984 100644
--- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
@@ -228,76 +228,6 @@
         <repository
             url="http://www.elver.org/eclipse/2.1.0/update"/>
       </repositoryList>
-      <repositoryList
-          name="Mars">
-        <repository
-            url="http://download.eclipse.org/releases/mars"/>
-        <repository
-            url="http://download.eclipse.org/eclipse/updates/4.5"/>
-        <repository
-            url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1.x"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
-        <repository
-            url="http://download.eclipse.org/technology/nebula/snapshot"/>
-        <repository
-            url="http://download.eclipse.org/tools/buckminster/updates-4.4"/>
-        <repository
-            url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
-        <repository
-            url="http://download.oracle.com/otn_software/oepe/12.2.1/mars/repository"/>
-        <repository
-            url="http://www.elver.org/eclipse/2.1.0/update"/>
-      </repositoryList>
-      <repositoryList
-          name="Luna">
-        <repository
-            url="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.0/R201406111328"/>
-        <repository
-            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/emf/updates/2.10/core/R201405190339"/>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201406111639"/>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201405281433"/>
-        <repository
-            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.2.0"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201406110919/mwe"/>
-        <repository
-            url="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201406030414"/>
-        <repository
-            url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201405281451"/>
-        <repository
-            url="http://download.eclipse.org/tools/gef/updates/releases"/>
-        <repository
-            url="http://download.eclipse.org/graphiti/updates/0.11.0"/>
-        <repository
-            url="http://download.eclipse.org/technology/swtbot/releases/2.2.1"/>
-        <repository
-            url="http://download.eclipse.org/modeling/mdt/ocl/updates/releases/5.0.1"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/teneo/updates/2.0.0/interim"/>
-        <repository
-            url="http://download.eclipse.org/tools/buckminster/headless-4.3"/>
-        <repository
-            url="http://download.eclipse.org/mylyn/releases/3.12"/>
-        <repository
-            url="http://download.eclipse.org/technology/nebula/snapshot/"/>
-        <repository
-            url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1.x/R201402022055"/>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/validation/updates/releases/R201405281429"/>
-        <repository
-            url="http://download.eclipse.org/mmt/qvto/updates/releases/3.4.0"/>
-        <repository
-            url="http://www.elver.org/eclipse/2.0.0/update"/>
-        <repository
-            url="http://download.oracle.com/otn_software/oepe/kepler"/>
-      </repositoryList>
     </targlet>
   </setupTask>
   <setupTask
@@ -701,7 +631,7 @@
       <requirement
           name="org.eclipse.gmf.sdk.feature.group"/>
       <repository
-          url="http://download.eclipse.org/releases/mars"/>
+          url="http://download.eclipse.org/releases/neon"/>
     </setupTask>
     <setupTask
         xsi:type="setup:EclipseIniTask"
@@ -768,14 +698,9 @@
       <requirement
           name="org.eclipse.gmf.sdk.feature.group"/>
       <repository
-          url="http://download.eclipse.org/releases/mars"/>
+          url="http://download.eclipse.org/releases/neon"/>
     </setupTask>
     <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.cdosetup"
-        value="=http://git.eclipse.org/c/cdo/cdo.git/plain/plugins/org.eclipse.emf.cdo.releng/CDO.setup->${cdo.git.clone.location|uri}/plugins/org.eclipse.emf.cdo.releng/CDO.setup"
-        vm="true"/>
-    <setupTask
         xsi:type="setup:VariableTask"
         name="cdo.git.branch"
         value="streams/4.5-maintenance"/>
@@ -796,88 +721,4 @@
         version="JavaSE-1.8"
         location="${jre.location-1.8}"/>
   </stream>
-  <stream name="4.4-maintenance"
-      label="4.4 Maintenance (Mars)">
-    <setupTask
-        xsi:type="setup.p2:P2Task">
-      <requirement
-          name="org.eclipse.emf.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gmf.runtime.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gmf.sdk.feature.group"/>
-      <repository
-          url="http://download.eclipse.org/releases/mars"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.git.branch"
-        value="streams/4.4-maintenance"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.target.platform"
-        value="Mars"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.bugzilla.version"
-        value="4.4"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.baseline.version"
-        value="4.5"/>
-    <setupTask
-        xsi:type="jdt:JRETask"
-        version="JavaSE-1.7"
-        location="${jre.location-1.7}"/>
-    <setupTask
-        xsi:type="pde:APIBaselineTask"
-        name="CDO"
-        version="4.4"
-        location="${installation.location/baseline}"
-        remoteURI="http://sourceforge.net/projects/net4j/files/Baselines/emf-cdo-4.4-baseline.zip/download"/>
-  </stream>
-  <stream name="4.3-maintenance"
-      label="4.3 Maintenance (Luna)">
-    <setupTask
-        xsi:type="setup.p2:P2Task">
-      <requirement
-          name="org.eclipse.emf.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gmf.runtime.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.gmf.sdk.feature.group"/>
-      <repository
-          url="http://download.eclipse.org/releases/luna"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.git.branch"
-        value="streams/4.3-maintenance"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.target.platform"
-        value="Luna"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.bugzilla.version"
-        value="4.3"/>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="cdo.baseline.version"
-        value="4.5"/>
-    <setupTask
-        xsi:type="jdt:JRETask"
-        version="JavaSE-1.7"
-        location="${jre.location-1.7}"/>
-    <setupTask
-        xsi:type="pde:APIBaselineTask"
-        name="CDO"
-        version="4.3"
-        location="${installation.location/baseline}"
-        remoteURI="http://sourceforge.net/projects/net4j/files/Baselines/emf-cdo-4.3-baseline.zip/download"/>
-  </stream>
 </setup:Project>
diff --git a/plugins/org.eclipse.emf.cdo.releng/CDOPreNeon.setup b/plugins/org.eclipse.emf.cdo.releng/CDOPreNeon.setup
new file mode 100644
index 0000000000..ef1951c3f9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/CDOPreNeon.setup
@@ -0,0 +1,524 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Project
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
+    xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
+    xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"
+    xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
+    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
+    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
+    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
+    name="cdo"
+    label="CDO Model Repository">
+  <setupTask
+      xsi:type="setup.p2:P2Task"
+      label="CDO">
+    <requirement
+        name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.ide_feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.java_feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.pde_feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.team_feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.gerrit.feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn_feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.git.feature.group"/>
+    <requirement
+        name="org.eclipse.egit.feature.group"/>
+    <requirement
+        name="org.eclipse.egit.mylyn.feature.group"/>
+    <requirement
+        name="org.eclipse.oomph.projectcopy.feature.group"/>
+    <requirement
+        name="org.eclipse.oomph.version.feature.group"/>
+    <requirement
+        name="org.eclipse.emf.ecoretools.sdk.feature.group"
+        optional="true"/>
+    <repository
+        url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
+    <repository
+        url="http://download.eclipse.org/egit/updates-stable-nightly"/>
+    <repository
+        url="http://download.eclipse.org/oomph/updates"/>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:EclipseIniTask"
+      option="-Xmx"
+      value="4g"
+      vm="true"/>
+  <setupTask
+      xsi:type="setup:ResourceCreationTask"
+      excludedTriggers="STARTUP MANUAL"
+      content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
+      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
+      encoding="UTF-8"/>
+  <setupTask
+      xsi:type="setup:PreferenceTask"
+      key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
+      value="ignore"/>
+  <setupTask
+      xsi:type="setup:PreferenceTask"
+      key="instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unclosedCloseable"
+      value="ignore"/>
+  <setupTask
+      xsi:type="setup:PreferenceTask"
+      key="instance/org.eclipse.pde/compilers.f.unresolved-features"
+      value="2"/>
+  <setupTask
+      xsi:type="setup:VariableTask"
+      name="eclipse.target.platform"
+      value="${cdo.target.platform}"/>
+  <setupTask
+      xsi:type="git:GitCloneTask"
+      id="cdo.git.clone"
+      remoteURI="cdo/cdo"
+      checkoutBranch="${cdo.git.branch}">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/InducedChoices">
+      <detail
+          key="inherit">
+        <value>eclipse.git.gerrit.remoteURIs</value>
+      </detail>
+      <detail
+          key="label">
+        <value>CDO Git or Gerrit Repository</value>
+      </detail>
+      <detail
+          key="target">
+        <value>remoteURI</value>
+      </detail>
+    </annotation>
+    <description>CDO</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.targlets:TargletTask">
+    <targlet
+        name="CDO"
+        activeRepositoryList="${eclipse.target.platform}">
+      <requirement
+          name="org.eclipse.emf.cdo.site.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.cdo.releng.all.feature.group"/>
+      <requirement
+          name="org.eclipse.emf.cdo.releng"/>
+      <requirement
+          name="org.eclipse.emf.cdo.releng.release"/>
+      <requirement
+          name="org.eclipse.emf.cdo.examples.client"/>
+      <requirement
+          name="org.eclipse.emf.cdo.examples.client.offline"/>
+      <requirement
+          name="org.eclipse.emf.cdo.examples.master"/>
+      <requirement
+          name="org.eclipse.emf.cdo.examples.clone"/>
+      <requirement
+          name="org.eclipse.platform.feature.group"/>
+      <requirement
+          name="org.eclipse.jdt.feature.group"/>
+      <requirement
+          name="org.eclipse.pde.feature.group"/>
+      <requirement
+          name="org.eclipse.equinox.executable.feature.group"/>
+      <sourceLocator
+          rootFolder="${cdo.git.clone.location}"/>
+      <repositoryList
+          name="Mars">
+        <repository
+            url="http://download.eclipse.org/releases/mars"/>
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.5"/>
+        <repository
+            url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1.x"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/teneo/updates/2.1.0/interim"/>
+        <repository
+            url="http://download.eclipse.org/technology/nebula/snapshot"/>
+        <repository
+            url="http://download.eclipse.org/tools/buckminster/updates-4.4"/>
+        <repository
+            url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
+        <repository
+            url="http://download.oracle.com/otn_software/oepe/12.2.1/mars/repository"/>
+        <repository
+            url="http://www.elver.org/eclipse/2.1.0/update"/>
+      </repositoryList>
+      <repositoryList
+          name="Luna">
+        <repository
+            url="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.0/R201406111328"/>
+        <repository
+            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/emf/updates/2.10/core/R201405190339"/>
+        <repository
+            url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201406111639"/>
+        <repository
+            url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201405281433"/>
+        <repository
+            url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.2.0"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emft/mwe/updates/releases/R201406110919/mwe"/>
+        <repository
+            url="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201406030414"/>
+        <repository
+            url="http://download.eclipse.org/ecoretools/updates/1.2/201306071421"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201405281451"/>
+        <repository
+            url="http://download.eclipse.org/tools/gef/updates/releases"/>
+        <repository
+            url="http://download.eclipse.org/graphiti/updates/0.11.0"/>
+        <repository
+            url="http://download.eclipse.org/technology/swtbot/releases/2.2.1"/>
+        <repository
+            url="http://download.eclipse.org/modeling/mdt/ocl/updates/releases/5.0.1"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/teneo/updates/2.0.0/interim"/>
+        <repository
+            url="http://download.eclipse.org/tools/buckminster/headless-4.3"/>
+        <repository
+            url="http://download.eclipse.org/mylyn/releases/3.12"/>
+        <repository
+            url="http://download.eclipse.org/technology/nebula/snapshot/"/>
+        <repository
+            url="http://download.eclipse.org/modeling/mdt/uml2/updates/4.1.x/R201402022055"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/validation/updates/releases/R201405281429"/>
+        <repository
+            url="http://download.eclipse.org/mmt/qvto/updates/releases/3.4.0"/>
+        <repository
+            url="http://www.elver.org/eclipse/2.0.0/update"/>
+        <repository
+            url="http://download.oracle.com/otn_software/oepe/kepler"/>
+      </repositoryList>
+    </targlet>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.workingsets:WorkingSetTask">
+    <workingSet
+        name="CDO"
+        id="CDO CDO">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="org\.eclipse\.emf\.cdo.*"/>
+        <operand
+            xsi:type="predicates:NotPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.emf\.cdo\.releng\.promotion.*"/>
+        </operand>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.1 //@setupTasks.9/@workingSets.2 //@setupTasks.9/@workingSets.3 //@setupTasks.9/@workingSets.7 //@setupTasks.9/@workingSets.8"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="CDO Tests"
+        id="CDO CDO Tests">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="org\.eclipse\.emf\.cdo\.tests.*"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="CDO Examples"
+        id="CDO CDO Examples">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:OrPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.emf\.cdo\.examples.*"/>
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.gastro.*"/>
+        </operand>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="CDO Dawn"
+        id="CDO CDO Dawn">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="org\.eclipse\.emf\.cdo\.dawn.*"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="Net4j"
+        id="CDO Net4j">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="org\.eclipse\.net4j.*"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.5 //@setupTasks.9/@workingSets.6 //@setupTasks.9/@workingSets.7"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="Net4j DB"
+        id="CDO Net4j DB">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="org\.eclipse\.net4j\.db.*"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="Net4j Examples"
+        id="CDO Net4j Examples">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:OrPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.net4j\.examples.*"/>
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.net4j\.buddies.*"/>
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org\.eclipse\.net4j\.jms.*"/>
+        </operand>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="Features"
+        id="CDO Features">
+      <predicate
+          xsi:type="predicates:NamePredicate"
+          pattern="org\.eclipse\.emf\.cdo.*-feature"/>
+      <predicate
+          xsi:type="predicates:NamePredicate"
+          pattern="org\.eclipse\.net4j.*-feature"/>
+      <predicate
+          xsi:type="predicates:NamePredicate"
+          pattern="org\.gastro.*-feature"/>
+    </workingSet>
+    <workingSet
+        name="Releng"
+        id="CDO Releng">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="org\.eclipse\.emf\.cdo\.releng.*"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//@setupTasks.9/@workingSets.7"/>
+      </predicate>
+    </workingSet>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:CompoundTask"
+      name="Mylyn Queries">
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.bugzilla.repository"
+        value="https://bugs.eclipse.org/bugs"/>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.bugzilla.prefix"
+        value="/buglist.cgi?classification=Modeling&amp;product=EMF"/>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.bugzilla.components"
+        value="component=cdo.core&amp;component=cdo.legacy&amp;component=cdo.dawn&amp;component=cdo.db&amp;component=cdo.docs&amp;component=cdo.hibernate&amp;component=cdo.net4j&amp;component=cdo.net4j.db&amp;component=cdo.net4j.ui&amp;component=cdo.objy&amp;component=cdo.releng&amp;component=cdo.ui"/>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.bugzilla.open"
+        value="bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED"/>
+    <setupTask
+        xsi:type="mylyn:MylynQueriesTask"
+        repositoryURL="${cdo.bugzilla.repository}">
+      <query
+          summary="CDO_1_BUGS"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.core&amp;component=cdo.docs&amp;component=cdo.net4j&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial"/>
+      <query
+          summary="CDO_2_FEATURES"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.core&amp;component=cdo.docs&amp;component=cdo.net4j&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}&amp;bug_severity=enhancement"/>
+      <query
+          summary="CDO_3_UI"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.net4j.ui&amp;component=cdo.ui&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}"/>
+      <query
+          summary="CDO_4_DB"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.db&amp;component=cdo.net4j.db&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}"/>
+      <query
+          summary="CDO_5_Hibernate"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.hibernate&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}"/>
+      <query
+          summary="CDO_6_Legacy"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.legacy&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}"/>
+      <query
+          summary="CDO_7_Dawn"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.dawn&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}"/>
+      <query
+          summary="CDO_8_Releng"
+          url="${cdo.bugzilla.prefix}&amp;component=cdo.releng&amp;version=${cdo.bugzilla.version}&amp;${cdo.bugzilla.open}"/>
+      <query
+          summary="CDO_9_RESOLVED"
+          url="${cdo.bugzilla.prefix}&amp;${cdo.bugzilla.components}&amp;version=${cdo.bugzilla.version}&amp;bug_status=RESOLVED&amp;resolution=FIXED"/>
+      <query
+          summary="CDO_Complete"
+          url="${cdo.bugzilla.prefix}&amp;${cdo.bugzilla.components}"/>
+    </setupTask>
+    <setupTask
+        xsi:type="mylyn:MylynQueriesTask"
+        disabled="true"
+        repositoryURL="${cdo.bugzilla.repository}">
+      <query
+          summary="TaskTable"
+          url="${cdo.bugzilla.prefix}&amp;${cdo.bugzilla.components}&amp;query_format=advanced&amp;resolution=FIXED&amp;resolution=---"/>
+    </setupTask>
+    <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="CDO_Reviews in ${cdo.git.clone.checkoutBranch}">
+        <attribute
+            key="gerrit query type"
+            value="custom"/>
+        <attribute
+            key="gerrit query project"
+            value="cdo/cdo"/>
+        <attribute
+            key="gerrit query string"
+            value="project:cdo/cdo status:open branch:${cdo.git.clone.checkoutBranch}"/>
+      </query>
+    </setupTask>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:CompoundTask"
+      name="Mylyn Builds">
+    <setupTask
+        xsi:type="mylyn:MylynBuildsTask"
+        serverURL="https://hudson.eclipse.org/cdo"
+        userID="${bugzilla.id}"
+        password="${eclipse.user.password}">
+      <buildPlan
+          name="emf-cdo-integration"/>
+      <buildPlan
+          name="emf-cdo-maintenance"/>
+      <buildPlan
+          name="emf-cdo-gerrit"/>
+    </setupTask>
+  </setupTask>
+  <stream name="4.4-maintenance"
+      label="4.4 Maintenance (Mars)">
+    <setupTask
+        xsi:type="setup.p2:P2Task">
+      <requirement
+          name="org.eclipse.emf.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.runtime.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.sdk.feature.group"/>
+      <repository
+          url="http://download.eclipse.org/releases/mars"/>
+    </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.git.branch"
+        value="streams/4.4-maintenance"/>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.target.platform"
+        value="Mars"/>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.bugzilla.version"
+        value="4.4"/>
+    <setupTask
+        xsi:type="jdt:JRETask"
+        version="JavaSE-1.7"
+        location="${jre.location-1.7}"/>
+    <setupTask
+        xsi:type="pde:APIBaselineTask"
+        name="CDO"
+        version="4.4"
+        location="${installation.location/baseline}"
+        remoteURI="http://sourceforge.net/projects/net4j/files/Baselines/emf-cdo-4.4-baseline.zip/download"/>
+  </stream>
+  <stream name="4.3-maintenance"
+      label="4.3 Maintenance (Luna)">
+    <setupTask
+        xsi:type="setup.p2:P2Task">
+      <requirement
+          name="org.eclipse.emf.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.runtime.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.gmf.sdk.feature.group"/>
+      <repository
+          url="http://download.eclipse.org/releases/luna"/>
+    </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.git.branch"
+        value="streams/4.3-maintenance"/>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.target.platform"
+        value="Luna"/>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="cdo.bugzilla.version"
+        value="4.3"/>
+    <setupTask
+        xsi:type="jdt:JRETask"
+        version="JavaSE-1.7"
+        location="${jre.location-1.7}"/>
+    <setupTask
+        xsi:type="pde:APIBaselineTask"
+        name="CDO"
+        version="4.3"
+        location="${installation.location/baseline}"
+        remoteURI="http://sourceforge.net/projects/net4j/files/Baselines/emf-cdo-4.3-baseline.zip/download"/>
+  </stream>
+</setup:Project>
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.properties b/plugins/org.eclipse.emf.cdo.releng/build.properties
index 57b3815c2e..b61d8048b2 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng/build.properties
@@ -7,14 +7,14 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-stream = 4.5
+stream = 4.6
 branch = master
 
-train = neon
-train.previous = mars
+train = oxygen
+train.previous = neon
 
-eclipse = 4.6
-emf = 2.12
+eclipse = 4.7
+emf = 2.13
 weekly = I
 
 qualifier.replacement.* = generator:lastModified