From a706927b73f7a16a8694b6bc433f9263e72746e4 Mon Sep 17 00:00:00 2001
From: shitanshu verma <shitanshu@google.com>
Date: Mon, 1 Mar 2021 17:50:17 -0500
Subject: [PATCH 1/2] Upgrade beam version to 2.24.

---
 .../bigtable-beam-import/pom.xml                | 17 +++++++++++++++++
 pom.xml                                         |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
index f05bc91cc4..e50f7d9da9 100644
--- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
+++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
@@ -28,6 +28,23 @@ limitations under the License.
     <mainClass>com.google.cloud.bigtable.beam.sequencefiles.Main</mainClass>
   </properties>
 
+  <!-- Adding this to resolve version conflict within beam sdk-->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-api</artifactId>
+        <version>${beam-grpc.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-core</artifactId>
+        <version>${beam-grpc.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index 43ae8c3624..b5de49ac98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,11 +76,12 @@ limitations under the License.
     <hamcrest.version>1.3</hamcrest.version>
     <mockito.version>3.6.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.19.0</beam.version>
+    <beam.version>2.24.0</beam.version>
     <!-- referred from bigtable-beam-import and bigtable-emulator -->
     <guava.version>30.0-android</guava.version>
     <beam-guava.version>20.0</beam-guava.version>
     <beam-auto-value.version>1.7</beam-auto-value.version>
+    <beam-grpc.version>1.29.0</beam-grpc.version>
 
     <!-- Benchmarks related dependencies -->
     <jmh.version>1.23</jmh.version>

From a8eea7e819151e0f072b76ea48476384af28510e Mon Sep 17 00:00:00 2001
From: shitanshu verma <shitanshu@google.com>
Date: Mon, 1 Mar 2021 17:50:17 -0500
Subject: [PATCH 2/2] Upgrade beam version to 2.24.

---
 bigtable-dataflow-parent/bigtable-beam-import/pom.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
index e50f7d9da9..6db4fbcaee 100644
--- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
+++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
@@ -33,18 +33,14 @@ limitations under the License.
     <dependencies>
       <dependency>
         <groupId>io.grpc</groupId>
-        <artifactId>grpc-api</artifactId>
-        <version>${beam-grpc.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-core</artifactId>
+        <artifactId>grpc-bom</artifactId>
         <version>${beam-grpc.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
 
-
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>