Bug 533804 - [Diagram] Update batik dependencies for 1.9.1

- Update tests and dependencies to the new architecture and version
- Update the targetplatforms to set the required dependency to 1.9.1 from the latest M6 Orbit repository

Change-Id: I07824370934a51062038d382597330833e5ee801
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

3 files changed, 46 insertions, 10 deletions

diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
index 4c1c0ea9695..60a99d2f594 100644
--- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
+++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1521016135">
+<target name="Papyrus Main" sequenceNumber="1524152643">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180130-0706"/>
@@ -42,8 +42,8 @@
       <repository id="mwe" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.2.v201802261859"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.M6-20180309052619/repository/"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.2.v201804101955"/>
+      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201801291558"/>
@@ -94,7 +94,19 @@
       <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
       <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
       <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/>
-      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/S-builds/S20180119201206/repository"/>
+      <unit id="org.apache.batik.anim" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.anim.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.svggen" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180227-1645"/>
+      <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository"/>
     </location>
   </locations>
 </target>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
index 528a2ff470c..ddfb9bb44e5 100644
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1521016135">
+<target name="Papyrus Main" sequenceNumber="1524152643">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180130-0706"/>
@@ -42,8 +42,8 @@
       <repository id="mwe" location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.2.v201802261859"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.M6-20180309052619/repository/"/>
+      <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.2.v201804101955"/>
+      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/I-latest/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201801291558"/>
@@ -94,7 +94,19 @@
       <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
       <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
       <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/>
-      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/S-builds/S20180119201206/repository"/>
+      <unit id="org.apache.batik.anim" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.anim.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.svggen" version="1.9.1.v20180227-1645"/>
+      <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180227-1645"/>
+      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository"/>
     </location>
   </locations>
 </target>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
index 15da36f014d..edb83ea6b40 100755
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -58,7 +58,7 @@ location mwe "http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9
 
 //updateFrom("WebTools",0) 
 
-location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.M6-20180309052619/repository/" {
+location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.10.0/I-latest/repository/" {
 	org.eclipse.wst.xml_ui.feature.feature.group
 }
 
@@ -127,11 +127,23 @@ location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repositor
 
 //manualUpdate (Needed by infra.tools, API Evolution Report generation and other plugins)
 
-location orbit "http://download.eclipse.org/tools/orbit/S-builds/S20180119201206/repository" {
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository" {
 	com.google.guava 21.0.0
 	com.google.guava.source 21.0.0
 	com.google.gson [2.7.0,2.8.0)
 	com.google.gson.source [2.7.0,2.8.0)
 	org.apache.commons.lang3 3.1.0
 	org.apache.commons.lang3.source 3.1.0
+	org.apache.batik.anim [1.9.1,2.0.0)
+	org.apache.batik.anim.source [1.9.1,2.0.0)
+	org.apache.batik.dom [1.9.1,2.0.0)
+	org.apache.batik.dom.source [1.9.1,2.0.0)
+	org.apache.batik.dom.svg [1.9.1,2.0.0)
+	org.apache.batik.dom.svg.source [1.9.1,2.0.0)
+	org.apache.batik.xml [1.9.1,2.0.0)
+	org.apache.batik.xml.source [1.9.1,2.0.0)
+	org.apache.batik.util [1.9.1,2.0.0)
+	org.apache.batik.util.source [1.9.1,2.0.0)
+	org.apache.batik.svggen [1.9.1,2.0.0)
+	org.apache.batik.svggen.source [1.9.1,2.0.0)
 }
\ No newline at end of file