[Releng] Update target platform for batik and Papyrus Textedit
Change-Id: I729125bcb6e32006f2afae340a2ccfc3675a67e6
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.target b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.target
index 98623bc..95d2428 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.target
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1634807973">
+<target name="CollaborativeModeling CDO - Papyrus Nightly" sequenceNumber="1645527115">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
@@ -12,10 +12,17 @@
<repository id="papyrus" 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.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/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
- <repository id="eclipse" location="https://download.eclipse.org/releases/2021-09/"/>
+ <repository id="eclipse" location="https://download.eclipse.org/releases/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
@@ -23,7 +30,7 @@
<unit id="org.eclipse.emf.cdo.ecore" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.genmodel" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"/>
- <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/updates/integration/stable/latest/"/>
+ <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.tpd b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.tpd
index b8c5a7b..34ec0eb 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.tpd
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.nightly.targetplatform/org.eclipse.papyrus.cdo.nightly.targetplatform.tpd
@@ -10,15 +10,23 @@
org.eclipse.papyrus.infra.textedit.feature.feature.group lazy
}
-location "https://download.eclipse.org/releases/2021-09/" eclipse {
+//manualUpdate
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/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)
+}
+
+location "https://download.eclipse.org/releases/latest/" eclipse {
org.eclipse.sdk.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.uml2.sdk.feature.group lazy
}
// manual update
-//location cdo "https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/" {
-location cdo "https://download.eclipse.org/modeling/emf/cdo/updates/integration/stable/latest/"{
+location cdo "https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/"{
org.eclipse.emf.cdo.sdk.feature.group lazy
org.eclipse.emf.cdo.dawn.feature.group lazy
org.eclipse.emf.cdo.ecore lazy
@@ -28,7 +36,6 @@
//manualUpdate("XWT",0)
-
location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" {
org.eclipse.xwt.feature.feature.group lazy
}
\ No newline at end of file
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
index 20dfcff..cad2088 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="CollaborativeModeling CDO - Papyrus latest release" sequenceNumber="1637665700">
+<target name="CollaborativeModeling CDO - Papyrus latest release" sequenceNumber="1645527123">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
<unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/"/>
+ <unit id="org.eclipse.papyrus.infra.textedit.feature.feature.group" version="0.0.0"/>
+ <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/latest/"/>
+ </location>
+ <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/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
- <repository id="eclipse" location="https://download.eclipse.org/releases/2021-09/"/>
+ <repository id="eclipse" location="https://download.eclipse.org/releases/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
@@ -22,7 +30,7 @@
<unit id="org.eclipse.emf.cdo.ecore" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.genmodel" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"/>
- <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/"/>
+ <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/updates/releases/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
diff --git a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
index 0014d7c..bcb86b9 100755
--- a/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
+++ b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
@@ -1,23 +1,32 @@
target "CollaborativeModeling CDO - Papyrus latest release" with source requirements
/** Manual dependencies */
-/* Papyrus Nightly */
-location "https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" papyrus {
+/* Papyrus latest */
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/latest/" papyrus {
org.eclipse.papyrus.sdk.feature.feature.group lazy
org.eclipse.papyrus.junit.utils lazy
org.eclipse.papyrus.junit.framework lazy
org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
+ org.eclipse.papyrus.infra.textedit.feature.feature.group lazy
}
-location "https://download.eclipse.org/releases/2021-09/" eclipse {
+//manualUpdate
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/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)
+}
+
+location "https://download.eclipse.org/releases/latest/" eclipse {
org.eclipse.sdk.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.uml2.sdk.feature.group lazy
}
// manual update
-//location cdo "https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/" {
-location cdo "https://download.eclipse.org/modeling/emf/cdo/updates/integration/latest/"{
+location cdo "https://download.eclipse.org/modeling/emf/cdo/updates/releases/latest/"{
org.eclipse.emf.cdo.sdk.feature.group lazy
org.eclipse.emf.cdo.dawn.feature.group lazy
org.eclipse.emf.cdo.ecore lazy
@@ -27,7 +36,6 @@
//manualUpdate("XWT",0)
-
location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" {
org.eclipse.xwt.feature.feature.group lazy
}
\ No newline at end of file
