diff options
author | Quentin Le Menez | 2017-03-22 14:13:48 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2017-03-24 10:55:32 +0000 |
commit | 172c9b0b63ba3be2c93ff710a8b7b4d288db633e (patch) | |
tree | 6eb2a5d47555479616ed503c322554f1ef9d6c6b /releng/main/targetPlatform | |
parent | 28f1f7a11c28f8e416afdc7bac212f2275d0c85f (diff) | |
download | org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.gz org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.xz org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.zip |
[releng] [oxygen] Update guava dependencies to 21.0.0
- Update target definitions to the latest orbit repository and set guava dependecy to 21.0.0
- Update MANIFEST.MF guava version references to 21.0.0 throughout the repository
- regenerate the target platforms
- update the sdk feature.xml to point on guava 21.0.0.v20170206-1425 from guava 15.0.0.v201403281430
- modified manifests and java classes to fit the new API
- ameneded the tests on guava version targets in the manifests
Change-Id: I7d15679cd28585f6ea517466e70bc0848dd3179d
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'releng/main/targetPlatform')
3 files changed, 19 insertions, 2 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 892780f2155..85fc55186ed 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="1490107457"> +<target name="Papyrus Main" sequenceNumber="1490192428"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/> @@ -91,6 +91,11 @@ <repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="com.google.guava" version="21.0.0.v20170206-1425"/> + <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/> + <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/> + </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.22.0/v20170124-1946"/> </location> </locations> 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 2b01fd4650b..75d445ad6ce 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="1490107457"> +<target name="Papyrus Main" sequenceNumber="1490192428"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/> @@ -91,6 +91,11 @@ <repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="com.google.guava" version="21.0.0.v20170206-1425"/> + <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/> + <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20170124-1946"/> </location> </locations> 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 3b896c3efaf..7cb1cb0d679 100644 --- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd +++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd @@ -126,6 +126,13 @@ location gef "http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0. org.eclipse.gef.feature.group } +//manualUpdate (Needed by infra.tools and other plugins) + +location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" { + com.google.guava 21.0.0 + com.google.guava.source 21.0.0 +} + //Transitive dependencies //updateFrom("Mylyn",0) |