[572899] Add additional Batik components in target platforms
Some tools built on top of Sirius includes Sirius .targetplatform
definitions without the use of "with requirements".
Adding org.apache.batik.bridge and org.apache.batik.script solves the
issue in the build of those components but this might impact other
products so a solution is to list them in the orbit location of Sirius
tps.
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=572899
Change-Id: If340504803c5b5acfd26197df333d9c8afcc37e5
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
diff --git a/releng/org.eclipse.sirius.targets/capella/sirius_2020-06.target b/releng/org.eclipse.sirius.targets/capella/sirius_2020-06.target
index 5db9f68..7eab9f8 100644
--- a/releng/org.eclipse.sirius.targets/capella/sirius_2020-06.target
+++ b/releng/org.eclipse.sirius.targets/capella/sirius_2020-06.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="sirius_capella_2020-06" sequenceNumber="1625816024">
+<target name="sirius_capella_2020-06" sequenceNumber="1626792071">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/capella/sirius_2021-06.target b/releng/org.eclipse.sirius.targets/capella/sirius_2021-06.target
index a3ebab9..f37b4f2 100644
--- a/releng/org.eclipse.sirius.targets/capella/sirius_2021-06.target
+++ b/releng/org.eclipse.sirius.targets/capella/sirius_2021-06.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="sirius_capella_2021-06" sequenceNumber="1625822405">
+<target name="sirius_capella_2021-06" sequenceNumber="1626792071">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/headless/sirius_2020-06.target b/releng/org.eclipse.sirius.targets/headless/sirius_2020-06.target
index 1d2292c..ad6e683 100644
--- a/releng/org.eclipse.sirius.targets/headless/sirius_2020-06.target
+++ b/releng/org.eclipse.sirius.targets/headless/sirius_2020-06.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="sirius_headless_photon" sequenceNumber="1625816024">
+<target name="sirius_headless_photon" sequenceNumber="1626792077">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/headless/sirius_photon.target b/releng/org.eclipse.sirius.targets/headless/sirius_photon.target
index 2106d89..c02ef17 100644
--- a/releng/org.eclipse.sirius.targets/headless/sirius_photon.target
+++ b/releng/org.eclipse.sirius.targets/headless/sirius_photon.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="sirius_headless_photon" sequenceNumber="1625816024">
+<target name="sirius_headless_photon" sequenceNumber="1626792080">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/modules/orbit.tpd b/releng/org.eclipse.sirius.targets/modules/orbit.tpd
index c52d1c4..47bca44 100644
--- a/releng/org.eclipse.sirius.targets/modules/orbit.tpd
+++ b/releng/org.eclipse.sirius.targets/modules/orbit.tpd
@@ -13,4 +13,6 @@
org.antlr.runtime [4.7.1,4.7.2)
org.apache.batik.ext [1.14.0,1.14.1)
org.apache.batik.codec [1.14.0,1.14.1)
+ org.apache.batik.bridge [1.14.0,1.14.1)
+ org.apache.batik.script [1.14.0,1.14.1)
}
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-06.target b/releng/org.eclipse.sirius.targets/sirius_2020-06.target
index 6a39fc8..e0c6158 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-06.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-06.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="sirius_2020-06" sequenceNumber="1625816028">
+<target name="sirius_2020-06" sequenceNumber="1626792064">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-09.target b/releng/org.eclipse.sirius.targets/sirius_2020-09.target
index 86d8e66..071ae8b 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-09.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-09.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="sirius_2020-09" sequenceNumber="1625816032">
+<target name="sirius_2020-09" sequenceNumber="1626792068">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/sirius_2020-12.target b/releng/org.eclipse.sirius.targets/sirius_2020-12.target
index be57545..ec5f0b8 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2020-12.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2020-12.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="sirius_2020-12" sequenceNumber="1625816033">
+<target name="sirius_2020-12" sequenceNumber="1626792070">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/sirius_2021-03.target b/releng/org.eclipse.sirius.targets/sirius_2021-03.target
index 1724ca6..180f42b 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2021-03.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2021-03.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="sirius_2021-03" sequenceNumber="1625816033">
+<target name="sirius_2021-03" sequenceNumber="1626792068">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/sirius_2021-06.target b/releng/org.eclipse.sirius.targets/sirius_2021-06.target
index e742aab..71e453f 100644
--- a/releng/org.eclipse.sirius.targets/sirius_2021-06.target
+++ b/releng/org.eclipse.sirius.targets/sirius_2021-06.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="sirius_2021-06" sequenceNumber="1625822401">
+<target name="sirius_2021-06" sequenceNumber="1626792064">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="0.0.0"/>
@@ -16,6 +16,8 @@
<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.bridge" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
