Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-06-13 14:51:15 +0000
committerEike Stepper2015-06-13 14:51:15 +0000
commitf29f3ef744ad710ee46db696b0d2dcf4ccfecd39 (patch)
treec96b710ef21487ec1e66174bcf98a1db34eba8c6
parentecfe7762b683080904d7269b571baa10aaef58f6 (diff)
downloadcdo-f29f3ef744ad710ee46db696b0d2dcf4ccfecd39.tar.gz
cdo-f29f3ef744ad710ee46db696b0d2dcf4ccfecd39.tar.xz
cdo-f29f3ef744ad710ee46db696b0d2dcf4ccfecd39.zip
[Releng] Adjust CDO.setup for Neon
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/CDO.setup30
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.properties10
2 files changed, 34 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
index bb9bc909b2..ff1b06cdb0 100644
--- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup
@@ -548,11 +548,39 @@
<setupTask
xsi:type="setup:VariableTask"
name="cdo.bugzilla.version"
+ value="4.5"/>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="cdo.baseline.version"
+ value="4.4"/>
+ </stream>
+ <stream name="streams/4.4-maintenance"
+ label="4.4 Maintenance">
+ <setupTask
+ xsi:type="setup.p2:P2Task">
+ <requirement
+ name="org.eclipse.emf.sdk.feature.group"/>
+ <requirement
+ name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
+ <requirement
+ name="org.eclipse.gmf.runtime.sdk.feature.group"/>
+ <requirement
+ name="org.eclipse.gmf.sdk.feature.group"/>
+ <repository
+ url="http://download.eclipse.org/releases/mars"/>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="cdo.target.platform"
+ value="Mars"/>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="cdo.bugzilla.version"
value="4.4"/>
<setupTask
xsi:type="setup:VariableTask"
name="cdo.baseline.version"
- value="4.3"/>
+ value="4.4"/>
</stream>
<stream name="streams/4.3-maintenance"
label="4.3 Maintenance">
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.properties b/plugins/org.eclipse.emf.cdo.releng/build.properties
index 39b69a7736..57b3815c2e 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng/build.properties
@@ -7,14 +7,14 @@
# Contributors:
# Eike Stepper - initial API and implementation
-stream = 4.4
+stream = 4.5
branch = master
-train = mars
-train.previous = luna
+train = neon
+train.previous = mars
-eclipse = 4.5
-emf = 2.11
+eclipse = 4.6
+emf = 2.12
weekly = I
qualifier.replacement.* = generator:lastModified

Back to the top