[Releng] Update target platform to build against Eclipse 2022-06, papyrus 6.2 and Sirius 7.0.2
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Change-Id: I35478393e2d63efadb3029b5a810d1389d31e2c9
diff --git a/features/org.eclipse.papyrus.sirius.editor.feature/feature.xml b/features/org.eclipse.papyrus.sirius.editor.feature/feature.xml
index 4a0a4c3..0270163 100755
--- a/features/org.eclipse.papyrus.sirius.editor.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sirius.editor.feature/feature.xml
@@ -27,7 +27,7 @@
<import feature="org.eclipse.sirius.aql" version="7.0.0" match="compatible"/>
<import feature="org.eclipse.sirius.interpreter.feature" version="7.0.0" match="compatible"/>
<import feature="org.eclipse.sirius.runtime.ocl" version="7.0.0" match="compatible"/>
- <import feature="org.eclipse.papyrus.sdk.feature" version="6.1.0" match="compatible"/>
+ <import feature="org.eclipse.papyrus.sdk.feature" version="6.2.0" match="compatible"/>
</requires>
<plugin
diff --git a/features/org.eclipse.papyrus.sirius.toolsmiths.feature/feature.xml b/features/org.eclipse.papyrus.sirius.toolsmiths.feature/feature.xml
index 339abdb..0ad445a 100755
--- a/features/org.eclipse.papyrus.sirius.toolsmiths.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sirius.toolsmiths.feature/feature.xml
@@ -28,15 +28,15 @@
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.sirius.specifier" version="6.4.2"/>
- <import feature="org.eclipse.sirius.specifier.properties.feature" version="6.4.2"/>
- <import feature="org.eclipse.sirius.doc.feature" version="6.4.2"/>
- <import feature="org.eclipse.sirius.runtime.acceleo" version="6.4.2"/>
- <import feature="org.eclipse.sirius.runtime.ide.ui.acceleo" version="6.4.2"/>
- <import feature="org.eclipse.sirius.specifier.ide.ui.acceleo" version="6.4.2"/>
- <import feature="org.eclipse.sirius.specifier.ide.ui.aql" version="6.4.2"/>
- <import feature="org.eclipse.sirius.specifier.ide.ui" version="6.4.2"/>
- <import feature="org.eclipse.acceleo" version="3.7.0"/>
+ <import feature="org.eclipse.acceleo" version="3.7.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.doc.feature" version="7.0.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.runtime.acceleo" version="7.0.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.runtime.ide.ui.acceleo" version="7.0.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.specifier.ide.ui" version="7.0.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.specifier.ide.ui.acceleo" version="7.0.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.specifier.ide.ui.aql" version="7.0.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.specifier" version="7.0.0" match="compatible"/>
+ <import feature="org.eclipse.sirius.specifier.properties.feature" version="7.0.0" match="compatible"/>
</requires>
</feature>
diff --git a/features/org.eclipse.papyrus.sirius.uml.feature/feature.xml b/features/org.eclipse.papyrus.sirius.uml.feature/feature.xml
index 37e21b4..580630a 100755
--- a/features/org.eclipse.papyrus.sirius.uml.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sirius.uml.feature/feature.xml
@@ -76,6 +76,7 @@
id="org.eclipse.papyrus.sirius.doc"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.target b/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.target
index 96c6942..69b70f6 100755
--- a/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.target
+++ b/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.target
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus-Sirius - 2021-12" sequenceNumber="1652885317">
+<target name="Papyrus-Sirius - 2022-06" sequenceNumber="1659690089">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.1.202202190902"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202202190902"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
@@ -23,9 +23,12 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.workspace.feature.group" version="1.12.0.201805140824"/>
- <unit id="org.eclipse.swtbot.feature.group" version="3.1.0.202106041005"/>
<unit id="org.eclipse.xwt.feature.feature.group" version="1.6.0.202105260718"/>
- <repository id="release-2021-12" location="https://download.eclipse.org/releases/2021-12"/>
+ <repository id="release-2022-06" location="https://download.eclipse.org/releases/2022-06"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.swtbot.feature.group" version="3.1.0.202106041005"/>
+ <repository id="swtbot-3.1" location="https://download.eclipse.org/technology/swtbot/releases/3.1.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.feature.group" version="3.7.11.202102190929"/>
@@ -33,28 +36,28 @@
<repository id="acceleo" location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.22.0.v20211124-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.22/R-4.22-202111241800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220607-0700"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sirius.aql.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.doc.feature.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.properties.feature.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.runtime.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.specifier.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.tests.feature.group" version="7.0.0.202202231547"/>
- <unit id="org.eclipse.sirius.tests.support.feature.group" version="7.0.0.202202231547"/>
- <repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/7.0.0/2021-06/"/>
+ <unit id="org.eclipse.sirius.aql.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.doc.feature.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.properties.feature.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.specifier.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.tests.feature.group" version="7.0.2.202207211636"/>
+ <unit id="org.eclipse.sirius.tests.support.feature.group" version="7.0.2.202207211636"/>
+ <repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/7.0.2/2021-06/"/>
</location>
</locations>
</target>
diff --git a/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.tpd b/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.tpd
index 4fee495..8a1226c 100755
--- a/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.tpd
+++ b/releng-sirius/targetplatform/org.eclipse.papyrus.sirius.releng.main.targetplatform.tpd
@@ -1,8 +1,8 @@
-target "Papyrus-Sirius - 2021-12" with source requirements
+target "Papyrus-Sirius - 2022-06" with source requirements
// build with simrel commit e014ee7948cbdea3d3eea7591de339b4bc25d0ed
//manualUpdate
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" {
// update batik to be in adequation with latest gmf runtime https://www.eclipse.org/lists/mdt-papyrus.dev/msg04486.html
org.apache.batik.anim [1.14.0,1.15.0)
org.apache.batik.dom [1.14.0,1.15.0)
@@ -10,8 +10,8 @@
org.apache.batik.xml [1.14.0,1.15.0)
}
-//updateFrom("GMF Runtime 1.14.1 for SimRel 2022-03",0)
-location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202202190902" {
+// updateFrom("GMF Runtime 1.14.2 for SimRel 2022-06",0)
+location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739" {
org.eclipse.gmf.runtime.sdk.feature.group
}
@@ -25,12 +25,16 @@
// manualUpdate
-location release-2021-12 "https://download.eclipse.org/releases/2021-12" {
+location release-2022-06 "https://download.eclipse.org/releases/2022-06" {
org.eclipse.emf.workspace.feature.group
- org.eclipse.swtbot.feature.group
org.eclipse.xwt.feature.feature.group
}
+// manualUpdate Sirius uses this version
+location swtbot-3.1 "https://download.eclipse.org/technology/swtbot/releases/3.1.0/"{
+ org.eclipse.swtbot.feature.group
+}
+
// updateFrom("M2T ACCELEO",0)
location acceleo "https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929" {
org.eclipse.acceleo.feature.group
@@ -38,12 +42,12 @@
}
// updateFrom("Eclipse",0)
-location platform "https://download.eclipse.org/eclipse/updates/4.22/R-4.22-202111241800/" {
+location platform "https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/" {
org.eclipse.sdk.feature.group
}
// updateFrom("Sirius",0)
-location sirius "https://download.eclipse.org/sirius/updates/releases/7.0.0/2021-06/" {
+location sirius "https://download.eclipse.org/sirius/updates/releases/7.0.2/2021-06/" {
org.eclipse.sirius.aql.feature.group
org.eclipse.sirius.doc.feature.feature.group
org.eclipse.sirius.interpreter.feature.feature.group
