Updated oomph setups for Eclipse 2018-12.

Signed-off-by: Florian Hoelzl <hoelzl@fortiss.org>
diff --git a/oomph-setup/sf1-target-platform.target b/oomph-setup/sf1-target-platform.target
new file mode 100644
index 0000000..4809d72
--- /dev/null
+++ b/oomph-setup/sf1-target-platform.target
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="SF1 Target Platform">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.fx.target.feature.feature.group" version="3.4.1.201810030600"/>
+			<repository location="http://download.eclipse.org/efxclipse/runtime-released/3.4.1/site/"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.emf.ecp.sdk.feature.feature.group" version="1.16.0.20180305-1637"/>
+			<repository location="http://download.eclipse.org/releases/oxygen"/>
+			<unit id="org.eclipse.egit.feature.group" version="4.9.2.201712150930-r"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
+			<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
+			<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+			<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+			<unit id="org.apache.commons.math3" version="3.5.0.v20160301-1110"/>
+			<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+			<unit id="org.apache.commons.pool" version="1.6.0.v201204271246"/>
+			<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.elk.algorithms.feature.source.feature.group" version="0.4.1"/>
+			<unit id="org.eclipse.elk.sdk.feature.source.feature.group" version="0.4.1"/>
+			<repository location="http://download.eclipse.org/elk/updates/releases/0.4.1/"/>
+		</location>
+	</locations>
+</target>
\ No newline at end of file
diff --git a/oomph-setup/systemfocus-committer.setup b/oomph-setup/systemfocus-committer.setup
index 81638da..405d5b1 100644
--- a/oomph-setup/systemfocus-committer.setup
+++ b/oomph-setup/systemfocus-committer.setup
@@ -5,10 +5,11 @@
     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:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
+    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
-    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/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore"
+    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/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore"
     name="systemfocus"
     label="SystemFocus (ssh for committers)">
   <setupTask
@@ -34,33 +35,39 @@
   </setupTask>
   <setupTask
       xsi:type="setup:VariableTask"
-      name="eclipse.target.platform"
+      name="SF1 Target Platform"
       defaultValue="Oxygen"
       storageURI="scope://Workspace"/>
   <setupTask
+      xsi:type="pde:TargetPlatformTask"
+      name="sf1-target-platform"/>
+  <setupTask
       xsi:type="setup.p2:P2Task"
-      label="E(fx)clipse IDE, EMF SDK">
+      label="Eclipse EMF SDK">
     <requirement
-        name="org.eclipse.fx.ide.feature.feature.group"
-        versionRange="[3.3.0,3.4.0)"/>
-    <requirement
-        name="org.eclipse.emf.sdk.feature.group"
-        versionRange="[2.14.0,2.15.0)"/>
+        name="org.eclipse.emf.sdk.feature.group"/>
     <repository
-        url="http://download.eclipse.org/releases/photon"/>
-    <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}.</description>
+        url="http://download.eclipse.org/releases/2018-12"/>
+    <description>Install the tools needed in the IDE to work with the source code of ${scope.project.label}.</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.p2:P2Task"
+      label="E(fx)clipse IDE - JavaFX support">
+    <requirement
+        name="org.eclipse.fx.ide.feature.feature.group"/>
+    <repository
+        url="http://download.eclipse.org/efxclipse/updates-released/3.4.1/site/"/>
+    <description>Install JavaFX IDE support.</description>
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
       label="SystemFocus Development Tools">
     <requirement
-        name="org.eclipse.systemfocus.tooling.codereview.feature.feature.group"
-        versionRange="[1.0.0,1.1.0)"/>
+        name="org.eclipse.systemfocus.tooling.codereview.feature.feature.group"/>
     <requirement
-        name="org.eclipse.systemfocus.tooling.emfgeneration.git.feature.feature.group"
-        versionRange="[1.0.0,1.1.0)"/>
+        name="org.eclipse.systemfocus.tooling.emfgeneration.git.feature.feature.group"/>
     <repository
