commit 08ef7065d6390a80975a9b5b91a92e3fa13a0020
author Arthur van Dorp <Arthur.vanDorp@bsi-software.com> Thu Jun 01 15:07:20 2017 +0200
committer Arthur van Dorp <Arthur.vanDorp@bsi-software.com> Thu Jun 01 15:07:20 2017 +0200
tree 5f7e70253849239a07a72c36b6d76460d21f7757
parent f403ae9c62adec4e954870ab9a896f518b35d932

Switch Oxygen head to 7.0. Remove m2e-jdt-compiler.

Use 7.0.x for Oxygen head and Oxygen RC2 as current build.
Remove m2e-jdt-compiler as it results in lifecycle mapping problems.


Change-Id: I3214bca2d85c01f29be7c6c8675a92c8a82e3cad
Signed-off-by: Arthur van Dorp <Arthur.vanDorp@bsi-software.com>

Scout.setup

diff --git a/Scout.setup b/Scout.setup
index efff580..4337780 100644
--- a/Scout.setup
+++ b/Scout.setup
@@ -58,13 +58,6 @@
         url="https://repository.takari.io/content/sites/m2e.extras/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
   </setupTask>
   <setupTask
-      xsi:type="setup.p2:P2Task">
-    <requirement
-        name="org.jboss.tools.m2e.jdt.feature.feature.group"/>
-    <repository
-        url="http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-jdt-compiler/"/>
-  </setupTask>
-  <setupTask
       xsi:type="setup.p2:P2Task"
       disabled="true">
     <requirement
@@ -132,14 +125,14 @@
       </workingSet>
     </setupTask>
     <stream
-        name="releases/6.1.x"
+        name="releases/7.0.x"
         label="Oxygen (head)">
       <setupTask
           xsi:type="setup.p2:P2Task">
         <requirement
             name="org.eclipse.scout.sdk-feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/scout/releases/6.1/"/>
+            url="http://download.eclipse.org/scout/releases/7.0/"/>
       </setupTask>
       <description></description>
     </stream>
@@ -230,25 +223,25 @@
       </workingSet>
     </setupTask>
     <stream
-        name="features/version/6.1.0.M6"
-        label="Oxygen (M6 release)">
+        name="features/version/7.0.0.006_RC2"
+        label="Oxygen (RC2 release)">
       <setupTask
           xsi:type="setup.p2:P2Task">
         <requirement
             name="org.eclipse.scout.sdk-feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/scout/releases/6.1/6.1.0/M6/"/>
+            url="http://download.eclipse.org/scout/releases/7.0/7.0.0/006_RC2/"/>
       </setupTask>
     </stream>
     <stream
-        name="releases/6.1.x"
+        name="releases/7.0.x"
         label="Oxygen (head)">
       <setupTask
           xsi:type="setup.p2:P2Task">
         <requirement
             name="org.eclipse.scout.sdk-feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/scout/releases/6.1/"/>
+            url="http://download.eclipse.org/scout/releases/7.0/"/>
       </setupTask>
     </stream>
     <stream