From 4c107d896930492a0794d0c133104d5574f92efc Mon Sep 17 00:00:00 2001
From: Mihai Ghita <125544263+mihai-ghita@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:16:42 +0300
Subject: [PATCH 1/4] fix: maxOutstandingMessages should be defined without
 maxOutstandingRequestBytes (#349)

---
 .../java/com/google/pubsub/kafka/sink/CloudPubSubSinkTask.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTask.java b/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTask.java
index 28c74ce0..ce5fe152 100644
--- a/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTask.java
+++ b/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTask.java
@@ -433,7 +433,7 @@ private boolean useFlowControl() {
     // only enable flow control if at least one flow control config has been set
     return maxOutstandingRequestBytes
             != CloudPubSubSinkConnector.DEFAULT_MAX_OUTSTANDING_REQUEST_BYTES
-        || maxOutstandingRequestBytes != CloudPubSubSinkConnector.DEFAULT_MAX_OUTSTANDING_MESSAGES;
+        || maxOutstandingMessages != CloudPubSubSinkConnector.DEFAULT_MAX_OUTSTANDING_MESSAGES;
   }
 
   @Override

From 0907353b27144e7bd2a57439efbb9ce2da304ab3 Mon Sep 17 00:00:00 2001
From: bcol-google <134437113+bcol-google@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:25:26 -0500
Subject: [PATCH 2/4] 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.
---
 pom.xml                                       | 23 +++++--------------
 .../kafka/sink/CloudPubSubSinkTaskTest.java   |  3 +++
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1dff029..1f3646a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.8.0</version>
+    <version>1.11.3</version>
   </parent>
 
   <properties>
@@ -30,23 +30,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>3.20.0</version>
+        <version>3.39.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
-        <artifactId>libraries-bom</artifactId>
-        <version>26.11.0</version>
+        <artifactId>google-cloud-bom</artifactId>
+        <version>0.231.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!--TODO(dpcollins-google): remove this !-->
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-pubsublite-v1</artifactId>
-        <version>1.12.1</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -54,25 +48,20 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-pubsublite-v1</artifactId>
-      <!--TODO(dpcollins-google): remove explicit version !-->
-      <version>1.12.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsublite</artifactId>
-      <!--TODO(dpcollins-google): remove explicit version !-->
-      <version>1.12.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>pubsublite-kafka</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
@@ -85,7 +74,7 @@
     <dependency>
       <groupId>com.google.flogger</groupId>
       <artifactId>google-extensions</artifactId>
-      <version>0.7.4</version>
+      <version>0.8</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
diff --git a/src/test/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTaskTest.java b/src/test/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTaskTest.java
index e1d4cb6d..d25918f3 100644
--- a/src/test/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTaskTest.java
+++ b/src/test/java/com/google/pubsub/kafka/sink/CloudPubSubSinkTaskTest.java
@@ -336,6 +336,7 @@ public void testFlushWithNoPublishInPut() throws Exception {
     partitionOffsets.put(new TopicPartition(KAFKA_TOPIC, 0), null);
     List<SinkRecord> records = getSampleRecords();
     ApiFuture<String> goodFuture = getSuccessfulPublishFuture();
+    when(goodFuture.isDone()).thenReturn(false);
     when(publisher.publish(any(PubsubMessage.class))).thenReturn(goodFuture);
     task.put(records);
     task.flush(partitionOffsets);
@@ -578,7 +579,9 @@ public void testFlushExceptionThenNoExceptionCase() throws Exception {
     partitionOffsets.put(new TopicPartition(KAFKA_TOPIC, 0), null);
     List<SinkRecord> records = getSampleRecords();
     ApiFuture<String> badFuture = getFailedPublishFuture();
+    when(badFuture.isDone()).thenReturn(false);
     ApiFuture<String> goodFuture = getSuccessfulPublishFuture();
+    when(goodFuture.isDone()).thenReturn(false);
     when(publisher.publish(any(PubsubMessage.class)))
         .thenReturn(badFuture)
         .thenReturn(badFuture)

From 6b3d685007cac548ab0a0b2fdca0faa1acdc1d0c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 12:17:01 -0500
Subject: [PATCH 3/4] chore(main): release 1.3.1-SNAPSHOT (#355)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 pom.xml      | 2 +-
 versions.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f3646a9..8543df0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pubsub-group-kafka-connector</artifactId>
-  <version>1.3.0</version><!-- {x-version-update:pubsub-group-kafka-connector:current} -->
+  <version>1.3.1-SNAPSHOT</version><!-- {x-version-update:pubsub-group-kafka-connector:current} -->
   <packaging>jar</packaging>
   <name>Pub/Sub Group Kafka Connector</name>
   <url>https://github.com/googleapis/java-pubsub-group-kafka-connector</url>
diff --git a/versions.txt b/versions.txt
index d7bff1ac..64f72af4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-pubsub-group-kafka-connector:1.3.0:1.3.0
+pubsub-group-kafka-connector:1.3.0:1.3.1-SNAPSHOT

From 41c61218e83f4aab863ded9de274c530e6756017 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 12:51:41 -0500
Subject: [PATCH 4/4] chore(main): release 1.3.1 (#362)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 18 ++++++++++++++++++
 pom.xml      |  2 +-
 versions.txt |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7df38704..79805f15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [1.3.1](https://github.com/googleapis/java-pubsub-group-kafka-connector/compare/v1.3.0...v1.3.1) (2024-11-06)
+
+
+### Bug Fixes
+
+* 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. ([0907353](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/0907353b27144e7bd2a57439efbb9ce2da304ab3))
+* MaxOutstandingMessages should be defined without maxOutstandingRequestBytes ([#349](https://github.com/googleapis/java-pubsub-group-kafka-connector/issues/349)) ([4c107d8](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/4c107d896930492a0794d0c133104d5574f92efc))
+
+
+### Dependencies
+
+* Depend on pubsublite libraries from google-cloud-bom ([0907353](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/0907353b27144e7bd2a57439efbb9ce2da304ab3))
+* Update flogger to 0.8 ([0907353](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/0907353b27144e7bd2a57439efbb9ce2da304ab3))
+* Update google-cloud-shared-config to 1.11.3 ([#357](https://github.com/googleapis/java-pubsub-group-kafka-connector/issues/357)) ([0907353](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/0907353b27144e7bd2a57439efbb9ce2da304ab3))
+* Update google-cloud-shared-dependencies to 3.39.0 ([0907353](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/0907353b27144e7bd2a57439efbb9ce2da304ab3))
+* Update pubsublite-kafka to 1.2.2 ([0907353](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/0907353b27144e7bd2a57439efbb9ce2da304ab3))
+* Use google-cloud-bom 0.231.0 instead of libraries-bom ([0907353](https://github.com/googleapis/java-pubsub-group-kafka-connector/commit/0907353b27144e7bd2a57439efbb9ce2da304ab3))
+
 ## [1.3.0](https://github.com/googleapis/java-pubsub-group-kafka-connector/compare/v1.2.0...v1.3.0) (2024-10-07)
 
 
diff --git a/pom.xml b/pom.xml
index 8543df0b..551224f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pubsub-group-kafka-connector</artifactId>
-  <version>1.3.1-SNAPSHOT</version><!-- {x-version-update:pubsub-group-kafka-connector:current} -->
+  <version>1.3.1</version><!-- {x-version-update:pubsub-group-kafka-connector:current} -->
   <packaging>jar</packaging>
   <name>Pub/Sub Group Kafka Connector</name>
   <url>https://github.com/googleapis/java-pubsub-group-kafka-connector</url>
diff --git a/versions.txt b/versions.txt
index 64f72af4..0fc23595 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-pubsub-group-kafka-connector:1.3.0:1.3.1-SNAPSHOT
+pubsub-group-kafka-connector:1.3.1:1.3.1