Upgrade Guava to 30.0-jre and appengine-plugins-core to 0.9.5 (#3650)

* Upgrade appengine-plugins-core * Upgrade Guava to 30.0-jre * Supporess DoNotMock errorprone warning
GoogleCloudPlatform · Aug 5, 2021 · 2dd2e7a · 2dd2e7a
1 parent fc42d1f
commit 2dd2e7a
Show file tree

Hide file tree

Showing 36 changed files with 87 additions and 87 deletions.
diff --git a/eclipse/ide-target-platform/category.xml b/eclipse/ide-target-platform/category.xml
@@ -30,7 +30,7 @@
    <bundle id="org.mortbay.jetty.server" version="6.1.26"/>
    <bundle id="org.mortbay.jetty.util" version="6.1.26"/>
    <bundle id="org.freemarker.freemarker" version="2.3.25.stable-incubating"/>
-   <bundle id="com.google.guava" version="28.1.0.jre"/>
+   <bundle id="com.google.guava" version="30.0.0.jre"/>
    <bundle id="com.google.gson" version="2.8.2"/>
    <bundle id="com.google.cloud.tools.appengine" version="0.0.0"/>
    <bundle id="org.apache.commons.commons-compress" version="0.0.0"/>

diff --git a/features/com.google.cloud.tools.eclipse.3rdparty.feature/feature.xml b/features/com.google.cloud.tools.eclipse.3rdparty.feature/feature.xml
@@ -50,7 +50,7 @@
          id="com.google.guava"
          download-size="0"
          install-size="0"
-         version="28.1.0.jre"
+         version="30.0.0.jre"
          unpack="false"/>
 
    <plugin

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.compat/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.compat/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@ Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0",

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/META-INF/MANIFEST.MF
@@ -35,12 +35,12 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.25.0,1.26.0)",
  com.google.cloud.tools.eclipse.util.service,
  com.google.cloud.tools.eclipse.util.status,
  com.google.cloud.tools.login;version="0.2.2",
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.escape;version="[28.1.0,29.0.0)",
- com.google.common.io;version="[28.1.0,29.0.0)",
- com.google.common.net;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.escape;version="[30.0.0,31.0.0)",
+ com.google.common.io;version="[30.0.0,31.0.0)",
+ com.google.common.net;version="[30.0.0,31.0.0)",
  javax.inject;version="1.0.0",
  org.eclipse.core.databinding,
  org.eclipse.core.databinding.beans,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.deploy/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.google.cloud.tools.appengine;bundle-version="0.8.1",
  com.google.gson;bundle-version="[2.8.2,3.0)",
- com.google.guava;bundle-version="[28.1.0,29.0.0)",
+ com.google.guava;bundle-version="[30.0.0,31.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.jobs,
  org.eclipse.core.resources,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.facets/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.facets/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Require-Bundle: com.google.cloud.tools.appengine;bundle-version="0.8.1",
- com.google.guava;bundle-version="[28.1.0,29.0.0)",
+ com.google.guava;bundle-version="[30.0.0,31.0.0)",
  org.eclipse.core.resources,
  org.eclipse.jdt.core,
  org.eclipse.jst.j2ee,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui/META-INF/MANIFEST.MF
@@ -19,9 +19,9 @@ Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.usagetracker,
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0",
  org.eclipse.jdt.core,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF
@@ -29,11 +29,11 @@ Import-Package: com.google.cloud.tools.appengine.operations;version="0.8.1",
  com.google.cloud.tools.eclipse.util.status,
  com.google.cloud.tools.libraries;version="0.8.1",
  com.google.cloud.tools.libraries.json;version="0.8.1",
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.cache;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.util.concurrent;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.cache;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.util.concurrent;version="[30.0.0,31.0.0)",
  com.google.gson;version="[2.8.2,3.0)",
  javax.json;version="[1.0,1.1)",
  org.eclipse.core.resources,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Require-Bundle: com.google.cloud.tools.appengine;bundle-version="0.8.1",
  com.google.cloud.tools.eclipse.appengine.ui;bundle-version="0.1.0",