-        url="http://download.fortiss.org/public/projects/org.eclipse.systemfocus.tooling.site/1.0/"/>
+        url="http://download.fortiss.org/public/projects/org.eclipse.systemfocus.tooling.site/1.1/"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}.</description>
   </setupTask>
   <setupTask
@@ -70,51 +77,13 @@
     <description>${scope.project.label} Git SystemFocus Repository Cloning</description>
   </setupTask>
   <setupTask
-      xsi:type="setup.targlets:TargletTask">
-    <targlet
-        name="target platform"
-        activeRepositoryList="${eclipse.target.platform}">
-      <requirement
-          name="org.eclipse.fx.target.feature.feature.group"/>
-      <repositoryList
-          name="Photon">
-        <repository
-            url="http://download.eclipse.org/efxclipse/runtime-released/3.3.0/site"/>
-        <repository
-            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
-        <repository
-            url="http://download.eclipse.org/egit/updates/"/>
-        <repository
-            url="http://download.eclipse.org/releases/photon"/>
-      </repositoryList>
-    </targlet>
-    <targlet
-        name="systemfocus source">
-      <requirement
-          name="org.eclipse.systemfocus.examples.function.architecture.product.plain.project"
-          filter=""/>
-      <requirement
-          name="org.eclipse.systemfocus.examples.function.architecture.feature.feature.group"
-          filter=""/>
-      <sourceLocator
-          rootFolder="${git.clone.systemfocus.location}"
-          locateNestedProjects="true"/>
-    </targlet>
-    <description>Construct a target platform including all plugins and features to run ${scope.project.label}.</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      content="content_assist_proposals_background=255,255,255&#xA;content_assist_proposals_foreground=0,0,0&#xA;eclipse.preferences.version=1&#xA;org.eclipse.jdt.internal.ui.navigator.layout=1&#xA;org.eclipse.jdt.internal.ui.navigator.librariesnode=true&#xA;org.eclipse.jdt.ui.formatterprofiles.version=13&#xA;spelling_locale_initialized=true&#xA;useAnnotationsPrefPage=true&#xA;useQuickDiffPrefPage=true"
-      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs"
-      encoding="UTF-8">
-    <description>Subclipse preference configuration for using SVNKit provider.</description>
+      xsi:type="projects:ProjectsImportTask">
+    <sourceLocator
+        rootFolder="${git.clone.systemfocus.location}"/>
   </setupTask>
   <stream name="master"
-      label="Master">
-    <description>Configure the stream / branch of source code.</description>
+      label="Master branch of Eclipse SystemFocus.">
+    <description>The master branch is hosted at Eclipse foundation.</description>
   </stream>
-  <logicalProjectContainer
-      xsi:type="setup:ProjectCatalog"
-      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
   <description>SystemFocus provides SF1.</description>
-</setup:Project>
+</setup:Project>
\ No newline at end of file
diff --git a/oomph-setup/systemfocus-contributor.setup b/oomph-setup/systemfocus-contributor.setup
index 9daaddb..6212402 100644
--- a/oomph-setup/systemfocus-contributor.setup
+++ b/oomph-setup/systemfocus-contributor.setup
@@ -5,10 +5,11 @@
     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:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
+    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
-    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/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore"
+    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/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore"
     name="systemfocus"
     label="SystemFocus (https for contributors)">
   <setupTask
@@ -34,33 +35,39 @@
   </setupTask>
   <setupTask
       xsi:type="setup:VariableTask"
-      name="eclipse.target.platform"
+      name="SF1 Target Platform"
       defaultValue="Oxygen"
       storageURI="scope://Workspace"/>
   <setupTask
+      xsi:type="pde:TargetPlatformTask"
+      name="sf1-target-platform"/>
+  <setupTask
       xsi:type="setup.p2:P2Task"
-      label="E(fx)clipse IDE, EMF SDK">
+      label="Eclipse EMF SDK">
     <requirement
-        name="org.eclipse.fx.ide.feature.feature.group"
-        versionRange="[3.0.0,3.4.0)"/>
-    <requirement
-        name="org.eclipse.emf.sdk.feature.group"
-        versionRange="[2.13.0,2.14.0)"/>
+        name="org.eclipse.emf.sdk.feature.group"/>
     <repository
