update mars target and add neon target

Change-Id: I7a19a88c844a2951e80a13c70452707c9bf1526c
Reviewed-on: https://git.eclipse.org/r/62796
Tested-by: Hudson CI
Reviewed-by: Stephan Leicht Vogt <stephan.leichtvogt@bsi-software.com>

5 files changed, 120 insertions, 43 deletions

diff --git a/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.target b/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.target
index ab0ff91e6..990d7fbd0 100644
--- a/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.target
+++ b/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.target
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Scout SDK Eclipse Mars Dependencies" sequenceNumber="1441890189">
+<target name="Scout SDK Eclipse Mars Dependencies" sequenceNumber="1450256654">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="4.5.0.v20150603-2358"/>
-      <unit id="org.eclipse.jdt.feature.group" version="3.11.0.v20150603-2000"/>
-      <unit id="org.eclipse.emf.common.feature.group" version="2.11.0.v20150512-0501"/>
-      <unit id="org.eclipse.rcp.feature.group" version="4.5.0.v20150603-2331"/>
-      <unit id="org.eclipse.e4.rcp.feature.group" version="1.4.0.v20150603-0857"/>
-      <unit id="org.eclipse.emf.ecore.feature.group" version="2.11.0.v20150512-0501"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.11.0.v20150603-2000"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.5.1.v20150904-0015"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.11.1.v20150904-0015"/>
+      <unit id="org.eclipse.emf.common.feature.group" version="2.11.0.v20150805-0538"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.5.1.v20150904-0015"/>
+      <unit id="org.eclipse.e4.rcp.feature.group" version="1.4.0.v20150903-1804"/>
+      <unit id="org.eclipse.emf.ecore.feature.group" version="2.11.1.v20150805-0538"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.11.1.v20150904-0345"/>
       <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
       <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
       <unit id="org.apache.commons.collections" version="3.2.0.v2013030210310"/>
-      <unit id="org.eclipse.m2e.feature.feature.group" version="1.6.0.20150526-2032"/>
-      <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.11.0.v20150529-1857"/>
-      <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.7.0.v201505132009"/>
+      <unit id="org.eclipse.m2e.feature.feature.group" version="1.6.2.20150902-0002"/>
+      <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.11.1.v20150831-1342"/>
+      <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.7.1.v201508262220"/>
       <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.7.0.v201505072140"/>
       <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.7.0.v201502261749"/>
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.7.0.v201505141512"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="2.11.0.v20150601-0402"/>
-      <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.9.0.v20150601-0402"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.7.1.v201508271605"/>
+      <unit id="org.eclipse.emf.edit.feature.group" version="2.11.1.v20150806-0404"/>
+      <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.9.0.v20150806-0404"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.300.v20150430-1836"/>
-      <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.1.0.v20150512-1727"/>
-      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.10.0.v20150512-1727"/>
-      <unit id="org.eclipse.xsd.feature.group" version="2.11.0.v20150601-0402"/>
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.1.0.v20150810-1719"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.10.1.v20150810-1719"/>
+      <unit id="org.eclipse.xsd.feature.group" version="2.11.0.v20150806-0404"/>
       <unit id="com.google.guava" version="15.0.0.v201403281430"/>
       <repository id="eclipse_mars" location="http://download.eclipse.org/releases/mars/"/>
     </location>
