Skip to content

GitLab

Commit e129484b authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge branch '2019-12' into HEAD 


Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parents 79b83ccf 42bc7588
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 38 deletions
oomph/af3-releng.setup
View file @ e129484b
......@@ -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-releng"
label="AutoFOCUS 3 (Releng, 2019-06)">
label="AutoFOCUS 3 (Releng, 2019-12)">
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
......@@ -32,16 +32,16 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
value="2019-06"/>
value="2019-12"/>
<setupTask
xsi:type="setup.p2:P2Task"
label="Eclipse 2019-06 Update Site stuff">
label="Eclipse 2019-12 Features">
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.12.0,4.13.0)"/>
versionRange="[4.14.0,4.15.0)"/>
<requirement
name="org.eclipse.emf.sdk.feature.group"
versionRange="[2.18.0,2.19.0)"/>
versionRange="[2.20.0,2.21.0)"/>
<requirement
name="org.eclipse.emf.transaction.sdk.feature.group"
versionRange="[1.12.0,1.13.0)"/>
......@@ -56,17 +56,14 @@
versionRange="[1.12.0,1.13.0)"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="[2.18.0,2.19.0)"/>
versionRange="[2.20.0,2.21.0)"/>
<requirement
name="org.eclipse.epp.package.modeling.feature.feature.group"
versionRange="[4.12.0,4.13.0)"/>
<requirement
name="org.eclipse.m2e.feature.feature.group"
versionRange="[1.12.0,1.13.0)"/>
versionRange="[4.14.0,4.15.0)"/>
<repository
url="https://download.eclipse.org/releases/2019-06/"/>
url="https://download.eclipse.org/releases/${eclipse.target.platform}/"/>
<repository
url="https://download.eclipse.org/technology/epp/packages/2019-06/"/>
url="https://download.eclipse.org/technology/epp/packages/${eclipse.target.platform}/"/>
<description>Install the tools needed in the IDE to work with the source code of ${scope.project.label}.</description>
</setupTask>
<setupTask
......@@ -74,16 +71,16 @@
label="eGit jGit">
<requirement
name="org.eclipse.egit.feature.group"
versionRange="[5.4.2,5.5.0)"/>
versionRange="[5.6.0,5.7.0)"/>
<requirement
name="org.eclipse.jgit.feature.group"
versionRange="[5.4.3,5.5.0)"/>
versionRange="[5.6.0,5.7.0)"/>
<requirement
name="org.eclipse.egit.mylyn.feature.group"
versionRange="[5.4.2,5.5.0)"
versionRange="[5.6.0,5.7.0)"
filter=""/>
<repository
url="https://download.eclipse.org/egit/updates-5.4.2"/>
url="https://download.eclipse.org/egit/updates-5.6"/>
<repository
url="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/jgit/org.eclipse.jgit.repository/5.4.3.201909031940-r/org.eclipse.jgit.repository-5.4.3.201909031940-r.zip-unzip/"/>
<description>Install Git support for interacting with the AF3 repositories.</description>
......@@ -113,9 +110,9 @@
label="E(fx)clipse IDE - JavaFX support">
<requirement
name="org.eclipse.fx.ide.feature.feature.group"
versionRange="[3.5.0,3.6.0)"/>
versionRange="[3.5.0,3.7.0)"/>
<repository
url="https://download.eclipse.org/efxclipse/updates-released/3.5.0/site"/>
url="https://download.eclipse.org/efxclipse/updates-released/3.6.0/site"/>
<description>Install JavaFX IDE support for Kepler.</description>
</setupTask>
<setupTask
......@@ -146,8 +143,8 @@
xsi:type="setup:VariableTask"
id="jfx.installation.version"
name="jfx.installation.version"
value="11.0.2"
label=""/>
value="13.0.2"
defaultValue="13.0.2"/>
<setupTask
xsi:type="setup:CompoundTask"
id="jfx.installation.win32"
......
oomph/af3.setup
View file @ e129484b
......@@ -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-06)">
label="AutoFOCUS 3 (Developer, 2019-12)">
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
......@@ -32,16 +32,16 @@
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.target.platform"
value="2019-06"/>
value="2019-12"/>
<setupTask
xsi:type="setup.p2:P2Task"
label="Eclipse 2019-06 Update Site stuff">
label="Eclipse 2019-12 Features">
<requirement
name="org.eclipse.platform.feature.group"
versionRange="[4.12.0,4.13.0)"/>
versionRange="[4.14.0,4.15.0)"/>
<requirement
name="org.eclipse.emf.sdk.feature.group"
versionRange="[2.18.0,2.19.0)"/>
versionRange="[2.20.0,2.21.0)"/>
<requirement
name="org.eclipse.emf.transaction.sdk.feature.group"
versionRange="[1.12.0,1.13.0)"/>
......@@ -56,14 +56,14 @@
versionRange="[1.12.0,1.13.0)"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="[2.18.0,2.19.0)"/>
versionRange="[2.20.0,2.21.0)"/>
<requirement
name="org.eclipse.epp.package.modeling.feature.feature.group"
versionRange="[4.12.0,4.13.0)"/>
versionRange="[4.14.0,4.15.0)"/>
<repository
url="https://download.eclipse.org/releases/2019-06/"/>
url="https://download.eclipse.org/releases/${eclipse.target.platform}/"/>
<repository
url="https://download.eclipse.org/technology/epp/packages/2019-06/"/>
url="https://download.eclipse.org/technology/epp/packages/${eclipse.target.platform}/"/>
<description>Install the tools needed in the IDE to work with the source code of ${scope.project.label}.</description>
</setupTask>
<setupTask
......@@ -71,16 +71,16 @@
label="eGit jGit">
<requirement
name="org.eclipse.egit.feature.group"
versionRange="[5.4.2,5.5.0)"/>
versionRange="[5.6.0,5.7.0)"/>
<requirement
name="org.eclipse.jgit.feature.group"
versionRange="[5.4.3,5.5.0)"/>
versionRange="[5.6.0,5.7.0)"/>
<requirement
name="org.eclipse.egit.mylyn.feature.group"
versionRange="[5.4.2,5.5.0)"
versionRange="[5.6.0,5.7.0)"
filter=""/>
<repository
url="https://download.eclipse.org/egit/updates-5.4.2"/>
url="https://download.eclipse.org/egit/updates-5.6"/>
<repository
url="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/jgit/org.eclipse.jgit.repository/5.4.3.201909031940-r/org.eclipse.jgit.repository-5.4.3.201909031940-r.zip-unzip/"/>
<description>Install Git support for interacting with the AF3 repositories.</description>
......@@ -110,9 +110,9 @@
label="E(fx)clipse IDE - JavaFX support">
<requirement
name="org.eclipse.fx.ide.feature.feature.group"
versionRange="[3.5.0,3.6.0)"/>
versionRange="[3.5.0,3.7.0)"/>
<repository
url="https://download.eclipse.org/efxclipse/updates-released/3.5.0/site"/>
url="https://download.eclipse.org/efxclipse/updates-released/3.6.0/site"/>
<description>Install JavaFX IDE support for Kepler.</description>
</setupTask>
<setupTask
......@@ -143,8 +143,8 @@
xsi:type="setup:VariableTask"
id="jfx.installation.version"
name="jfx.installation.version"
value="11.0.2"
label=""/>
value="13.0.2"
defaultValue="13.0.2"/>
<setupTask
xsi:type="setup:CompoundTask"
id="jfx.installation.win32"
......@@ -574,7 +574,7 @@
id="workingset.kernel">
<predicate
xsi:type="predicates:NamePredicate"
pattern="org.fortiss.tooling.*"/>
pattern="org.eclipse.systemfocus.tooling.*"/>
</workingSet>
<workingSet
name="AutoFOCUS 3 Core">
......
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