aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-05-17 11:45:47 -0400
committerQuentin Le Menez2018-05-18 09:17:59 -0400
commit189141fe5d923f3f83e263207a9d8ccfe32281ed (patch)
tree821a5f8e1c5bd58b485e9cb6b2b8d41da395c6b4
parent8bdf44351e3864d6a9a1d829b6e75dcebee317fa (diff)
downloadorg.eclipse.papyrus-189141fe5d923f3f83e263207a9d8ccfe32281ed.zip
org.eclipse.papyrus-189141fe5d923f3f83e263207a9d8ccfe32281ed.tar.gz
org.eclipse.papyrus-189141fe5d923f3f83e263207a9d8ccfe32281ed.tar.xz
Bug 518452 - [releng] [photon] Update target for the next RC
- Update tooling dependencies to avoid 1.6.1 batik conflict Change-Id: I4c3d5f4c3e6a430a0316652248d5e5b6147aa286 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rwxr-xr-xfeatures/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml5
-rw-r--r--releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target9
-rw-r--r--releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target9
-rw-r--r--releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd7
-rw-r--r--releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target2
-rw-r--r--releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target2
-rwxr-xr-xreleng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd3
-rw-r--r--releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target13
-rw-r--r--releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target13
-rw-r--r--releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd13
10 files changed, 36 insertions, 40 deletions
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml
index 501aac3..4546259 100755
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml
@@ -26,9 +26,8 @@ http://www.eclipse.org/legal/epl-v10.html
</url>
<requires>
- <import feature="org.eclipse.gmf.tooling" version="0.0.0"/>
- <import feature="org.eclipse.gmf.tooling.runtime" version="0.0.0"/>
- <import feature="org.eclipse.gmf.tooling.codegen.xtend2" version="0.0.0"/>
+ <import plugin="org.eclipse.gmf.codegen.xtend" version="1.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0" match="compatible"/>
</requires>
<plugin
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 619cad9..1056e48 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,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 Tests" sequenceNumber="1526389859">
+<target name="Papyrus Tests" sequenceNumber="1526574843">
<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"/>
@@ -113,11 +113,12 @@
<repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805031224"/>
- <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805031224"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
+ <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.1.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
<repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
</locations>
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 d13ea22..d12da6c 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,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 Tests" sequenceNumber="1526389859">
+<target name="Papyrus Tests" sequenceNumber="1526574843">
<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"/>
@@ -113,11 +113,12 @@
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805031224"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805031224"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.1.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
<repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
</locations>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
index c79296c..489edbd 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
@@ -4,12 +4,13 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable
//updateFrom("EMF COMPARE",0)
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805031224" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/" {
org.eclipse.emf.compare.source.feature.group
}
-//manualUpdate ("GMF Tooling",0)
+//manualUpdate
location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" {
- org.eclipse.gmf.tooling.codegen.xtend2.feature.group
+ org.eclipse.gmf.codegen.xtend
+ org.eclipse.gmf.codegen.xtend.ui
} \ No newline at end of file
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 6faaf21..d742085 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="1526389859">
+<target name="Papyrus Main" sequenceNumber="1526574834">
<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"/>
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 4ebf61b..debae26 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="1526389859">
+<target name="Papyrus Main" sequenceNumber="1526574834">
<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"/>
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 4edd990..d6cd8c2 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
@@ -62,13 +62,11 @@ location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.10.0/
org.eclipse.wst.xml_ui.feature.feature.group lazy
}
-//updateFrom("GMF Runtime",0)
location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201801291558/" {
org.eclipse.gmf.runtime.sdk.feature.group
}
-//updateFrom("GMF Runtime",1)
location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201801291538" {
org.eclipse.gmf.runtime.notation.sdk.feature.group
@@ -146,7 +144,6 @@ location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/S2018050
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)
- // may not be necessary
org.apache.batik.ext [1.9.1,2.0.0)
org.apache.batik.ext.source [1.9.1,2.0.0)
org.objectweb.asm [5.0.1, 6.0.0)
diff --git a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
index 867715e..55cb077 100644
--- a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.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 Toolsmiths" sequenceNumber="1526389867">
+<target name="Papyrus Toolsmiths" sequenceNumber="1526574850">
<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"/>
@@ -135,15 +135,15 @@
<repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.10"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180313-2237"/>
+ <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180515-2017"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805031224"/>
- <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805031224"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
+ <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
@@ -156,9 +156,8 @@
<repository id="cbiAggregator" location="file:/home/data/httpd/download.eclipse.org/cbi/updates/aggregator/ide/4.8/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
- <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.1.201509291144"/>
- <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.1.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
<repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
</locations>
diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
index 1763633..cf7921d 100644
--- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.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 Toolsmiths" sequenceNumber="1526389867">
+<target name="Papyrus Toolsmiths" sequenceNumber="1526574850">
<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"/>
@@ -135,15 +135,15 @@
<repository id="egit" location="http://download.eclipse.org/egit/updates-4.10"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180313-2237"/>
+ <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180515-2017"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805031224"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805031224"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
@@ -156,9 +156,8 @@
<repository id="cbiAggregator" location="http://download.eclipse.org/cbi/updates/aggregator/ide/4.8/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
- <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.3.1.201509291144"/>
- <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.3.1.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend" version="1.0.0.201509291144"/>
+ <unit id="org.eclipse.gmf.codegen.xtend.ui" version="1.0.0.201509291144"/>
<repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
</location>
</locations>
diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
index b40e68e..b7cf32a 100644
--- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
+++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd
@@ -32,7 +32,7 @@ location egit "http://download.eclipse.org/egit/updates-4.10" // oomph
//updateFrom("m2e",0)
-location m2e "http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180313-2237" // oomph
+location m2e "http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180515-2017" // oomph
//updateFrom("Mylyn",0)
@@ -40,7 +40,7 @@ location mylyn "http://download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301" /
//updateFrom("EMF COMPARE",0)
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805031224" {
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201805161152/" {
org.eclipse.emf.compare.ide.ui.feature.group lazy
org.eclipse.emf.compare.source.feature.group
}
@@ -61,10 +61,9 @@ location cbiAggregator "http://download.eclipse.org/cbi/updates/aggregator/ide/4
org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group lazy
}
-//manualUpdate ("GMF Tooling",0)
+//manualUpdate
-location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" { // gen
- org.eclipse.gmf.tooling.feature.group
- org.eclipse.gmf.tooling.runtime.feature.group
- org.eclipse.gmf.tooling.codegen.xtend2.feature.group
+location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" {
+ org.eclipse.gmf.codegen.xtend
+ org.eclipse.gmf.codegen.xtend.ui
} \ No newline at end of file