From 6ff63e40caeba79a0a558e24fcd946fe7390d25d Mon Sep 17 00:00:00 2001
From: streamnativebot <streamnativebot@streamnative.io>
Date: Thu, 2 Jul 2026 09:42:12 +0000
Subject: [PATCH 1/2] "Created by snbot"

---
 amqp-client-auth/pom.xml      | 2 +-
 amqp-impl/pom.xml             | 2 +-
 pom.xml                       | 6 +++---
 tests-qpid-jms-client/pom.xml | 2 +-
 tests/pom.xml                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/amqp-client-auth/pom.xml b/amqp-client-auth/pom.xml
index 41165c44..dfd64228 100644
--- a/amqp-client-auth/pom.xml
+++ b/amqp-client-auth/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>3.3.0-SNAPSHOT</version>
+        <version>4.2.1.6</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/amqp-impl/pom.xml b/amqp-impl/pom.xml
index b28e6529..8eaa3a32 100644
--- a/amqp-impl/pom.xml
+++ b/amqp-impl/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>4.2.1.6</version>
   </parent>
 
   <artifactId>pulsar-protocol-handler-amqp</artifactId>
diff --git a/pom.xml b/pom.xml
index f3bfc1f2..7e6b9691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>io.streamnative.pulsar.handlers</groupId>
   <artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
-  <version>3.3.0-SNAPSHOT</version>
+  <version>4.2.1.6</version>
   <name>StreamNative :: Pulsar Protocol Handler :: AoP Parent</name>
   <description>Parent for AMQP on Pulsar implemented using Pulsar Protocol Handler.</description>
 
@@ -40,10 +40,10 @@
     <project.compiler.release>${maven.compiler.target}</project.compiler.release>
 
     <!-- dependencies -->
-    <pulsar.version>4.2.0-SNAPSHOT</pulsar.version>
+    <pulsar.version>4.2.1.6</pulsar.version>
     <qpid-protocol-plugin.version>8.0.0</qpid-protocol-plugin.version>
     <rabbitmq.version>5.8.0</rabbitmq.version>
-    <sn.bom.version>4.2.0-SNAPSHOT</sn.bom.version>
+    <sn.bom.version>4.2.1.6</sn.bom.version>
     <opentelemetry.version>1.56.0</opentelemetry.version>
 
     <!-- test dependencies -->
diff --git a/tests-qpid-jms-client/pom.xml b/tests-qpid-jms-client/pom.xml
index 1e95ec8e..b7a20354 100644
--- a/tests-qpid-jms-client/pom.xml
+++ b/tests-qpid-jms-client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>4.2.1.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index 889c5050..3f7db91d 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>4.2.1.6</version>
   </parent>
 
   <groupId>io.streamnative.pulsar.handlers</groupId>

From 909192abd0986b19b683aee670d12146ac51ce8f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Jul 2026 12:21:20 +0000
Subject: [PATCH 2/2] test: avoid manual ack race in MultiBundlesTest consumers

---
 .../streamnative/pulsar/handlers/amqp/MultiBundlesTest.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/MultiBundlesTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/MultiBundlesTest.java
index df7c04be..eefa379d 100644
--- a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/MultiBundlesTest.java
+++ b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/MultiBundlesTest.java
@@ -74,7 +74,7 @@ public void e2eTest() throws Exception {
 
         AtomicInteger receiveCount = new AtomicInteger();
         AtomicBoolean flag1 = new AtomicBoolean(false);
-        channel.basicConsume(qu1, false, new DefaultConsumer(channel) {
+        channel.basicConsume(qu1, true, new DefaultConsumer(channel) {
             @Override
             public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties,
                                        byte[] body) throws IOException {
@@ -82,12 +82,11 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
                 if (!new String(body).contains(key1)) {
                     flag1.set(true);
                 }
-                channel.basicAck(envelope.getDeliveryTag(), false);
             }
         });
 
         AtomicBoolean flag2 = new AtomicBoolean(false);
-        channel.basicConsume(qu2, false, new DefaultConsumer(channel) {
+        channel.basicConsume(qu2, true, new DefaultConsumer(channel) {
             @Override
             public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties,
                                        byte[] body) throws IOException {
@@ -95,7 +94,6 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
                 if (!new String(body).contains(key2)) {
                     flag2.set(true);
                 }
-                channel.basicAck(envelope.getDeliveryTag(), false);
             }
         });