From 08d7ad879372c3f0a9f9e0a8af648d5eae81d282 Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Thu, 5 Aug 2021 13:58:54 -0400
Subject: [PATCH 1/3] Upgrade appengine-plugins-core

---
 .../tools/eclipse/test/dependencies/EclipseLoggingAdapter.java | 3 +--
 .../tools/eclipse/util/FacetExistsPropertyTesterTest.java      | 1 -
 pom.xml                                                        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/com.google.cloud.tools.eclipse.test.dependencies/src/com/google/cloud/tools/eclipse/test/dependencies/EclipseLoggingAdapter.java b/plugins/com.google.cloud.tools.eclipse.test.dependencies/src/com/google/cloud/tools/eclipse/test/dependencies/EclipseLoggingAdapter.java
index b289a016aa..c34a77ca7b 100644
--- a/plugins/com.google.cloud.tools.eclipse.test.dependencies/src/com/google/cloud/tools/eclipse/test/dependencies/EclipseLoggingAdapter.java
+++ b/plugins/com.google.cloud.tools.eclipse.test.dependencies/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.util.test/src/com/google/cloud/tools/eclipse/util/FacetExistsPropertyTesterTest.java b/plugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/FacetExistsPropertyTesterTest.java
index 5bb8f6cc8d..be951a919d 100644
--- a/plugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/FacetExistsPropertyTesterTest.java
+++ b/plugins/com.google.cloud.tools.eclipse.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;
 
diff --git a/pom.xml b/pom.xml
index e25ca19ccf..66119b5af2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
       <!-- bundle: com.google.cloud.tools.appengine -->
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-plugins-core</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.5</version>
     </dependency>
     <dependency>
       <!--

From aba7ece5e606cb3d32ed976beffa3b707ba01bcd Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Thu, 5 Aug 2021 14:49:41 -0400
Subject: [PATCH 2/3] Upgrade Guava to 30.0-jre

---
 eclipse/ide-target-platform/category.xml             |  2 +-
 .../feature.xml                                      |  2 +-
 .../META-INF/MANIFEST.MF                             |  6 +++---
 .../META-INF/MANIFEST.MF                             | 12 ++++++------
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             |  6 +++---
 .../META-INF/MANIFEST.MF                             | 10 +++++-----
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             |  6 +++---
 .../META-INF/MANIFEST.MF                             |  6 +++---
 .../META-INF/MANIFEST.MF                             |  8 ++++----
 .../META-INF/MANIFEST.MF                             |  6 +++---
 .../META-INF/MANIFEST.MF                             | 10 +++++-----
 .../META-INF/MANIFEST.MF                             |  8 ++++----
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             |  8 ++++----
 .../META-INF/MANIFEST.MF                             |  4 ++--
 .../META-INF/MANIFEST.MF                             |  4 ++--
 .../META-INF/MANIFEST.MF                             |  4 ++--
 .../META-INF/MANIFEST.MF                             |  6 +++---
 .../tools/eclipse/test/util/BasePluginXmlTest.java   |  4 ++--
 .../META-INF/MANIFEST.MF                             |  4 ++--
 .../META-INF/MANIFEST.MF                             |  8 ++++----
 .../META-INF/MANIFEST.MF                             |  2 +-
 .../META-INF/MANIFEST.MF                             | 10 +++++-----
 .../META-INF/MANIFEST.MF                             | 12 ++++++------
 .../META-INF/MANIFEST.MF                             |  2 +-
 pom.xml                                              |  2 +-
 32 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/eclipse/ide-target-platform/category.xml b/eclipse/ide-target-platform/category.xml
