Include a JRE task for ECF's setup

eclipse-oomph · Nov 15, 2023 · b791de8 · b791de8
1 parent 7477cbc
commit b791de8
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/setups/interim/ECF.setup b/setups/interim/ECF.setup
@@ -4,12 +4,13 @@
     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:predicates="http://www.eclipse.org/oomph/predicates/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/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 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore"
     name="ecf"
     label="ECF">
   <annotation
@@ -56,6 +57,10 @@
           value="Warning"/>
     </setupTask>
   </setupTask>
+  <setupTask
+      xsi:type="jdt:JRETask"
+      version="JavaSE-17"
+      location="${jre.location-17}"/>
   <setupTask
       xsi:type="git:GitCloneTask"
       id="github.clone.ecf"
@@ -343,7 +348,7 @@
             nature="org.eclipse.pde.PluginNature"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.3/@workingSets[name='ECF%20Examples'] //@setupTasks.3/@workingSets[name='ECF%20Tests']"/>
+            excludedWorkingSet="//@setupTasks.4/@workingSets[name='ECF%20Examples'] //@setupTasks.4/@workingSets[name='ECF%20Tests']"/>
       </predicate>
     </workingSet>
     <workingSet
@@ -394,7 +399,7 @@
             project="org.eclipse.ecf"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.3/@workingSets[name='ECF%20Bundles'] //@setupTasks.3/@workingSets[name='ECF%20Features'] //@setupTasks.3/@workingSets[name='ECF%20Examples'] //@setupTasks.3/@workingSets[name='ECF%20Tests']"/>
+            excludedWorkingSet="//@setupTasks.4/@workingSets[name='ECF%20Bundles'] //@setupTasks.4/@workingSets[name='ECF%20Features'] //@setupTasks.4/@workingSets[name='ECF%20Examples'] //@setupTasks.4/@workingSets[name='ECF%20Tests']"/>
       </predicate>
     </workingSet>
   </setupTask>