Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF13
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF5
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF4
-rw-r--r--releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target11
-rw-r--r--releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target15
-rw-r--r--releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target26
-rw-r--r--releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target26
-rw-r--r--releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target26
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target26
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd12
-rw-r--r--releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target11
-rw-r--r--releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target11
-rw-r--r--releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target11
-rw-r--r--releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target11
-rw-r--r--releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd10
-rw-r--r--releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target26
-rw-r--r--releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target26
-rw-r--r--tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java2
18 files changed, 106 insertions, 166 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 7272f47ceb8..069b76215a7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -51,12 +51,15 @@ Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)",
- org.apache.batik.util;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.svggen;bundle-version="[1.7.0,1.8.0)",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.apache.batik.dom.svg;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.dom;bundle-version="[1.7.1,1.8.0)",
- org.apache.batik.xml;bundle-version="[1.7.0,1.8.0)",
+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.6.1,1.7.0)",
+ org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.transcoder;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
com.ibm.icu,
org.eclipse.papyrus.infra.services.decoration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 41996319d8e..cca222a56f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -41,11 +41,6 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
- org.apache.batik.dom.svg;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.util;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.svggen;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.dom;bundle-version="[1.7.1,1.8.0)",
- org.apache.batik.css;bundle-version="[1.7.0,1.8.0)",
org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[2.0.0,3.0.0)"
Bundle-Vendor: %providerName
Eclipse-LazyStart: true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 7bb08f1ad23..545959910fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -69,10 +69,6 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.services.localizer;bundle-version="[1.2.0,2.0.0)",
- org.apache.batik.dom.svg;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.css;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.util;bundle-version="[1.7.0,1.8.0)",
- org.apache.batik.dom;bundle-version="[1.7.1,1.8.0)",
org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.uml.modelrepair;bundle-version="[1.2.0,2.0.0)",
diff --git a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
index 30ff4442c03..7a7c7f72c37 100644
--- a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
+++ b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
@@ -1,18 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Dev" sequenceNumber="1467383780">
+<target name="Papyrus Dev" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
<repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
index 61ff53f768b..1e364ea5c84 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
@@ -1,22 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<<<<<<< Upstream, based on origin/streams/2.0-maintenance
-<target name="Papyrus Dev" sequenceNumber="1467301594">
-=======
-<target name="Papyrus Dev" sequenceNumber="1467383780">
->>>>>>> cf7ea0f Bug 495191 - Move to Batik 1.7 instead of 1.6.
+<target name="Papyrus Dev" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
index e786d2612d7..010362efe0b 100644
--- a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
+++ b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.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 Extra Tests" sequenceNumber="1467383749">
+<target name="Papyrus Extra Tests" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
@@ -39,18 +39,6 @@
<repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/releases/1.7/1.7.0.20160603-1933"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
- <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/>
<repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.6.0"/>
</location>
@@ -143,6 +131,18 @@
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.20.0/v20160608-1917"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.batik.dom" version="0.0.0"/>
+ <unit id="org.apache.batik.dom.svg" version="0.0.0"/>
+ <unit id="org.apache.batik.extension" version="0.0.0"/>
+ <unit id="org.apache.batik.svggen" version="0.0.0"/>
+ <unit id="org.apache.batik.swing" version="0.0.0"/>
+ <unit id="org.apache.batik.transcoder" version="0.0.0"/>
+ <unit id="org.apache.batik.util" version="0.0.0"/>
+ <unit id="org.apache.batik.xml" version="0.0.0"/>
+ <unit id="org.w3c.dom.svg" version="0.0.0"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.2.v20160630-0955"/>
<repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
</location>
diff --git a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
index 066d3ded07a..c80fb6fa4f0 100644
--- a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
+++ b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.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 Extra Tests" sequenceNumber="1467383749">
+<target name="Papyrus Extra Tests" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.b3.aggregator.editor.source.feature.feature.group" version="0.3.0.v20140928-0617"/>
@@ -39,18 +39,6 @@
<repository id="m2e" location="http://download.eclipse.org/technology/m2e/releases/1.7/1.7.0.20160603-1933"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/>
<repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/releases/3.6.0"/>
</location>
@@ -143,6 +131,18 @@
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.20.0/v20160608-1917"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.batik.dom" version="0.0.0"/>
+ <unit id="org.apache.batik.dom.svg" version="0.0.0"/>
+ <unit id="org.apache.batik.extension" version="0.0.0"/>
+ <unit id="org.apache.batik.svggen" version="0.0.0"/>
+ <unit id="org.apache.batik.swing" version="0.0.0"/>
+ <unit id="org.apache.batik.transcoder" version="0.0.0"/>
+ <unit id="org.apache.batik.util" version="0.0.0"/>
+ <unit id="org.apache.batik.xml" version="0.0.0"/>
+ <unit id="org.w3c.dom.svg" version="0.0.0"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.2.v20160630-0955"/>
<repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
</location>
diff --git a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
index 18120116071..5add1a9989e 100644
--- a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
+++ b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
@@ -1,21 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra" sequenceNumber="1467383763">
+<target name="Papyrus Extra" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
- <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/>
<repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.6.0"/>
</location>
@@ -108,6 +96,18 @@
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.20.0/v20160608-1917"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.batik.dom" version="0.0.0"/>
+ <unit id="org.apache.batik.dom.svg" version="0.0.0"/>
+ <unit id="org.apache.batik.extension" version="0.0.0"/>
+ <unit id="org.apache.batik.svggen" version="0.0.0"/>
+ <unit id="org.apache.batik.swing" version="0.0.0"/>
+ <unit id="org.apache.batik.transcoder" version="0.0.0"/>
+ <unit id="org.apache.batik.util" version="0.0.0"/>
+ <unit id="org.apache.batik.xml" version="0.0.0"/>
+ <unit id="org.w3c.dom.svg" version="0.0.0"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.2.v20160630-0955"/>
<repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
</location>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
index 140367665d7..7ddab573567 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
@@ -1,21 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra" sequenceNumber="1467383763">
+<target name="Papyrus Extra" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/>
<repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/releases/3.6.0"/>
</location>
@@ -108,6 +96,18 @@
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.20.0/v20160608-1917"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.batik.dom" version="0.0.0"/>
+ <unit id="org.apache.batik.dom.svg" version="0.0.0"/>
+ <unit id="org.apache.batik.extension" version="0.0.0"/>
+ <unit id="org.apache.batik.svggen" version="0.0.0"/>
+ <unit id="org.apache.batik.swing" version="0.0.0"/>
+ <unit id="org.apache.batik.transcoder" version="0.0.0"/>
+ <unit id="org.apache.batik.util" version="0.0.0"/>
+ <unit id="org.apache.batik.xml" version="0.0.0"/>
+ <unit id="org.w3c.dom.svg" version="0.0.0"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.2.v20160630-0955"/>
<repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
</location>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
index afe17d3cbdb..1da3ed4d19e 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
@@ -2,6 +2,18 @@ target "Papyrus Extra" with requirements source
include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd"
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository" {
+ org.apache.batik.dom lazy
+ org.apache.batik.dom.svg lazy
+ org.apache.batik.extension lazy
+ org.apache.batik.svggen lazy
+ org.apache.batik.swing lazy
+ org.apache.batik.transcoder lazy
+ org.apache.batik.util lazy
+ org.apache.batik.xml lazy
+ org.w3c.dom.svg lazy
+}
+
//updateFrom("EPP Logging",0)
location aeri "http://download.eclipse.org/technology/epp/logging/milestones/" {
diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index 7274ee72bde..31dcd9744fd 100644
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -1,18 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1467383794">
+<target name="Papyrus Tests" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
<repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 9097a89e62b..baa237daa39 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -1,18 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1467383794">
+<target name="Papyrus Tests" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
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 a0d4bbacfe0..4bcb0d2e467 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,18 +1,9 @@
<?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="1467383703">
+<target name="Papyrus Main" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
<repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
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 36352ab3f9a..16f2009cdc8 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,18 +1,9 @@
<?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="1467383703">
+<target name="Papyrus Main" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
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 20a1a4e8b8b..723f1f08da7 100644
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -3,15 +3,7 @@ target "Papyrus Main" with requirements source
//manualUpdate
location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository" {
- org.apache.batik.dom
- org.apache.batik.dom.svg
- org.apache.batik.extension
- org.apache.batik.svggen
- org.apache.batik.swing
- org.apache.batik.transcoder
- org.apache.batik.util
- org.apache.batik.xml
- org.w3c.dom.svg
+
}
//updateFrom("QVT Operational",0)
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index 19fcbb221f8..b70005c21f6 100644
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -1,21 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1467383823">
+<target name="Papyrus RCP" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
- <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/>
<repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.6.0"/>
</location>
@@ -97,6 +85,18 @@
<repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.batik.dom" version="0.0.0"/>
+ <unit id="org.apache.batik.dom.svg" version="0.0.0"/>
+ <unit id="org.apache.batik.extension" version="0.0.0"/>
+ <unit id="org.apache.batik.svggen" version="0.0.0"/>
+ <unit id="org.apache.batik.swing" version="0.0.0"/>
+ <unit id="org.apache.batik.transcoder" version="0.0.0"/>
+ <unit id="org.apache.batik.util" version="0.0.0"/>
+ <unit id="org.apache.batik.xml" version="0.0.0"/>
+ <unit id="org.w3c.dom.svg" version="0.0.0"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.2.v20160630-0955"/>
<repository id="aeri" location="file:/home/data/httpd/download.eclipse.org/technology/epp/logging/milestones/"/>
</location>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index 3c1f136b91c..690799cb236 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -1,21 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1467383823">
+<target name="Papyrus RCP" sequenceNumber="1467712959">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
- <unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.extension" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.swing" version="1.7.0.v201302011158"/>
- <unit id="org.apache.batik.transcoder" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
- <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
- <unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/>
<repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/releases/3.6.0"/>
</location>
@@ -97,6 +85,18 @@
<repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.batik.dom" version="0.0.0"/>
+ <unit id="org.apache.batik.dom.svg" version="0.0.0"/>
+ <unit id="org.apache.batik.extension" version="0.0.0"/>
+ <unit id="org.apache.batik.svggen" version="0.0.0"/>
+ <unit id="org.apache.batik.swing" version="0.0.0"/>
+ <unit id="org.apache.batik.transcoder" version="0.0.0"/>
+ <unit id="org.apache.batik.util" version="0.0.0"/>
+ <unit id="org.apache.batik.xml" version="0.0.0"/>
+ <unit id="org.w3c.dom.svg" version="0.0.0"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.2.v20160630-0955"/>
<repository id="aeri" location="http://download.eclipse.org/technology/epp/logging/milestones/"/>
</location>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
index fdc5b242791..09731995157 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
@@ -49,7 +49,7 @@ public class BundlesTests extends AbstractPapyrusTest {
private static final String INCUBATION_KEYWORD = "(Incubation)"; //$NON-NLS-1$
- private static final String BATIK_VERSION = "[1.7.0,1.8.0)"; //$NON-NLS-1$
+ private static final String BATIK_VERSION = "[1.6.0,1.8.0)"; //$NON-NLS-1$
private static final String NATTABLE_VERSION = "1.4.0"; //$NON-NLS-1$

Back to the top