- com.google.guava;bundle-version="[28.1.0,29.0.0)",
+ com.google.guava;bundle-version="[30.0.0,31.0.0)",
  javax.annotation,
  javax.servlet;bundle-version="2.5.0",
  javax.servlet.jsp;bundle-version="2.1.0",

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.newproject.test/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.newproject.test/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: com.google.cloud.tools.eclipse.test.dependencies
 Import-Package: com.google.cloud.tools.eclipse.test.util,
  com.google.cloud.tools.eclipse.test.util.project,
  com.google.cloud.tools.eclipse.test.util.ui,
- com.google.common.cache;version="[28.1.0,29.0.0)",
+ com.google.common.cache;version="[30.0.0,31.0.0)",
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0",
  org.eclipse.jdt.core,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.newproject/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.newproject/META-INF/MANIFEST.MF
@@ -32,9 +32,9 @@ Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.util.io,
  com.google.cloud.tools.eclipse.util.service,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
  javax.inject;version="1.0.0",
  org.eclipse.core.internal.jobs,
  org.eclipse.core.runtime;version="3.5.0",

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8/META-INF/MANIFEST.MF
@@ -17,9 +17,9 @@ Import-Package: com.google.cloud.tools.appengine;version="0.8.1",
  com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.io;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.io;version="[30.0.0,31.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.resources,
  org.eclipse.core.runtime.jobs,

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.validation/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.validation/META-INF/MANIFEST.MF
@@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.core.resources,
 Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.io;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.io;version="[30.0.0,31.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
  org.eclipse.jface.text,

diff --git a/plugins/com.google.cloud.tools.eclipse.bugreport/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.bugreport/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Import-Package: com.google.cloud.tools.appengine;version="0.8.1",
  com.google.cloud.tools.appengine.operations.cloudsdk.serialization;version="0.8.1",
  com.google.cloud.tools.eclipse.sdk.internal,
  com.google.cloud.tools.eclipse.util,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.escape;version="[28.1.0,29.0.0)",
- com.google.common.net;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.escape;version="[30.0.0,31.0.0)",
+ com.google.common.net;version="[30.0.0,31.0.0)",
  org.eclipse.core.commands,
  org.eclipse.swt.program
diff --git a/plugins/com.google.cloud.tools.eclipse.dataflow.core/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.dataflow.core/META-INF/MANIFEST.MF
@@ -31,11 +31,11 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.25.0,1.26.0)",
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.cache;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.util.concurrent;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.cache;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.util.concurrent;version="[30.0.0,31.0.0)",
  org.eclipse.core.expressions,
  org.eclipse.core.filesystem,
  org.eclipse.core.resources,

diff --git a/plugins/com.google.cloud.tools.eclipse.dataflow.ui/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.dataflow.ui/META-INF/MANIFEST.MF
@@ -32,10 +32,10 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.25.0,1.26.0)",
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.util.concurrent;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.util.concurrent;version="[30.0.0,31.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.commands.common,
  org.eclipse.core.resources,

