Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langer2019-08-11 04:58:46 -0400
committerRemi Schnekenburger2019-09-09 09:37:36 -0400
commite3ea4f1dac6020fe2d9c52ed54e1f9605fb165e0 (patch)
tree4b763717ee06adb9fb736c3992c6b220425b528f /compare/targetplatforms/compare-release.tpd
parent3c19bf0fa644e3d187e04cbe2d64e21bdd5da968 (diff)
downloadorg.eclipse.papyrus-collaborativemodeling-e3ea4f1dac6020fe2d9c52ed54e1f9605fb165e0.tar.gz
org.eclipse.papyrus-collaborativemodeling-e3ea4f1dac6020fe2d9c52ed54e1f9605fb165e0.tar.xz
org.eclipse.papyrus-collaborativemodeling-e3ea4f1dac6020fe2d9c52ed54e1f9605fb165e0.zip
Fix Build Errors Caused by Papyrus switching to Guava 27
This change also updates the previous release and latest release to avoid having to handle both Guava 21 and Guava 27. One ugly thing is that I needed to copy two methods to avoid having Guava's Predicate loaded in two versions, since EMF Compare still only supports Guava 21. Change-Id: I424b18f8195c5c5d2f14fef1cc6671c642c35cb1 Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'compare/targetplatforms/compare-release.tpd')
-rwxr-xr-xcompare/targetplatforms/compare-release.tpd14
1 files changed, 7 insertions, 7 deletions
diff --git a/compare/targetplatforms/compare-release.tpd b/compare/targetplatforms/compare-release.tpd
index 000a1c0..65138c3 100755
--- a/compare/targetplatforms/compare-release.tpd
+++ b/compare/targetplatforms/compare-release.tpd
@@ -1,6 +1,6 @@
target "Compare Target Platform - Release" with source requirements
-location "http://download.eclipse.org/releases/2018-12/" eclipse-2018-12 {
+location "http://download.eclipse.org/releases/2019-06/" eclipse-2019-06 {
org.eclipse.platform.feature.group
org.eclipse.sdk.feature.group
org.eclipse.rcp.feature.group
@@ -20,12 +20,12 @@ location "http://download.eclipse.org/releases/2018-12/" eclipse-2018-12 {
org.eclipse.uml2.sdk.feature.group
}
-location "http://download.eclipse.org/egit/updates-5.1" egit {
+location "http://download.eclipse.org/egit/updates-5.4" egit {
org.eclipse.egit.feature.group
org.eclipse.jgit.feature.group
}
-location "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201812111422/" emfCompare {
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201905300200/" {
org.eclipse.emf.compare.source.feature.group [3.3.5,4.0.0)
org.eclipse.emf.compare.diagram.gmf.source.feature.group [3.3.5,4.0.0)
org.eclipse.emf.compare.uml2.source.feature.group [3.3.5,4.0.0)
@@ -35,12 +35,12 @@ location "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3
}
//manualUpdate
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/I20190602181010/repository/" {
org.apache.commons.io
org.apache.commons.io.source
com.google.inject
- com.google.guava [21.0.0,22.0.0)
- com.google.guava.source [21.0.0,22.0.0)
+ com.google.guava [27.1.0,28.0.0)
+ com.google.guava.source [27.1.0,28.0.0)
/* Egit/Jgit */
javaewah
org.apache.commons.compress
@@ -54,7 +54,7 @@ location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R201811
org.objenesis [1.0.0,2.0.0)
}
-location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12" {
+location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06" {
org.eclipse.papyrus.sdk.feature.feature.group
org.eclipse.papyrus.infra.gmfdiag.feature.feature.group
org.eclipse.papyrus.infra.services.feature.feature.group

Back to the top