510997: upgrade Guava dependency to version v21
Change-Id: Ia8effc5f58e0f5a1cf670c4b2a011ba76ed57d4c
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=510997
diff --git a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
index 291a7d0..a5deae7 100644
--- a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
+++ b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
@@ -5,7 +5,7 @@
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.2.4.v201311231704"/>
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
@@ -28,7 +28,7 @@
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.objenesis" version="1.0.0.v201105211943"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
diff --git a/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF
index 6f4d295..6cb8cd3 100644
--- a/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
org.eclipse.mylyn.commons.core,
org.eclipse.mylyn.commons.repositories.core,
org.eclipse.mylyn.commons.net,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="[21.0.0,22.0.0)",
com.google.gson;bundle-version="[2.1.0,3.0.0)",
org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
org.eclipse.equinox.event;bundle-version="1.3.100",
diff --git a/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
index 83679b8..e446fa6 100644
--- a/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
org.eclipse.mylyn.commons.core;bundle-version="3.8.0",
org.eclipse.mylyn.commons.screenshots;bundle-version="1.0.0",
org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
- com.google.guava;bundle-version="15.0.0"
+ com.google.guava;bundle-version="[21.0.0,22.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin
