From f035b81bfa41e9877b8428b30a9c191b57fdc0ce Mon Sep 17 00:00:00 2001
From: Kristen O'Leary <kaoleary@google.com>
Date: Mon, 11 Oct 2021 16:14:58 -0400
Subject: [PATCH] deps: upgrade beam to 2.30.0

---
 .../bigtable-beam-import/pom.xml              | 30 ++++++++++++++++++-
 .../bigtable-hbase-beam/pom.xml               |  2 +-
 pom.xml                                       |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
index 216ca9607a..a10a4e9ae8 100644
--- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
+++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
@@ -59,6 +59,12 @@ limitations under the License.
       <artifactId>
         beam-sdks-java-extensions-google-cloud-platform-core
       </artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.beam</groupId>
@@ -73,6 +79,10 @@ limitations under the License.
           <groupId>com.google.api.grpc</groupId>
           <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
         </exclusion>
+          <exclusion>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+          </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -80,10 +90,22 @@ limitations under the License.
       <artifactId>beam-sdks-java-io-hadoop-common</artifactId>
       <!-- used at runtime via WritableCoderProviderRegistrar service -->
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-sdks-java-io-hadoop-format</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Used transitively by beam, and directly in tests -->
@@ -91,6 +113,12 @@ limitations under the License.
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-runners-core-construction-java</artifactId>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.beam</groupId>
@@ -165,7 +193,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-storage</artifactId>
-      <version>v1-rev171-1.25.0</version>
+      <version>v1-rev20210127-1.31.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
index c3749271c4..3d06700403 100644
--- a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
+++ b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
@@ -33,7 +33,7 @@ limitations under the License.
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.3.4</version>
+        <version>2.4.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/pom.xml b/pom.xml
index d10ff75155..588e409398 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@ limitations under the License.
     <hamcrest.version>1.3</hamcrest.version>
     <mockito.version>4.0.0</mockito.version>
     <!-- TODO: check if commons-codec was transitively updated to 1.13 and okhttp was updated to 2.7.5 when upgrading-->
-    <beam.version>2.28.0</beam.version>
+    <beam.version>2.30.0</beam.version>
     <!-- referred from bigtable-beam-import and bigtable-emulator -->
     <guava.version>30.1.1-jre</guava.version>
     <gcs-guava.version>29.0-jre</gcs-guava.version>