Setup updates
* Supports Eclipse up to version 2022-06
* Fixes a bug for the tooling subproject
diff --git a/releng/org.eclipse.viatra.setup/VIATRAEMF.setup b/releng/org.eclipse.viatra.setup/VIATRAEMF.setup
index b98891f..9c18e10 100644
--- a/releng/org.eclipse.viatra.setup/VIATRAEMF.setup
+++ b/releng/org.eclipse.viatra.setup/VIATRAEMF.setup
@@ -173,8 +173,7 @@
<requirement
name="org.hamcrest"/>
<requirement
- name="com.google.guava"
- versionRange="[27.1.0,28.0.0)"/>
+ name="com.google.guava"/>
<requirement
name="org.eclipse.fx.runtime.min.feature.feature.group"/>
<requirement
@@ -262,6 +261,72 @@
<repository
url="http://download.eclipse.org/efxclipse/updates-released/3.6.0/site"/>
</repositoryList>
+ <repositoryList
+ name="2021-03">
+ <repository
+ url="http://download.eclipse.org/releases/2021-03"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+ <repository
+ url="http://download.eclipse.org/efxclipse/updates-released/3.7.0/site"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-06">
+ <repository
+ url="http://download.eclipse.org/releases/2021-06"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+ <repository
+ url="http://download.eclipse.org/efxclipse/updates-released/3.7.0/site"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-09">
+ <repository
+ url="http://download.eclipse.org/releases/2021-09"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+ <repository
+ url="http://download.eclipse.org/efxclipse/updates-released/3.7.0/site"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-12">
+ <repository
+ url="http://download.eclipse.org/releases/2021-12"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+ <repository
+ url="http://download.eclipse.org/efxclipse/updates-released/3.7.0/site"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-03">
+ <repository
+ url="http://download.eclipse.org/releases/2022-03"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+ <repository
+ url="http://download.eclipse.org/efxclipse/updates-released/3.7.0/site"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-06">
+ <repository
+ url="http://download.eclipse.org/releases/2022-06"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+ <repository
+ url="http://download.eclipse.org/efxclipse/updates-released/3.8.0/site"/>
+ </repositoryList>
</targlet>
<targlet
name="CPS metamodels"
@@ -424,7 +489,61 @@
<repositoryList
name="2020-12">
<repository
- url="http://download.eclipse.org/releases/2020-09"/>
+ url="http://download.eclipse.org/releases/2020-12"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-03">
+ <repository
+ url="http://download.eclipse.org/releases/2021-03"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-06">
+ <repository
+ url="http://download.eclipse.org/releases/2021-06"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-09">
+ <repository
+ url="http://download.eclipse.org/releases/2021-09"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-12">
+ <repository
+ url="http://download.eclipse.org/releases/2021-12"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-03">
+ <repository
+ url="http://download.eclipse.org/releases/2022-03"/>
+ <repository
+ url="http://download.eclipse.org/cbi/updates/license"/>
+ <repository
+ url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-06">
+ <repository
+ url="http://download.eclipse.org/releases/2022-06"/>
<repository
url="http://download.eclipse.org/cbi/updates/license"/>
<repository
@@ -501,6 +620,48 @@
<repository
url="http://download.eclipse.org/sirius/updates/releases/6.4.0/2020-09"/>
</repositoryList>
+ <repositoryList
+ name="2021-03">
+ <repository
+ url="http://download.eclipse.org/releases/2021-03"/>
+ <repository
+ url="http://download.eclipse.org/sirius/updates/releases/6.4.2/2020-09/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-06">
+ <repository
+ url="http://download.eclipse.org/releases/2021-06"/>
+ <repository
+ url="http://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-09">
+ <repository
+ url="http://download.eclipse.org/releases/2021-09"/>
+ <repository
+ url="http://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-12">
+ <repository
+ url="http://download.eclipse.org/releases/2021-12"/>
+ <repository
+ url="http://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09/"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-03">
+ <repository
+ url="http://download.eclipse.org/releases/2022-03"/>
+ <repository
+ url="https://download.eclipse.org/sirius/updates/releases/7.0.0/2021-06/"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-06">
+ <repository
+ url="http://download.eclipse.org/releases/2022-06"/>
+ <repository
+ url="https://download.eclipse.org/sirius/updates/releases/7.0.0/2021-06/"/>
+ </repositoryList>
</targlet>
</setupTask>
<setupTask
@@ -743,7 +904,7 @@
<requirement
name="org.eclipse.sirius.specifier.ide.ui.aql.feature.group"/>
<repository
- url="http://download.eclipse.org/sirius/updates/releases/6.3.1/2019-12"/>
+ url="http://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09/"/>
</setupTask>
<stream
name="master"/>
@@ -775,7 +936,7 @@
name="org.eclipse.viatra.query.sdk.feature.source.feature.group"/>
<repositoryList>
<repository
- url="https://hudson.eclipse.org/viatra/job/${viatra.hudson.ci.build.job.name}/lastSuccessfulBuild/artifact/releng/org.eclipse.viatra.update/target/repository"/>
+ url="${viatra.ci.build.job.name}/lastSuccessfulBuild/artifact/releng/org.eclipse.viatra.update/target/repository"/>
</repositoryList>
</targlet>
</setupTask>
@@ -852,9 +1013,9 @@
<setupTask
xsi:type="pde:APIBaselineTask"
name="viatraBaseline"
- version="2.5"
- location="${installation.location}/api/v2.5/"
- remoteURI="http://download.eclipse.org/viatra/updates/zipped/org.eclipse.viatra.update.2.5.0.zip"/>
+ version="2.7"
+ location="${installation.location}/api/v2.7/"
+ remoteURI="http://download.eclipse.org/viatra/updates/zipped/org.eclipse.viatra.update.2.7.0.zip"/>
<setupTask
xsi:type="setup.p2:P2Task">
<requirement
@@ -934,6 +1095,48 @@
<repository
url="http://download.itemis.com/updates/releases/2.1.1/"/>
</repositoryList>
+ <repositoryList
+ name="2021-03">
+ <repository
+ url="http://download.eclipse.org/releases/2021-03"/>
+ <repository
+ url="http://download.itemis.com/updates/releases/2.1.1/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-06">
+ <repository
+ url="http://download.eclipse.org/releases/2021-06"/>
+ <repository
+ url="http://download.itemis.com/updates/releases/2.1.1/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-09">
+ <repository
+ url="http://download.eclipse.org/releases/2021-09"/>
+ <repository
+ url="http://download.itemis.com/updates/releases/2.1.1/"/>
+ </repositoryList>
+ <repositoryList
+ name="2021-12">
+ <repository
+ url="http://download.eclipse.org/releases/2021-12"/>
+ <repository
+ url="http://download.itemis.com/updates/releases/2.1.1/"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-03">
+ <repository
+ url="http://download.eclipse.org/releases/2022-03"/>
+ <repository
+ url="http://download.itemis.com/updates/releases/2.1.1/"/>
+ </repositoryList>
+ <repositoryList
+ name="2022-06">
+ <repository
+ url="http://download.eclipse.org/releases/2022-06"/>
+ <repository
+ url="http://download.itemis.com/updates/releases/2.1.1/"/>
+ </repositoryList>
</targlet>
<targlet
name="Eclipse Collections"
