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..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; @@ -344,10 +343,9 @@ public void testLineageForBigtableImport() { assertThat( Lineage.query(result.metrics(), Lineage.Type.SINK), hasItem( - Lineage.getFqName( - "bigtable", - ImmutableList.of( - config.getProjectId(), config.getInstanceId(), config.getTableId())))); + String.format( + "bigtable:%s.%s.%s", + config.getProjectId(), config.getInstanceId(), config.getTableId()))); } @Test @@ -442,10 +440,9 @@ public void testLineageForBigtableExport() throws IOException { assertThat( Lineage.query(result.metrics(), Lineage.Type.SOURCE), hasItem( - Lineage.getFqName( - "bigtable", - ImmutableList.of( - config.getProjectId(), config.getInstanceId(), config.getTableId())))); + 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. org.slf4j slf4j-api - 1.7.33 + 2.0.16 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. META-INF/MANIFEST.MF META-INF/DEPENDENCIES META-INF/versions/9/module-info.class + META-INF/versions/11/module-info.class 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. META-INF/MANIFEST.MF META-INF/DEPENDENCIES META-INF/versions/9/module-info.class + META-INF/versions/11/module-info.class 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. UTF-8 - 2.58.2 - 0.195.2 + 2.60.0 + 0.197.0 1.29.2 4.2.22 @@ -80,9 +80,9 @@ limitations under the License. 1.1.5 1.3 4.11.0 - 2.63.0 + 2.67.0 - 31.1-jre + 33.4.0-jre 0.31.1