Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-01-24 08:11:25 +0000
committerEike Stepper2015-01-24 08:11:25 +0000
commite1da08f34d2e56c12a6903ede5f83c67f648adfe (patch)
treebe86d07beacc7f1f19216885d80da67ebf47da05 /plugins
parente1cbba7d2374b6c0142c5cb599f3ebe5a965c3ae (diff)
downloadcdo-e1da08f34d2e56c12a6903ede5f83c67f648adfe.tar.gz
cdo-e1da08f34d2e56c12a6903ede5f83c67f648adfe.tar.xz
cdo-e1da08f34d2e56c12a6903ede5f83c67f648adfe.zip
[Releng] Add JRE 1.7 task to CDO.setup
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/CDO.setup26
1 files changed, 16 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
index e3a81340ce..3cb8dd3c5b 100644
--- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
@@ -4,6 +4,7 @@
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"
@@ -12,11 +13,12 @@
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/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"
+ 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">
+ xsi:type="setup.p2:P2Task"
+ label="CDO">
<requirement
name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
<requirement
@@ -83,6 +85,10 @@
key="instance/org.eclipse.pde/compilers.f.unresolved-features"
value="2"/>
<setupTask
+ xsi:type="jdt:JRETask"
+ version="JavaSE-1.7"
+ location="${jre.location-1.7}"/>
+ <setupTask
xsi:type="pde:APIBaselineTask"
name="CDO"
version="${cdo.baseline.version}"
@@ -207,7 +213,7 @@
pattern="org\.eclipse\.emf\.cdo.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.1 //@setupTasks.10/@workingSets.2 //@setupTasks.10/@workingSets.3 //@setupTasks.10/@workingSets.7 //@setupTasks.10/@workingSets.8 //@setupTasks.10/@workingSets.9"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.1 //@setupTasks.11/@workingSets.2 //@setupTasks.11/@workingSets.3 //@setupTasks.11/@workingSets.7 //@setupTasks.11/@workingSets.8 //@setupTasks.11/@workingSets.9"/>
</predicate>
</workingSet>
<workingSet
@@ -220,7 +226,7 @@
pattern="org\.eclipse\.emf\.cdo\.tests.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -239,7 +245,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -252,7 +258,7 @@
pattern="org\.eclipse\.emf\.cdo\.dawn.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -265,7 +271,7 @@
pattern="org\.eclipse\.net4j.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.5 //@setupTasks.10/@workingSets.6 //@setupTasks.10/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.5 //@setupTasks.11/@workingSets.6 //@setupTasks.11/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -278,7 +284,7 @@
pattern="org\.eclipse\.net4j\.db.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -300,7 +306,7 @@
</operand>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.7"/>
</predicate>
</workingSet>
<workingSet
@@ -326,7 +332,7 @@
pattern="org\.eclipse\.emf\.cdo\.releng.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.10/@workingSets.7 //@setupTasks.10/@workingSets.9"/>
+ excludedWorkingSet="//@setupTasks.11/@workingSets.7 //@setupTasks.11/@workingSets.9"/>
</predicate>
</workingSet>
<workingSet

Back to the top