[Releng] - update target platform to use Sirius 7.0.6 and batik 1.16
Change-Id: I36583a61e3b4efd8c74b9085eafa03a093b454ad
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
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 1862785..3717c6b 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,21 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus-Sirius - 2022-06" sequenceNumber="1663590410">
+<target name="Papyrus-Sirius - 2022-06" sequenceNumber="1669122428">
<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"/>
- <unit id="org.apache.poi" version="4.1.1.v20200604-1524"/>
- <unit id="org.apache.poi.ooxml" version="4.1.1.v20200820-1148"/>
- <unit id="org.apache.poi.ooxml.schemas" version="4.1.1.v20200922-2105"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+ <unit id="org.apache.batik.anim" version="1.16.0.v20221027-0840"/>
+ <unit id="org.apache.batik.dom" version="1.16.0.v20221027-0840"/>
+ <unit id="org.apache.batik.dom.svg" version="1.16.0.v20221027-0840"/>
+ <unit id="org.apache.batik.xml" version="1.16.0.v20221027-0840"/>
+ <unit id="org.apache.poi" version="4.1.1.v20221112-0806"/>
+ <unit id="org.apache.poi.ooxml" version="4.1.1.v20221112-0806"/>
+ <unit id="org.apache.poi.ooxml.schemas" version="4.1.1.v20221112-0806"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/S20221115203712/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.2.202204130739"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
+ <unit id="org.easymock" version="0.0.0"/>
+ <repository id="orbit_202203" 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.15.3.202211041032"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
</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"/>
@@ -25,42 +29,42 @@
<repository id="Papyrus-nightly" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/"/>
</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.emf.workspace.feature.group" version="1.13.0.202208110935"/>
<unit id="org.eclipse.xwt.feature.feature.group" version="1.6.0.202105260718"/>
- <repository id="release-2022-06" location="https://download.eclipse.org/releases/2022-06"/>
+ <repository id="release-2022-12" location="https://download.eclipse.org/releases/2022-12"/>
</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"/>
- <unit id="org.eclipse.acceleo.runtime.feature.group" version="3.7.11.202102190929"/>
- <repository id="acceleo" location="https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929"/>
+ <unit id="org.eclipse.acceleo.feature.group" version="3.7.12.202211151354"/>
+ <unit id="org.eclipse.acceleo.runtime.feature.group" version="3.7.12.202211151354"/>
+ <repository id="acceleo" location="https://download.eclipse.org/acceleo/updates/milestones/3.7/S202211151354/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <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/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.26.0.v20221117-1330"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.26-I-builds/I20221117-1330"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <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/"/>
+ <unit id="org.eclipse.sirius.aql.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.doc.feature.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.properties.feature.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.specifier.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.tests.feature.group" version="7.0.6.202211211602"/>
+ <unit id="org.eclipse.sirius.tests.support.feature.group" version="7.0.6.202211211602"/>
+ <repository id="sirius" location="https://download.eclipse.org/sirius/updates/milestones/7.0.6rc2/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 4a03724..c5aad1f 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
@@ -2,22 +2,28 @@
// build with simrel commit e014ee7948cbdea3d3eea7591de339b4bc25d0ed
//manualUpdate
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/S20221115203712/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)
- org.apache.batik.dom.svg [1.14.0,1.15.0)
- org.apache.batik.xml [1.14.0,1.15.0)
+ org.apache.batik.anim [1.16.0,1.17.0)
+ org.apache.batik.dom [1.16.0,1.17.0)
+ org.apache.batik.dom.svg [1.16.0,1.17.0)
+ org.apache.batik.xml [1.16.0,1.17.0)
org.apache.poi [4.1.0,5.0.0)
org.apache.poi.ooxml [4.1.0,5.0.0)
org.apache.poi.ooxml.schemas [4.1.0,5.0.0)
}
-// updateFrom("GMF Runtime 1.14.2 for SimRel 2022-06",0)
-location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739" {
+//manualUpdate
+location orbit_202203 "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository" {
+ org.easymock lazy //required by the dependencies to org.eclipse.sirius.tests.junit.support
+}
+
+// updateFrom("GMF Runtime",0)
+location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/" {
org.eclipse.gmf.runtime.sdk.feature.group
}
+
//manualUpdate
location "https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" Papyrus-nightly {
org.eclipse.papyrus.junit.feature.feature.group lazy
@@ -28,7 +34,7 @@
// manualUpdate
-location release-2022-06 "https://download.eclipse.org/releases/2022-06" {
+location release-2022-12 "https://download.eclipse.org/releases/2022-12" {
org.eclipse.emf.workspace.feature.group
org.eclipse.xwt.feature.feature.group
}
@@ -39,18 +45,18 @@
}
// updateFrom("M2T ACCELEO",0)
-location acceleo "https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929" {
+location acceleo "https://download.eclipse.org/acceleo/updates/milestones/3.7/S202211151354/" {
org.eclipse.acceleo.feature.group
org.eclipse.acceleo.runtime.feature.group
}
// updateFrom("Eclipse",0)
-location platform "https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/" {
+location platform "https://download.eclipse.org/eclipse/updates/4.26-I-builds/I20221117-1330" {
org.eclipse.sdk.feature.group
}
// updateFrom("Sirius",0)
-location sirius "https://download.eclipse.org/sirius/updates/releases/7.0.2/2021-06/" {
+location sirius "https://download.eclipse.org/sirius/updates/milestones/7.0.6rc2/2021-06/" {
org.eclipse.sirius.aql.feature.group
org.eclipse.sirius.doc.feature.feature.group
org.eclipse.sirius.interpreter.feature.feature.group
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
index fbf7e98..34bedf4 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@
Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.papyrus.sirius.uml.diagram.statemachine.tests.Activator
Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.1.0,3.0.0)",
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.1.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.junit.framework;bundle-version="[2.2.0,3.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="[3.3.0,4.0.0)",
org.eclipse.papyrus.sirius.junit.utils;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.statemachine;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.diagram.ui;bundle-version="[7.0.2,8.0.0)",
- org.eclipse.sirius.tests.junit;bundle-version="[7.0.2,8.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
org.junit;bundle-version="[4.13.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
