Skip to content

Commit b5c7685

Browse files
authored
deps: update bigtable and beam version for LTS release (#4499)
* deps: update bigtable and beam version for LTS release * fix dependencies * reformat code
1 parent 9aa1a1c commit b5c7685

File tree

5 files changed

+13
-14
lines changed
  • bigtable-dataflow-parent
  • bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded
  • bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded

5 files changed

+13
-14
lines changed

bigtable-dataflow-parent/bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it/CloudBigtableBeamIT.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import org.apache.beam.sdk.transforms.SimpleFunction;
5454
import org.apache.beam.sdk.values.KV;
5555
import org.apache.beam.sdk.values.PCollection;
56-
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
5756
import org.apache.commons.logging.Log;
5857
import org.apache.commons.logging.LogFactory;
5958
import org.apache.hadoop.conf.Configuration;
@@ -344,10 +343,9 @@ public void testLineageForBigtableImport() {
344343
assertThat(
345344
Lineage.query(result.metrics(), Lineage.Type.SINK),
346345
hasItem(
347-
Lineage.getFqName(
348-
"bigtable",
349-
ImmutableList.of(
350-
config.getProjectId(), config.getInstanceId(), config.getTableId()))));
346+
String.format(
347+
"bigtable:%s.%s.%s",
348+
config.getProjectId(), config.getInstanceId(), config.getTableId())));
351349
}
352350

353351
@Test
@@ -442,10 +440,9 @@ public void testLineageForBigtableExport() throws IOException {
442440
assertThat(
443441
Lineage.query(result.metrics(), Lineage.Type.SOURCE),
444442
hasItem(
445-
Lineage.getFqName(
446-
"bigtable",
447-
ImmutableList.of(
448-
config.getProjectId(), config.getInstanceId(), config.getTableId()))));
443+
String.format(
444+
"bigtable:%s.%s.%s",
445+
config.getProjectId(), config.getInstanceId(), config.getTableId())));
449446
}
450447

451448
private static byte[] createRandomValue() {

bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ limitations under the License.
4949
<dependency>
5050
<groupId>org.slf4j</groupId>
5151
<artifactId>slf4j-api</artifactId>
52-
<version>1.7.33</version>
52+
<version>2.0.16</version>
5353
</dependency>
5454

5555
</dependencies>

bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ limitations under the License.
237237
<exclude>META-INF/MANIFEST.MF</exclude>
238238
<exclude>META-INF/DEPENDENCIES</exclude>
239239
<exclude>META-INF/versions/9/module-info.class</exclude>
240+
<exclude>META-INF/versions/11/module-info.class</exclude>
240241
</excludes>
241242
</filter>
242243
</filters>

bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ limitations under the License.
229229
<exclude>META-INF/MANIFEST.MF</exclude>
230230
<exclude>META-INF/DEPENDENCIES</exclude>
231231
<exclude>META-INF/versions/9/module-info.class</exclude>
232+
<exclude>META-INF/versions/11/module-info.class</exclude>
232233
</excludes>
233234
</filter>
234235
</filters>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ limitations under the License.
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5656

5757
<!-- core dependency versions -->
58-
<bigtable.version>2.58.2</bigtable.version>
59-
<google-cloud-bigtable-emulator.version>0.195.2</google-cloud-bigtable-emulator.version>
58+
<bigtable.version>2.60.0</bigtable.version>
59+
<google-cloud-bigtable-emulator.version>0.197.0</google-cloud-bigtable-emulator.version>
6060
<bigtable-metrics-api.version>1.29.2</bigtable-metrics-api.version>
6161
<!-- Optional dep for bigtable-metrics-api used for tests -->
6262
<dropwizard-metrics.version>4.2.22</dropwizard-metrics.version>
@@ -80,9 +80,9 @@ limitations under the License.
8080
<truth.version>1.1.5</truth.version>
8181
<hamcrest.version>1.3</hamcrest.version>
8282
<mockito.version>4.11.0</mockito.version>
83-
<beam.version>2.63.0</beam.version>
83+
<beam.version>2.67.0</beam.version>
8484
<!-- referred from bigtable-beam-import and bigtable-emulator -->
85-
<guava.version>31.1-jre</guava.version>
85+
<guava.version>33.4.0-jre</guava.version>
8686
<opencensus.version>0.31.1</opencensus.version>
8787

8888
<!-- Enable the ability to skip unit tests and only run integration tests,

0 commit comments

Comments
 (0)