Skip to content

Commit 0907353

Browse files
authored
deps: update google-cloud-shared-config to 1.11.3 (#357)
deps: update google-cloud-shared-dependencies to 3.39.0 deps: use google-cloud-bom 0.231.0 instead of libraries-bom deps: depend on pubsublite libraries from google-cloud-bom deps: update pubsublite-kafka to 1.2.2 deps: update flogger to 0.8 fix: An optimization in guava 33.3.0 broke our tests by not calling `addListener()` on futures which are already `isDone()`. Add mock call to make our futures not `isDone()` in some tests.
1 parent 4c107d8 commit 0907353

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

pom.xml

+6-17
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
1717
<artifactId>google-cloud-shared-config</artifactId>
18-
<version>1.8.0</version>
18+
<version>1.11.3</version>
1919
</parent>
2020

2121
<properties>
@@ -30,49 +30,38 @@
3030
<dependency>
3131
<groupId>com.google.cloud</groupId>
3232
<artifactId>google-cloud-shared-dependencies</artifactId>
33-
<version>3.20.0</version>
33+
<version>3.39.0</version>
3434
<type>pom</type>
3535
<scope>import</scope>
3636
</dependency>
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
39-
<artifactId>libraries-bom</artifactId>
40-
<version>26.11.0</version>
39+
<artifactId>google-cloud-bom</artifactId>
40+
<version>0.231.0</version>
4141
<type>pom</type>
4242
<scope>import</scope>
4343
</dependency>
44-
<!--TODO(dpcollins-google): remove this !-->
45-
<dependency>
46-
<groupId>com.google.api.grpc</groupId>
47-
<artifactId>grpc-google-cloud-pubsublite-v1</artifactId>
48-
<version>1.12.1</version>
49-
</dependency>
5044
</dependencies>
5145
</dependencyManagement>
5246

5347
<dependencies>
5448
<dependency>
5549
<groupId>com.google.api.grpc</groupId>
5650
<artifactId>proto-google-cloud-pubsublite-v1</artifactId>
57-
<!--TODO(dpcollins-google): remove explicit version !-->
58-
<version>1.12.1</version>
5951
</dependency>
6052
<dependency>
6153
<groupId>com.google.cloud</groupId>
6254
<artifactId>google-cloud-pubsublite</artifactId>
63-
<!--TODO(dpcollins-google): remove explicit version !-->
64-
<version>1.12.1</version>
6555
</dependency>
6656
<dependency>
6757
<groupId>com.google.cloud</groupId>
6858
<artifactId>pubsublite-kafka</artifactId>
69-
<version>1.2.1</version>
59+
<version>1.2.2</version>
7060
</dependency>
7161
<dependency>
7262
<groupId>com.google.cloud</groupId>
7363
<artifactId>google-cloud-pubsub</artifactId>
7464
</dependency>
75-
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
7665
<dependency>
7766
<groupId>com.google.protobuf</groupId>
7867
<artifactId>protobuf-java</artifactId>
@@ -85,7 +74,7 @@
8574
<dependency>
8675
<groupId>com.google.flogger</groupId>
8776
<artifactId>google-extensions</artifactId>
88-
<version>0.7.4</version>
77+
<version>0.8</version>
8978
</dependency>
9079
<dependency>
9180
<groupId>com.google.code.findbugs</groupId>

src/test/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTaskTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ public void testFlushWithNoPublishInPut() throws Exception {
336336
partitionOffsets.put(new TopicPartition(KAFKA_TOPIC, 0), null);
337337
List<SinkRecord> records = getSampleRecords();
338338
ApiFuture<String> goodFuture = getSuccessfulPublishFuture();
339+
when(goodFuture.isDone()).thenReturn(false);
339340
when(publisher.publish(any(PubsubMessage.class))).thenReturn(goodFuture);
340341
task.put(records);
341342
task.flush(partitionOffsets);
@@ -578,7 +579,9 @@ public void testFlushExceptionThenNoExceptionCase() throws Exception {
578579
partitionOffsets.put(new TopicPartition(KAFKA_TOPIC, 0), null);
579580
List<SinkRecord> records = getSampleRecords();
580581
ApiFuture<String> badFuture = getFailedPublishFuture();
582+
when(badFuture.isDone()).thenReturn(false);
581583
ApiFuture<String> goodFuture = getSuccessfulPublishFuture();
584+
when(goodFuture.isDone()).thenReturn(false);
582585
when(publisher.publish(any(PubsubMessage.class)))
583586
.thenReturn(badFuture)
584587
.thenReturn(badFuture)

0 commit comments

Comments
 (0)