index 98135df84f..d55de42f4a 100644
--- 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
index 93112c1c9a..77daca9a8d 100644
--- 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
index b91f401339..001877cf8c 100644
--- 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
index 04133cb409..558d0d6470 100644
--- 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
index c323a00c8a..0d570d5a9e 100644
--- 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
index 73db73f430..42303d07e0 100644
--- 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
index ea2dfd6b31..23d74bc9c3 100644
--- 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
index da57c55cba..1f954ca9b8 100644
--- 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
index 736552a5ac..49781b2f2d 100644
--- 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
index cf9b1ecb10..1b16145e0a 100644
--- 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
index e5df8ae005..101e9f5899 100644
--- 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
index 28d4105825..3b05af65be 100644
--- 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
index c27a4c4c1f..d71dcfcc65 100644
--- 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
index e5c877925e..ee89fbc638 100644
--- 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
index db21d4e25a..d322bb4f7d 100644
--- 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
index 0ddd271664..fb4090d844 100644
--- 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/plugins/com.google.cloud.tools.eclipse.googleapis/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.googleapis/META-INF/MANIFEST.MF
index 063e5ac905..0c4f281648 100644
--- 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
index 9a18822e17..d53e3724d2 100644
--- 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
index a6a6d42e2e..6a21087b08 100644
--- 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
index df227d3cab..584d5e425b 100644
--- 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
index d6840c6e2a..ea3c326bf2 100644
--- 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
index 94872277ed..1f34c92b94 100644
--- 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
index 5981c55375..2d41ffaa7a 100644
--- 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/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
index 1706019a73..bb334a9fad 100644
--- 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/plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/BasePluginXmlTest.java b/plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/BasePluginXmlTest.java
index a97a46225f..349b8b5624 100644
--- a/plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/BasePluginXmlTest.java
+++ b/plugins/com.google.cloud.tools.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
index 4b4e56a697..7179009efe 100644
--- 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
index ee33ba0e50..4c96e84b50 100644
--- 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
index 738c32aaea..50eb57365a 100644
--- 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
index 244c0d8458..0ab7abc067 100644
--- 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/plugins/com.google.cloud.tools.eclipse.util/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.util/META-INF/MANIFEST.MF
index 956d27b673..bde0391c01 100644
--- a/plugins/com.google.cloud.tools.eclipse.util/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.util/META-INF/MANIFEST.MF
@@ -14,12 +14,12 @@ Export-Package: com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.service,
  com.google.cloud.tools.eclipse.util.status
-Import-Package: 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.io;version="[28.1.0,29.0.0)",
- com.google.common.util.concurrent;version="[28.1.0,29.0.0)",
+Import-Package: 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.io;version="[30.0.0,31.0.0)",
+ com.google.common.util.concurrent;version="[30.0.0,31.0.0)",
  freemarker.template;version="[2.3.25,2.4.0)",
  org.eclipse.core.commands,
  org.eclipse.core.expressions,
diff --git a/plugins/com.google.cloud.tools.eclipse.welcome.test/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.welcome.test/META-INF/MANIFEST.MF
index ac66509cd9..c4de31b795 100644
--- a/plugins/com.google.cloud.tools.eclipse.welcome.test/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.welcome.test/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Require-Bundle: com.google.cloud.tools.eclipse.test.dependencies
 Import-Package: com.google.cloud.tools.eclipse.test.util,
- com.google.common.base;version="[28.1.0,29.0.0)"
+ com.google.common.base;version="[30.0.0,31.0.0)"
diff --git a/pom.xml b/pom.xml
index e25ca19ccf..b64277ca1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
       <!-- bundle: com.google.guava -->
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>28.1-jre</version>
+      <version>30.0-jre</version>
     </dependency>
     <dependency>
       <!-- bundle: jackson-core-asl -->

From d1347c9e4a166d632d8d235618e5e0cb29f23c7f Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Thu, 5 Aug 2021 16:35:59 -0400
Subject: [PATCH 3/3] Supporess DoNotMock errorprone warning

---
 .../tools/eclipse/googleapis/internal/GoogleApiFactoryTest.java  | 1 +
 .../googleapis/internal/GoogleApiFactoryWithProxyServerTest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/com.google.cloud.tools.eclipse.googleapis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryTest.java b/plugins/com.google.cloud.tools.eclipse.googleapis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryTest.java
index b3f93c9a77..d9dafb0dbd 100644
--- a/plugins/com.google.cloud.tools.eclipse.googleapis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryTest.java
+++ b/plugins/com.google.cloud.tools.eclipse.googleapis.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/plugins/com.google.cloud.tools.eclipse.googleapis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryWithProxyServerTest.java b/plugins/com.google.cloud.tools.eclipse.googleapis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryWithProxyServerTest.java
index 6225b3930e..1e6cd52fd6 100644
--- a/plugins/com.google.cloud.tools.eclipse.googleapis.test/src/com/google/cloud/tools/eclipse/googleapis/internal/GoogleApiFactoryWithProxyServerTest.java
+++ b/plugins/com.google.cloud.tools.eclipse.googleapis.test/src/com/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 {