diff --git a/...pis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryTest.java b/...pis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryTest.java
@@ -50,6 +50,7 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+@SuppressWarnings("DoNotMock")
 @RunWith(MockitoJUnitRunner.class)
 public class GoogleApiFactoryTest {
 

diff --git a/...m/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryWithProxyServerTest.java b/...m/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryWithProxyServerTest.java
@@ -43,6 +43,7 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+@SuppressWarnings("DoNotMock")
 @RunWith(MockitoJUnitRunner.class)
 public class GoogleApiFactoryWithProxyServerTest {
 

diff --git a/plugins/com.google.cloud.tools.eclipse.googleapis/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.googleapis/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Bundle-Classpath: .,
  lib/google-oauth-client-java6-1.25.0.jar,
  lib/google-oauth-client-jetty-1.25.0.jar,
  lib/plugins-login-common-0.2.2.jar
-Require-Bundle: com.google.guava;bundle-version="[28.1.0,29.0.0)"
+Require-Bundle: com.google.guava;bundle-version="[30.0.0,31.0.0)"
 Export-Package: com.google.api.client.auth.oauth2;version="1.25.0",
  com.google.api.client.extensions.jetty.auth.oauth2;version="1.25.0",
  com.google.api.client.googleapis;version="1.25.0",

diff --git a/plugins/com.google.cloud.tools.eclipse.integration.appengine/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.integration.appengine/META-INF/MANIFEST.MF
@@ -35,7 +35,7 @@ Import-Package: com.google.cloud.tools.appengine.operations;version="0.8.1",
  com.google.cloud.tools.eclipse.test.util.project,
  com.google.cloud.tools.eclipse.test.util.ui,
  com.google.cloud.tools.eclipse.util,
- com.google.common.base;version="[28.1.0,29.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
  org.eclipse.core.runtime.preferences,
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,

diff --git a/plugins/com.google.cloud.tools.eclipse.login/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.login/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Service-Component: OSGI-INF/login.xml
 Require-Bundle: com.google.gson;bundle-version="[2.8.2,3.0)",
- com.google.guava;bundle-version="[28.1.0,29.0.0)",
+ com.google.guava;bundle-version="[30.0.0,31.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.ui
 Bundle-Classpath: .

diff --git a/plugins/com.google.cloud.tools.eclipse.projectselector/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.projectselector/META-INF/MANIFEST.MF
@@ -30,10 +30,10 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.25.0,1.26.0)",
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.util.concurrent;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.util.concurrent;version="[30.0.0,31.0.0)",
  org.codehaus.jackson,
  org.eclipse.core.databinding.beans,
  org.eclipse.core.databinding.conversion,

diff --git a/plugins/com.google.cloud.tools.eclipse.sdk.ui/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.sdk.ui/META-INF/MANIFEST.MF
@@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
  com.google.cloud.tools.appengine;bundle-version="0.8.1"
 Import-Package: com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.ui.util.images,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
  org.eclipse.core.runtime.jobs,
  org.eclipse.mylyn.commons.ui.dialogs,
  org.eclipse.osgi.util;version="1.1.0",

diff --git a/plugins/com.google.cloud.tools.eclipse.sdk/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.sdk/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Import-Package: com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.usagetracker,
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
  org.eclipse.core.runtime;version="3.5.0",
  org.eclipse.core.runtime.jobs,
  org.eclipse.core.runtime.preferences,

diff --git a/plugins/com.google.cloud.tools.eclipse.swtbot/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.swtbot/META-INF/MANIFEST.MF
@@ -20,6 +20,6 @@ Export-Package: com.google.cloud.tools.eclipse.swtbot;
    org.eclipse.swtbot.eclipse.finder,
    org.eclipse.swtbot.eclipse.finder.widgets,
    org.eclipse.swtbot.swt.finder"
-Import-Package: com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
+Import-Package: com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
  org.eclipse.wst.validation
diff --git a/...endencies/src/com/google/cloud/tools/eclipse/test/dependencies/EclipseLoggingAdapter.java b/...endencies/src/com/google/cloud/tools/eclipse/test/dependencies/EclipseLoggingAdapter.java
@@ -25,8 +25,7 @@
  * An SLF4j facade for OSGi {@link LoggerFactory} and Eclipse {@link ExtendedLogService}. This class
  * is intended to be a replacement for other ExtendedLogService implementations.
  */
-public class EclipseLoggingAdapter extends LoggerDelegate
-    implements LoggerFactory, ExtendedLogService {
+public class EclipseLoggingAdapter extends LoggerDelegate implements ExtendedLogService {
 
   public EclipseLoggingAdapter() {
     super(org.slf4j.LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME));

diff --git a/plugins/com.google.cloud.tools.eclipse.test.util/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.test.util/META-INF/MANIFEST.MF
@@ -17,9 +17,9 @@ Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.io,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.io;version="[28.1.0,29.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.io;version="[30.0.0,31.0.0)",
  javax.servlet,
  javax.servlet.http,
  org.eclipse.core.commands,

diff --git a/...ols.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/BasePluginXmlTest.java b/...ols.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/BasePluginXmlTest.java
@@ -277,9 +277,9 @@ public final void testBundleExecutionEnvironment() throws IOException {
   @Test
   public final void testGuavaImportVersions() throws IOException {
     checkDependencyDirectives(
-        "Import-Package", "com.google.common.", "version=\"[28.1.0,29.0.0)\"");
+        "Import-Package", "com.google.common.", "version=\"[30.0.0,31.0.0)\"");
     checkDependencyDirectives(
-        "Require-Bundle", "com.google.guava", "bundle-version=\"[28.1.0,29.0.0)\"");
+        "Require-Bundle", "com.google.guava", "bundle-version=\"[30.0.0,31.0.0)\"");
   }
 
   @Test

diff --git a/plugins/com.google.cloud.tools.eclipse.ui.status/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.ui.status/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.ui
 Import-Package: com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
  com.google.gson;version="[2.8.2,3.0.0)",
  com.google.gson.annotations;version="[2.8.2,3.0.0)",
  com.google.gson.stream;version="[2.8.2,3.0.0)",

diff --git a/plugins/com.google.cloud.tools.eclipse.ui/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.ui/META-INF/MANIFEST.MF
@@ -14,10 +14,10 @@ Require-Bundle: org.eclipse.ui.workbench,
 Import-Package: com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.status,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.net;version="[28.1.0,29.0.0)",
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.net;version="[30.0.0,31.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.databinding.conversion,
  org.eclipse.core.databinding.validation,

diff --git a/plugins/com.google.cloud.tools.eclipse.usagetracker.test/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.usagetracker.test/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: com.google.cloud.tools.eclipse.test.dependencies
 Import-Package: com.google.cloud.tools.eclipse.test.util,
  com.google.cloud.tools.eclipse.test.util.http,
  com.google.cloud.tools.eclipse.test.util.ui,
- com.google.common.collect;version="[28.1.0,29.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
  org.eclipse.core.runtime.preferences;version="3.3.0",
  org.eclipse.swt.widgets,
  org.eclipse.swtbot.swt.finder.widgets
diff --git a/plugins/com.google.cloud.tools.eclipse.usagetracker/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.usagetracker/META-INF/MANIFEST.MF
@@ -17,8 +17,8 @@ Import-Package: com.google.cloud.tools.eclipse.preferences,
  com.google.cloud.tools.eclipse.preferences.areas,
  com.google.cloud.tools.eclipse.ui.util.event,
  com.google.cloud.tools.eclipse.util,
- com.google.common.annotations;version="[28.1.0,29.0.0)",
- com.google.common.base;version="[28.1.0,29.0.0)",
- com.google.common.collect;version="[28.1.0,29.0.0)",
- com.google.common.escape;version="[28.1.0,29.0.0)",
- com.google.common.net;version="[28.1.0,29.0.0)"
+ com.google.common.annotations;version="[30.0.0,31.0.0)",
+ com.google.common.base;version="[30.0.0,31.0.0)",
+ com.google.common.collect;version="[30.0.0,31.0.0)",
+ com.google.common.escape;version="[30.0.0,31.0.0)",
+ com.google.common.net;version="[30.0.0,31.0.0)"
diff --git a/...ipse.util.test/src/com/google/cloud/tools/eclipse/util/FacetExistsPropertyTesterTest.java b/...ipse.util.test/src/com/google/cloud/tools/eclipse/util/FacetExistsPropertyTesterTest.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.tools.eclipse.util;
 
-import com.google.cloud.tools.eclipse.util.FacetExistsPropertyTester;
 import org.junit.Assert;
 import org.junit.Test;