File tree Expand file tree Collapse file tree 5 files changed +13
-14
lines changed
bigtable-beam-import/src/test/java/com/google/cloud/bigtable/beam/it
bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded
bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded Expand file tree Collapse file tree 5 files changed +13
-14
lines changed Original file line number Diff line number Diff line change 53
53
import org .apache .beam .sdk .transforms .SimpleFunction ;
54
54
import org .apache .beam .sdk .values .KV ;
55
55
import org .apache .beam .sdk .values .PCollection ;
56
- import org .apache .beam .vendor .guava .v32_1_2_jre .com .google .common .collect .ImmutableList ;
57
56
import org .apache .commons .logging .Log ;
58
57
import org .apache .commons .logging .LogFactory ;
59
58
import org .apache .hadoop .conf .Configuration ;
@@ -344,10 +343,9 @@ public void testLineageForBigtableImport() {
344
343
assertThat (
345
344
Lineage .query (result .metrics (), Lineage .Type .SINK ),
346
345
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 ())));
351
349
}
352
350
353
351
@ Test
@@ -442,10 +440,9 @@ public void testLineageForBigtableExport() throws IOException {
442
440
assertThat (
443
441
Lineage .query (result .metrics (), Lineage .Type .SOURCE ),
444
442
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 ())));
449
446
}
450
447
451
448
private static byte [] createRandomValue () {
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ limitations under the License.
49
49
<dependency >
50
50
<groupId >org.slf4j</groupId >
51
51
<artifactId >slf4j-api</artifactId >
52
- <version >1.7.33 </version >
52
+ <version >2.0.16 </version >
53
53
</dependency >
54
54
55
55
</dependencies >
Original file line number Diff line number Diff line change @@ -237,6 +237,7 @@ limitations under the License.
237
237
<exclude >META-INF/MANIFEST.MF</exclude >
238
238
<exclude >META-INF/DEPENDENCIES</exclude >
239
239
<exclude >META-INF/versions/9/module-info.class</exclude >
240
+ <exclude >META-INF/versions/11/module-info.class</exclude >
240
241
</excludes >
241
242
</filter >
242
243
</filters >
Original file line number Diff line number Diff line change @@ -229,6 +229,7 @@ limitations under the License.
229
229
<exclude >META-INF/MANIFEST.MF</exclude >
230
230
<exclude >META-INF/DEPENDENCIES</exclude >
231
231
<exclude >META-INF/versions/9/module-info.class</exclude >
232
+ <exclude >META-INF/versions/11/module-info.class</exclude >
232
233
</excludes >
233
234
</filter >
234
235
</filters >
Original file line number Diff line number Diff line change @@ -55,8 +55,8 @@ limitations under the License.
55
55
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
56
56
57
57
<!-- 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>
60
60
<bigtable-metrics-api .version>1.29.2</bigtable-metrics-api .version>
61
61
<!-- Optional dep for bigtable-metrics-api used for tests -->
62
62
<dropwizard-metrics .version>4.2.22</dropwizard-metrics .version>
@@ -80,9 +80,9 @@ limitations under the License.
80
80
<truth .version>1.1.5</truth .version>
81
81
<hamcrest .version>1.3</hamcrest .version>
82
82
<mockito .version>4.11.0</mockito .version>
83
- <beam .version>2.63 .0</beam .version>
83
+ <beam .version>2.67 .0</beam .version>
84
84
<!-- 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>
86
86
<opencensus .version>0.31.1</opencensus .version>
87
87
88
88
<!-- Enable the ability to skip unit tests and only run integration tests,
You can’t perform that action at this time.
0 commit comments