diff --git a/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.tpd b/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.tpd
index d38afbe51..c2b9f4161 100644
--- a/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.tpd
+++ b/org.eclipse.scout.sdk-target/org.eclipse.mars-dependencies.tpd
@@ -1,35 +1,35 @@
 target "Scout SDK Eclipse Mars Dependencies" with source
 
 location eclipse_mars "http://download.eclipse.org/releases/mars/" {
-	org.eclipse.platform.feature.group [4.4.2,5.0.0)
-	org.eclipse.jdt.feature.group [3.10.1,4.0.0)
-	org.eclipse.emf.common.feature.group [2.10.1,3.0.0)
-	org.eclipse.rcp.feature.group [4.4.2,5.0.0)
-	org.eclipse.e4.rcp.feature.group [1.3.101,2.0.0)
-	org.eclipse.emf.ecore.feature.group [2.10.2,3.0.0)
-	org.eclipse.pde.feature.group [3.10.1,4.0.0)
+    org.eclipse.platform.feature.group [4.4.2,5.0.0)
+    org.eclipse.jdt.feature.group [3.10.1,4.0.0)
+    org.eclipse.emf.common.feature.group [2.10.1,3.0.0)
+    org.eclipse.rcp.feature.group [4.4.2,5.0.0)
+    org.eclipse.e4.rcp.feature.group [1.3.101,2.0.0)
+    org.eclipse.emf.ecore.feature.group [2.10.2,3.0.0)
+    org.eclipse.pde.feature.group [3.10.1,4.0.0)
 
-	// required for scout.sdk.core
-	org.apache.commons.lang3 [3.1.0,4.0.0)
-	org.apache.commons.io [2.0.1,3.0.0)
-	org.apache.commons.collections [3.2.0,4.0.0)
+    // required for scout.sdk.core
+    org.apache.commons.lang3 [3.1.0,4.0.0)
+    org.apache.commons.io [2.0.1,3.0.0)
+    org.apache.commons.collections [3.2.0,4.0.0)
 
-	// required for m2e.core
-	org.eclipse.m2e.feature.feature.group [1.6.0,2.0.0)
-	org.eclipse.equinox.core.sdk.feature.group [3.10.2,4.0.0)
-	org.eclipse.wst.common_core.feature.feature.group [3.6.0,4.0.0)
-	org.eclipse.wst.common.fproj.feature.group [3.6.0,4.0.0)
-	org.eclipse.wst.xml_core.feature.feature.group [3.6.0,4.0.0)
-	org.eclipse.wst.xml_ui.feature.feature.group [3.6.0,4.0.0)
-	org.eclipse.emf.edit.feature.group [2.10.0,3.0.0)
-	org.eclipse.emf.ecore.edit.feature.group [2.9.0,3.0.0)
-	org.eclipse.equinox.p2.discovery.feature.feature.group [1.0.200,2.0.0)
-	org.eclipse.ecf.core.feature.feature.group [1.1.0,2.0.0)
-	org.eclipse.ecf.filetransfer.feature.feature.group [3.9.0,4.0.0)
-	org.eclipse.xsd.feature.group [2.10.0,3.0.0)
-	com.google.guava [15.0.0,15.1.0)
+    // required for m2e.core
+    org.eclipse.m2e.feature.feature.group [1.6.0,2.0.0)
+    org.eclipse.equinox.core.sdk.feature.group [3.10.2,4.0.0)
+    org.eclipse.wst.common_core.feature.feature.group [3.6.0,4.0.0)
+    org.eclipse.wst.common.fproj.feature.group [3.6.0,4.0.0)
+    org.eclipse.wst.xml_core.feature.feature.group [3.6.0,4.0.0)
+    org.eclipse.wst.xml_ui.feature.feature.group [3.6.0,4.0.0)
+    org.eclipse.emf.edit.feature.group [2.10.0,3.0.0)
+    org.eclipse.emf.ecore.edit.feature.group [2.9.0,3.0.0)
+    org.eclipse.equinox.p2.discovery.feature.feature.group [1.0.200,2.0.0)
+    org.eclipse.ecf.core.feature.feature.group [1.1.0,2.0.0)
+    org.eclipse.ecf.filetransfer.feature.feature.group [3.9.0,4.0.0)
+    org.eclipse.xsd.feature.group [2.10.0,3.0.0)
+    com.google.guava [15.0.0,15.1.0)
 }
 
 location cbi_license "http://download.eclipse.org/cbi/updates/license" {
-	org.eclipse.license.feature.group lazy
+    org.eclipse.license.feature.group lazy
 }
