From 7db8c2dd16257f6663dd6d34498737dcc885bcb0 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Tue, 12 Aug 2025 12:46:12 -0400
Subject: [PATCH 1/3] deps: update bigtable and beam version for LTS release

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 586ad6cc73..9e5980998f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@ limitations under the License.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- core dependency versions -->
-    <bigtable.version>2.58.2</bigtable.version>
-    <google-cloud-bigtable-emulator.version>0.195.2</google-cloud-bigtable-emulator.version>
+    <bigtable.version>2.60.0</bigtable.version>
+    <google-cloud-bigtable-emulator.version>0.197.0</google-cloud-bigtable-emulator.version>
     <bigtable-metrics-api.version>1.29.2</bigtable-metrics-api.version>
     <!-- Optional dep for bigtable-metrics-api used for tests -->
     <dropwizard-metrics.version>4.2.22</dropwizard-metrics.version>
@@ -80,9 +80,9 @@ limitations under the License.
     <truth.version>1.1.5</truth.version>
     <hamcrest.version>1.3</hamcrest.version>
     <mockito.version>4.11.0</mockito.version>
-    <beam.version>2.63.0</beam.version>
+    <beam.version>2.67.0</beam.version>
     <!-- referred from bigtable-beam-import and bigtable-emulator -->
-    <guava.version>31.1-jre</guava.version>
+    <guava.version>33.4.0-jre</guava.version>
     <opencensus.version>0.31.1</opencensus.version>
 
     <!-- Enable the ability to skip unit tests and only run integration tests,

From bb177f62fc2685d6abe3526422a98c8f5e5350aa Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Tue, 12 Aug 2025 14:29:32 -0400
Subject: [PATCH 2/3] fix dependencies

---
 .../bigtable/beam/it/CloudBigtableBeamIT.java      | 14 ++++----------
 .../bigtable-hbase-beam/pom.xml                    |  2 +-
 .../bigtable-hbase-1.x-shaded/pom.xml              |  1 +
 .../bigtable-hbase-2.x-shaded/pom.xml              |  1 +
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java
index 568a4f3bef..65589c4411 100644
--- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java
+++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java
@@ -343,11 +343,8 @@ public void testLineageForBigtableImport() {
     Assert.assertEquals(PipelineResult.State.DONE, state);
     assertThat(
         Lineage.query(result.metrics(), Lineage.Type.SINK),
-        hasItem(
-            Lineage.getFqName(
-                "bigtable",
-                ImmutableList.of(
-                    config.getProjectId(), config.getInstanceId(), config.getTableId()))));
+        hasItem(String.format("bigtable:%s.%s.%s",
+                config.getProjectId(), config.getInstanceId(), config.getTableId())));
   }
 
   @Test
@@ -441,11 +438,8 @@ public void testLineageForBigtableExport() throws IOException {
     Assert.assertEquals(PipelineResult.State.DONE, state);
     assertThat(
         Lineage.query(result.metrics(), Lineage.Type.SOURCE),
-        hasItem(
-            Lineage.getFqName(
-                "bigtable",
-                ImmutableList.of(
-                    config.getProjectId(), config.getInstanceId(), config.getTableId()))));
+        hasItem(String.format("bigtable:%s.%s.%s",
+                        config.getProjectId(), config.getInstanceId(), config.getTableId())));
   }
 
   private static byte[] createRandomValue() {
diff --git a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
index f8bbdb5dea..1c0e623131 100644
--- a/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
+++ b/bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
@@ -49,7 +49,7 @@ limitations under the License.
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.33</version>
+        <version>2.0.16</version>
       </dependency>
 
     </dependencies>
diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
index 0792e6503b..d5e9a55cc4 100644
--- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
+++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
@@ -237,6 +237,7 @@ limitations under the License.
                     <exclude>META-INF/MANIFEST.MF</exclude>
                     <exclude>META-INF/DEPENDENCIES</exclude>
                     <exclude>META-INF/versions/9/module-info.class</exclude>
+                    <exclude>META-INF/versions/11/module-info.class</exclude>
                   </excludes>
                 </filter>
               </filters>
diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
index 661c34de58..982f532044 100644
--- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
+++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
@@ -229,6 +229,7 @@ limitations under the License.
                     <exclude>META-INF/MANIFEST.MF</exclude>
                     <exclude>META-INF/DEPENDENCIES</exclude>
                     <exclude>META-INF/versions/9/module-info.class</exclude>
+                    <exclude>META-INF/versions/11/module-info.class</exclude>
                   </excludes>
                 </filter>
               </filters>

From d436960f13523ee657e4c3d55d67b647a18884c6 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Tue, 12 Aug 2025 15:10:01 -0400
Subject: [PATCH 3/3] reformat code

---
 .../cloud/bigtable/beam/it/CloudBigtableBeamIT.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java
index 65589c4411..e813e2fea2 100644
--- a/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java
+++ b/bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java
@@ -53,7 +53,6 @@
 import org.apache.beam.sdk.transforms.SimpleFunction;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.sdk.values.PCollection;
-import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -343,7 +342,9 @@ public void testLineageForBigtableImport() {
     Assert.assertEquals(PipelineResult.State.DONE, state);
     assertThat(
         Lineage.query(result.metrics(), Lineage.Type.SINK),
-        hasItem(String.format("bigtable:%s.%s.%s",
+        hasItem(
+            String.format(
+                "bigtable:%s.%s.%s",
                 config.getProjectId(), config.getInstanceId(), config.getTableId())));
   }
 
@@ -438,8 +439,10 @@ public void testLineageForBigtableExport() throws IOException {
     Assert.assertEquals(PipelineResult.State.DONE, state);
     assertThat(
         Lineage.query(result.metrics(), Lineage.Type.SOURCE),
-        hasItem(String.format("bigtable:%s.%s.%s",
-                        config.getProjectId(), config.getInstanceId(), config.getTableId())));
+        hasItem(
+            String.format(
+                "bigtable:%s.%s.%s",
+                config.getProjectId(), config.getInstanceId(), config.getTableId())));
   }
 
   private static byte[] createRandomValue() {