diff options
| author | Quentin Le Menez | 2019-11-06 09:10:12 +0000 |
|---|---|---|
| committer | Quentin Le Menez | 2019-11-06 12:27:04 +0000 |
| commit | 33a580cdbc76d9072de8c9570e1ca9472f257f19 (patch) | |
| tree | 594b9ae507bfb7bb0eb9c97ac9fce816020ab1ad | |
| parent | e6fc91b261a298add9a5a2bef7577a14f8189920 (diff) | |
| download | org.eclipse.papyrus-33a580cdbc76d9072de8c9570e1ca9472f257f19.tar.gz org.eclipse.papyrus-33a580cdbc76d9072de8c9570e1ca9472f257f19.tar.xz org.eclipse.papyrus-33a580cdbc76d9072de8c9570e1ca9472f257f19.zip | |
Bug 550656 - [Releng] Update target platform
- Patch a test class to avoid compilation error Java JUnit: The method X is ambiguous for type Y
Change-Id: Iccbcd93c031b2167e797131e938b21c8581413ab
15 files changed, 213 insertions, 212 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 65c67538c04..4d72f053ec4 100755 --- 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/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Main" sequenceNumber="1571212568"> +<target name="Papyrus Main" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> 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 525f610428a..c98b3695259 100755 --- 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/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Main" sequenceNumber="1571212568"> +<target name="Papyrus Main" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> 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 769f6463ddf..65cdc07fb16 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 @@ -47,7 +47,7 @@ location xwt "https://download.eclipse.org/xwt/milestones-1.4.0/1.4.0-RC2/" { //updateFrom("QVT Operational for 2019-12",0) -location qvto "https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1" { +location qvto "https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442" { org.eclipse.m2m.qvt.oml.sdk.feature.group } @@ -66,20 +66,20 @@ location uml "https://download.eclipse.org/modeling/mdt/uml2/updates/5.5" { //updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/" { +location platform "https://download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/" { org.eclipse.sdk.feature.group } //updateFrom("OCL for 2019-12",0) -location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354" { +location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230" { org.eclipse.ocl.examples.classic.feature.group org.eclipse.ocl.examples.feature.group } //updateFrom("Xtext, Xtend",0) -location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836" { +location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013" { org.eclipse.xtext.sdk.feature.group org.eclipse.xtend.sdk.feature.group org.eclipse.xtext.redist.feature.group @@ -99,13 +99,13 @@ location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.15.0/ org.eclipse.wst.xml_ui.feature.feature.group lazy } -//updateFrom("GMF Runtime 1.12.1RC1 for SimRel 2019-09",0) +//updateFrom("GMF Runtime for SimRel 2019-12",0) location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201905141505" { org.eclipse.gmf.runtime.sdk.feature.group } -//updateFrom("GMF Runtime 1.12.1RC1 for SimRel 2019-09",1) +//updateFrom("GMF Runtime for SimRel 2019-12",1) location gmfNotation "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301" { org.eclipse.gmf.runtime.notation.sdk.feature.group @@ -113,23 +113,23 @@ location gmfNotation "https://download.eclipse.org/modeling/gmp/gmf-notation/upd //updateFrom("EMF (Core)",0) -location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858" { +location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220" { org.eclipse.emf.sdk.feature.group } -//updateFrom("EMF Services for SimRel 2019-09",0) +//updateFrom("EMF Services for SimRel 2019-12",0) location emfQuery "https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653" { org.eclipse.emf.query.sdk.feature.group } -//updateFrom("EMF Services for SimRel 2019-09",1) +//updateFrom("EMF Services for SimRel 2019-12",1) location emfValidation "https://download.eclipse.org/modeling/emf/validation/updates/releases/R201812070911" { org.eclipse.emf.validation.sdk.feature.group } -//updateFrom("EMF Services for SimRel 2019-09",2) +//updateFrom("EMF Services for SimRel 2019-12",2) location emfTransaction "https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/" { org.eclipse.emf.transaction.sdk.feature.group 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 4920534751e..9cf7dd3dc4d 100755 --- 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,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus RCP" sequenceNumber="1571212568"> +<target name="Papyrus RCP" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,17 +46,17 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -95,11 +95,11 @@ <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.14.0.v20191001-0938"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.700.v20191009-1800"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20190924-0505"/> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.14.0.v20191030-1602"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.700.v20191101-0300"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20191014-2025"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.2.v20180905-0014"/> @@ -111,14 +111,14 @@ <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.2/v20180905-2014"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.8.201909101346"/> - <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.8.201909101346"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xsd.sdk.feature.group" version="2.19.0.v20190918-1629"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180530-1201"/> 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 e85d1756cfa..9b9388fa2e3 100755 --- 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,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus RCP" sequenceNumber="1571212568"> +<target name="Papyrus RCP" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,17 +46,17 @@ <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -95,11 +95,11 @@ <repository id="egit" location="https://download.eclipse.org/egit/updates-5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.14.0.v20191001-0938"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.700.v20191009-1800"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20190924-0505"/> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.14.0.v20191030-1602"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.700.v20191101-0300"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20191014-2025"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.2.v20180905-0014"/> @@ -111,14 +111,14 @@ <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.24.2/v20180905-2014"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.8.201909101346"/> - <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.8.201909101346"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xsd.sdk.feature.group" version="2.19.0.v20190918-1629"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180530-1201"/> diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd index 50cc9026691..286fc7329b1 100644 --- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd +++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd @@ -13,7 +13,7 @@ location egit "https://download.eclipse.org/egit/updates-5.5" { //updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/" { +location platform "https://download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/" { org.eclipse.e4.core.tools.feature.feature.group org.eclipse.rcp.configuration.feature.group org.eclipse.equinox.executable.feature.group @@ -32,14 +32,14 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.24.2/v20180905-2014" //updateFrom("EMF COMPARE",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515" { org.eclipse.emf.compare.source.feature.group org.eclipse.emf.compare.ide.ui.source.feature.group } //updateFrom("EMF (Core)",0) -location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858" { +location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220" { org.eclipse.xsd.sdk.feature.group } diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target index fefb89981fd..d32988f0ed6 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target +++ b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.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="Papyrus CDO Tests" sequenceNumber="1571212568"> +<target name="Papyrus CDO Tests" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -106,8 +106,8 @@ <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.eclipse.emf.compare.source.feature.group" version="3.3.8.201909101346"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/> diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target index e7129657ce8..24172c81325 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target +++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.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="Papyrus CDO Tests" sequenceNumber="1571212568"> +<target name="Papyrus CDO Tests" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -106,8 +106,8 @@ <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.eclipse.emf.compare.source.feature.group" version="3.3.8.201909101346"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/> diff --git a/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target index 4539977d30c..4bd708a2e0e 100755 --- a/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target +++ b/releng/tests/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/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Tests" sequenceNumber="1571212568"> +<target name="Papyrus Tests" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -106,8 +106,8 @@ <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.eclipse.emf.compare.source.feature.group" version="3.3.8.201909101346"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> </locations> </target> diff --git a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target index 2899bbfcabe..6b150e61f31 100755 --- a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target +++ b/releng/tests/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/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Tests" sequenceNumber="1571212568"> +<target name="Papyrus Tests" sequenceNumber="1573031271"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -106,8 +106,8 @@ <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.eclipse.emf.compare.source.feature.group" version="3.3.8.201909101346"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> </locations> </target> diff --git a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd index e3d971f41f9..b8f139dc946 100644 --- a/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd +++ b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd @@ -13,6 +13,6 @@ location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/update //updateFrom("EMF COMPARE",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515" { org.eclipse.emf.compare.source.feature.group }
\ No newline at end of file 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 1c407b2f401..ffef68c8aac 100755 --- 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/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Toolsmiths" sequenceNumber="1571212570"> +<target name="Papyrus Toolsmiths" sequenceNumber="1573031273"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -129,10 +129,10 @@ <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.12.0.v20190920-0437"/> <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.15.0.v20190920-0437"/> <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.13.0.v20190530-1228"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.14.0.v20191009-0937"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.15.0.v20191009-0937"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.14.0.v20191019-1424"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.15.0.v20191103-1337"/> <unit id="org.eclipse.oomph.preferences.feature.group" version="1.12.0.v20190929-1544"/> - <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20191011-134332-1.15.0-M1"/> + <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20191105-074631-1.15.0-M2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-5.5"/> @@ -145,8 +145,8 @@ </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.8.201909101346"/> - <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> </locations> </target> 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 c8589d089ec..4ca7ea36a63 100755 --- 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/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Toolsmiths" sequenceNumber="1571212570"> +<target name="Papyrus Toolsmiths" sequenceNumber="1573031273"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -34,7 +34,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191014-1442"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.1/S201910141442"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> @@ -46,21 +46,21 @@ <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191009-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14M1-201910091800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191101-0301"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.14-I-builds/I20191101-0300/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191014-1354"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191014-1354"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201910141354"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.10.1.v20191105-1230"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.10.0.v20191105-1230"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.10.0/S201911051230"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191014-0836"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191014-0836"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201910140836"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.20.0.v20191104-2013"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.20.0.v20191104-2013"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S201911042013"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.11.1.M1"/> @@ -79,8 +79,8 @@ <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191003-1113"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910040858"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201910290220"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -129,10 +129,10 @@ <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.12.0.v20190920-0437"/> <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.15.0.v20190920-0437"/> <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.13.0.v20190530-1228"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.14.0.v20191009-0937"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.15.0.v20191009-0937"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.14.0.v20191019-1424"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.15.0.v20191103-1337"/> <unit id="org.eclipse.oomph.preferences.feature.group" version="1.12.0.v20190929-1544"/> - <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20191011-134332-1.15.0-M1"/> + <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20191105-074631-1.15.0-M2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="egit" location="https://download.eclipse.org/egit/updates-5.5"/> @@ -145,8 +145,8 @@ </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.8.201909101346"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515"/> </location> </locations> </target> 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 312d52378b9..3c9a8e602b7 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 @@ -33,7 +33,7 @@ location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/update //updateFrom("oomph",0) -location oomph "https://download.eclipse.org/oomph/drops/milestone/S20191011-134332-1.15.0-M1" { +location oomph "https://download.eclipse.org/oomph/drops/milestone/S20191105-074631-1.15.0-M2" { org.eclipse.oomph.version.feature.group org.eclipse.oomph.setup.workingsets.feature.group org.eclipse.oomph.projectconfig.feature.group @@ -66,7 +66,7 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.24.2/v20180905-2014" //updateFrom("EMF COMPARE",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201909101346" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201911051515" { org.eclipse.emf.compare.ide.ui.feature.group lazy org.eclipse.emf.compare.source.feature.group }
\ No newline at end of file diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AdvancedModeTest.java b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AdvancedModeTest.java index b89917f7c0e..452d19a96f6 100644 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AdvancedModeTest.java +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/src/org/eclipse/papyrus/uml/modelexplorer/tests/AdvancedModeTest.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2014 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.modelexplorer.tests; @@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.transaction.util.TransactionUtil; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationCatalogManager; @@ -52,7 +53,7 @@ import org.junit.Test; @PluginResource("resources/adv_mode.di") public class AdvancedModeTest extends AbstractPapyrusTest { - private static final String SIMPLE_UML_CUSTOMIZATION = "SimpleUML"; //$NON-NLS-1$ + private static final String SIMPLE_UML_CUSTOMIZATION = "SimpleUML"; //$NON-NLS-1$ @Rule public final PapyrusEditorFixture editor = new PapyrusEditorFixture(); @@ -65,10 +66,10 @@ public class AdvancedModeTest extends AbstractPapyrusTest { @Test public void advancedModeDoesNotCollapseItself() { - ParameterableElement parameteredClass = ((TemplateableElement)editor.getModel().getOwnedType("Container")).getOwnedTemplateSignature().getOwnedParameters().get(0).getOwnedParameteredElement(); + ParameterableElement parameteredClass = ((TemplateableElement) editor.getModel().getOwnedType("Container")).getOwnedTemplateSignature().getOwnedParameters().get(0).getOwnedParameteredElement(); // "reveal" actually does a "select and reveal" - ModelExplorerView.reveal(new StructuredSelection(parameteredClass), editor.getModelExplorerView().getCommonViewer()); + ModelExplorerView.reveal((ISelection) new StructuredSelection(parameteredClass), editor.getModelExplorerView().getCommonViewer()); editor.flushDisplayEvents(); @@ -79,9 +80,9 @@ public class AdvancedModeTest extends AbstractPapyrusTest { editor.flushDisplayEvents(); // Verify that the class is still selected - IStructuredSelection selection = (IStructuredSelection)editor.getModelExplorerView().getSite().getSelectionProvider().getSelection(); + IStructuredSelection selection = (IStructuredSelection) editor.getModelExplorerView().getSite().getSelectionProvider().getSelection(); assertThat(selection.size(), is(1)); - assertThat(EMFHelper.getEObject(selection.getFirstElement()), is((EObject)parameteredClass)); + assertThat(EMFHelper.getEObject(selection.getFirstElement()), is((EObject) parameteredClass)); } // @@ -100,31 +101,31 @@ public class AdvancedModeTest extends AbstractPapyrusTest { private void setAdvancedMode(boolean advancedMode) { ICustomizationManager customizationManager = Activator.getDefault().getCustomizationManager(); - if(customizationManager != null) { + if (customizationManager != null) { ICustomizationCatalogManager customCatalog = ICustomizationCatalogManagerFactory.DEFAULT.getOrCreateCustomizationCatalogManager(customizationManager.getResourceSet()); Customization simpleUMLCustomization = null; - //look for SIMPLE UML Customization - for(Customization customization : customCatalog.getRegisteredCustomizations()) { - if(SIMPLE_UML_CUSTOMIZATION.equals(customization.getName())) { + // look for SIMPLE UML Customization + for (Customization customization : customCatalog.getRegisteredCustomizations()) { + if (SIMPLE_UML_CUSTOMIZATION.equals(customization.getName())) { simpleUMLCustomization = customization; break; } } - if(simpleUMLCustomization != null) { + if (simpleUMLCustomization != null) { List<Customization> registeredCustomizations = new ArrayList<Customization>(customizationManager.getManagedCustomizations()); wasAdvancedMode = !registeredCustomizations.contains(simpleUMLCustomization); - if(advancedMode) { - if(registeredCustomizations.remove(simpleUMLCustomization)) { + if (advancedMode) { + if (registeredCustomizations.remove(simpleUMLCustomization)) { customizationManager.getManagedCustomizations().clear(); - for(Customization customization : registeredCustomizations) { + for (Customization customization : registeredCustomizations) { customizationManager.getManagedCustomizations().add(customization); } } } else { - if(!customizationManager.getManagedCustomizations().contains(simpleUMLCustomization)) { + if (!customizationManager.getManagedCustomizations().contains(simpleUMLCustomization)) { customizationManager.getManagedCustomizations().add(0, simpleUMLCustomization); } } |