-        url="http://download.eclipse.org/releases/oxygen"/>
-    <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}.</description>
+        url="http://download.eclipse.org/releases/2018-12"/>
+    <description>Install the tools needed in the IDE to work with the source code of ${scope.project.label}.</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.p2:P2Task"
+      label="E(fx)clipse IDE - JavaFX support">
+    <requirement
+        name="org.eclipse.fx.ide.feature.feature.group"/>
+    <repository
+        url="http://download.eclipse.org/efxclipse/updates-released/3.4.1/site/"/>
+    <description>Install JavaFX IDE support.</description>
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
       label="SystemFocus Development Tools">
     <requirement
-        name="org.eclipse.systemfocus.tooling.codereview.feature.feature.group"
-        versionRange="[1.0.0,1.1.0)"/>
+        name="org.eclipse.systemfocus.tooling.codereview.feature.feature.group"/>
     <requirement
-        name="org.eclipse.systemfocus.tooling.emfgeneration.git.feature.feature.group"
-        versionRange="[1.0.0,1.1.0)"/>
+        name="org.eclipse.systemfocus.tooling.emfgeneration.git.feature.feature.group"/>
     <repository
-        url="http://download.fortiss.org/public/projects/org.eclipse.systemfocus.tooling.site/1.0/"/>
+        url="http://download.fortiss.org/public/projects/org.eclipse.systemfocus.tooling.site/1.1/"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}.</description>
   </setupTask>
   <setupTask
@@ -70,51 +77,13 @@
     <description>${scope.project.label} Git SystemFocus Repository Cloning</description>
   </setupTask>
   <setupTask
-      xsi:type="setup.targlets:TargletTask">
-    <targlet
-        name="target platform"
-        activeRepositoryList="${eclipse.target.platform}">
-      <requirement
-          name="org.eclipse.fx.target.feature.feature.group"/>
-      <repositoryList
-          name="Oxygen">
-        <repository
-            url="http://download.eclipse.org/efxclipse/runtime-released/3.3.0/site"/>
-        <repository
-            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository/"/>
-        <repository
-            url="http://download.eclipse.org/egit/updates/"/>
-        <repository
-            url="http://download.eclipse.org/releases/oxygen"/>
-      </repositoryList>
-    </targlet>
-    <targlet
-        name="systemfocus source">
-      <requirement
-          name="org.eclipse.systemfocus.examples.function.architecture.product.plain.project"
-          filter=""/>
-      <requirement
-          name="org.eclipse.systemfocus.examples.function.architecture.feature.feature.group"
-          filter=""/>
-      <sourceLocator
-          rootFolder="${git.clone.systemfocus.location}"
-          locateNestedProjects="true"/>
-    </targlet>
-    <description>Construct a target platform including all plugins and features to run ${scope.project.label}.</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      content="content_assist_proposals_background=255,255,255&#xA;content_assist_proposals_foreground=0,0,0&#xA;eclipse.preferences.version=1&#xA;org.eclipse.jdt.internal.ui.navigator.layout=1&#xA;org.eclipse.jdt.internal.ui.navigator.librariesnode=true&#xA;org.eclipse.jdt.ui.formatterprofiles.version=13&#xA;spelling_locale_initialized=true&#xA;useAnnotationsPrefPage=true&#xA;useQuickDiffPrefPage=true"
-      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs"
-      encoding="UTF-8">
-    <description>Subclipse preference configuration for using SVNKit provider.</description>
+      xsi:type="projects:ProjectsImportTask">
+    <sourceLocator
+        rootFolder="${git.clone.systemfocus.location}"/>
   </setupTask>
   <stream name="master"
-      label="Master">
-    <description>Configure the stream / branch of source code.</description>
+      label="Master branch of Eclipse SystemFocus.">
+    <description>The master branch is hosted at Eclipse foundation.</description>
   </stream>
-  <logicalProjectContainer
-      xsi:type="setup:ProjectCatalog"
-      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
   <description>SystemFocus provides SF1.</description>
 </setup:Project>