Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion bigtable-dataflow-parent/bigtable-hbase-beam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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,
Expand Down