diff --git a/org.eclipse.scout.sdk-target/org.eclipse.neon-dependencies.target b/org.eclipse.scout.sdk-target/org.eclipse.neon-dependencies.target
new file mode 100644
index 000000000..080b8e57c
--- /dev/null
+++ b/org.eclipse.scout.sdk-target/org.eclipse.neon-dependencies.target
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Scout SDK Eclipse Neon Dependencies" sequenceNumber="1450256654">
+  <locations>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="4.6.0.v20151029-1349"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20151029-1349"/>
+      <unit id="org.eclipse.emf.common.feature.group" version="2.12.0.v20151026-0351"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.6.0.v20151029-1100"/>
+      <unit id="org.eclipse.e4.rcp.feature.group" version="1.4.0.v20151028-2323"/>
+      <unit id="org.eclipse.emf.ecore.feature.group" version="2.12.0.v20151026-0351"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.12.0.v20151029-1349"/>
+      <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+      <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+      <unit id="org.apache.commons.collections" version="3.2.0.v2013030210310"/>
+      <unit id="org.eclipse.m2e.feature.feature.group" version="1.7.0.20151110-2248"/>
+      <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.11.0.v20151023-1114"/>
+      <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.7.1.v201508262220"/>
+      <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.7.0.v201505072140"/>
+      <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.8.0.v201511030001"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.8.0.v201511030001"/>
+      <unit id="org.eclipse.emf.edit.feature.group" version="2.12.0.v20151109-0426"/>
+      <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.9.0.v20151109-0426"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.300.v20150907-2149"/>
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.1.0.v20150925-2135"/>
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.11.0.v20150925-2135"/>
+      <unit id="org.eclipse.xsd.feature.group" version="2.11.0.v20151109-0426"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <repository id="eclipse_mars" location="http://download.eclipse.org/releases/neon/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository id="cbi_license" location="http://download.eclipse.org/cbi/updates/license"/>
+    </location>
+  </locations>
+</target>
diff --git a/org.eclipse.scout.sdk-target/org.eclipse.neon-dependencies.tpd b/org.eclipse.scout.sdk-target/org.eclipse.neon-dependencies.tpd
new file mode 100644
index 000000000..71dc11b54
--- /dev/null
+++ b/org.eclipse.scout.sdk-target/org.eclipse.neon-dependencies.tpd
@@ -0,0 +1,35 @@
+target "Scout SDK Eclipse Neon Dependencies" with source
+
+location eclipse_mars "http://download.eclipse.org/releases/neon/" {
+    org.eclipse.platform.feature.group [4.4.2,5.0.0)
+    org.eclipse.jdt.feature.group [3.10.1,4.0.0)
+    org.eclipse.emf.common.feature.group [2.10.1,3.0.0)
+    org.eclipse.rcp.feature.group [4.4.2,5.0.0)
+    org.eclipse.e4.rcp.feature.group [1.3.101,2.0.0)
+    org.eclipse.emf.ecore.feature.group [2.10.2,3.0.0)
+    org.eclipse.pde.feature.group [3.10.1,4.0.0)
+
+    // required for scout.sdk.core
+    org.apache.commons.lang3 [3.1.0,4.0.0)
+    org.apache.commons.io [2.0.1,3.0.0)
+    org.apache.commons.collections [3.2.0,4.0.0)
+
+    // required for m2e.core
+    org.eclipse.m2e.feature.feature.group [1.6.0,2.0.0)
+    org.eclipse.equinox.core.sdk.feature.group [3.10.2,4.0.0)
+    org.eclipse.wst.common_core.feature.feature.group [3.6.0,4.0.0)
+    org.eclipse.wst.common.fproj.feature.group [3.6.0,4.0.0)
+    org.eclipse.wst.xml_core.feature.feature.group [3.6.0,4.0.0)
+    org.eclipse.wst.xml_ui.feature.feature.group [3.6.0,4.0.0)
+    org.eclipse.emf.edit.feature.group [2.10.0,3.0.0)
+    org.eclipse.emf.ecore.edit.feature.group [2.9.0,3.0.0)
+    org.eclipse.equinox.p2.discovery.feature.feature.group [1.0.200,2.0.0)
+    org.eclipse.ecf.core.feature.feature.group [1.1.0,2.0.0)
+    org.eclipse.ecf.filetransfer.feature.feature.group [3.9.0,4.0.0)
+    org.eclipse.xsd.feature.group [2.10.0,3.0.0)
+    com.google.guava [15.0.0,15.1.0)
+}
+
+location cbi_license "http://download.eclipse.org/cbi/updates/license" {
+    org.eclipse.license.feature.group lazy
+}
diff --git a/org.eclipse.scout.sdk-target/pom.xml b/org.eclipse.scout.sdk-target/pom.xml
index 78cd6be96..feda6cc1b 100644
--- a/org.eclipse.scout.sdk-target/pom.xml
+++ b/org.eclipse.scout.sdk-target/pom.xml
@@ -45,6 +45,11 @@
                   <type>target</type>
                   <classifier>org.eclipse.mars-dependencies</classifier>
                 </artifact>
+                <artifact>
+                  <file>org.eclipse.neon-dependencies.target</file>
+                  <type>target</type>
+                  <classifier>org.eclipse.neon-dependencies</classifier>
+                </artifact>
               </artifacts>
             </configuration>
           </execution>