Commit 6c2a9433 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge branch '2019-06' into 'master'

Version bump for 2019-06

See merge request !8
parents 049e271a aa4c6de3
......@@ -14,7 +14,7 @@
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
xsi:schemaLocation="http://maybeec.github.io/oomph-task-unzip/1.0 https://raw.githubusercontent.com/maybeec/oomph-task-unzip/master/task-unzip-updatesite/model/Oomph-task-unzip.ecore 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/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.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"
name="autofocus3"
label="AutoFOCUS 3 (Developer, 2019-03)">
label="AutoFOCUS 3 (Developer, 2019-06)">
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
......@@ -29,18 +29,20 @@
vm="true">
<description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
defaultValue="2019-06"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task"
label="Eclipse 2019-03 Update Site stuff">
label="Eclipse 2019-06 Update Site stuff">
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.11.0,4.12.0)"/>
<requirement
name="org.eclipse.epp.package.modeling.feature.feature.group"
versionRange="[4.11.0,4.12.0)"/>
versionRange="[4.12.0,4.13.0)"/>
<requirement
name="org.eclipse.emf.sdk.feature.group"
versionRange="[2.17.0,2.18.0)"/>
versionRange="[2.18.0,2.19.0)"/>
<requirement
name="org.eclipse.emf.transaction.sdk.feature.group"
versionRange="[1.12.0,1.13.0)"/>
......@@ -55,41 +57,31 @@
versionRange="[1.12.0,1.13.0)"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="[2.17.0,2.18.0)"/>
<requirement
name="org.eclipse.pde.java12patch.feature.group"
versionRange="[1.1.0,1.2.0)"/>
versionRange="[2.18.0,2.19.0)"/>
<requirement
name="org.eclipse.jdt.java12patch.feature.group"
versionRange="[1.1.0,1.2.0)"/>
<repository
url="https://download.eclipse.org/releases/2019-03/"/>
name="org.eclipse.epp.package.modeling.feature.feature.group"
versionRange="[4.12.0,4.13.0)"/>
<repository
url="https://download.eclipse.org/technology/epp/packages/2019-03/"/>
url="https://download.eclipse.org/releases/2019-06/"/>
<repository
url="https://download.eclipse.org/eclipse/updates/4.11-P-builds/P20190328-0035/"/>
url="https://download.eclipse.org/technology/epp/packages/2019-06/"/>
<description>Install the tools needed in the IDE to work with the source code of ${scope.project.label}.</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
defaultValue="2019-03"
storageURI="scope://Workspace"/>
<setupTask
xsi:type="setup.p2:P2Task"
label="eGit jGit">
<requirement
name="org.eclipse.egit.feature.group"
versionRange="[5.3.0,5.4.0)"/>
versionRange="[5.4.0,5.5.0)"/>
<requirement
name="org.eclipse.jgit.feature.group"
versionRange="[5.3.0,5.4.0)"/>
versionRange="[5.4.0,5.5.0)"/>
<requirement
name="org.eclipse.egit.mylyn.feature.group"
versionRange="[5.3.0,5.4.0)"
versionRange="[5.4.0,5.5.0)"
filter=""/>
<repository
url="https://download.eclipse.org/egit/updates-5.3"/>
url="https://download.eclipse.org/egit/updates-5.4"/>
<description>Install Git support for interacting with the AF3 repositories.</description>
</setupTask>
<setupTask
......@@ -489,6 +481,7 @@
xsi:type="git:GitCloneTask"
id="targetdefinition.git.clone"
remoteURI="https://git.fortiss.org/af3/target-definition.git"
checkoutBranch="2019-06"
recursive="true">
<configSections
name="core">
......@@ -795,7 +788,7 @@
<setupTask
xsi:type="pde:TargetPlatformTask"
id="target.file"
name="Target-2019-03"/>
name="Target-2019-06"/>
<stream name="master"
label="Development">
<description>Configure the stream / branch of source code.</description>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment