From 4be975dfe3e1fec17400b1ae69dac3df4c97a781 Mon Sep 17 00:00:00 2001
From: rabbitmq-ci <rabbitmq-ci@users.noreply.github.com>
Date: Thu, 6 Feb 2025 10:50:13 +0000
Subject: [PATCH 01/81] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e200535bf..8762917ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.rabbitmq</groupId>
   <artifactId>amqp-client</artifactId>
-  <version>5.25.0</version>
+  <version>5.26.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>RabbitMQ Java Client</name>
@@ -42,7 +42,7 @@
     <url>https://github.com/rabbitmq/rabbitmq-java-client</url>
     <connection>scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git</connection>
     <developerConnection>scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git</developerConnection>
-    <tag>v5.25.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <organization>

From abd5d9b99d95409ee440046f6c27928fb4c71fd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 00:44:17 +0000
Subject: [PATCH 02/81] Bump opentelemetry.version from 1.46.0 to 1.47.0

Bumps `opentelemetry.version` from 1.46.0 to 1.47.0.

Updates `io.opentelemetry:opentelemetry-api` from 1.46.0 to 1.47.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.46.0...v1.47.0)

Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.46.0 to 1.47.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.46.0...v1.47.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-sdk-testing
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8762917ce..40f8447c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
     <micrometer.version>1.14.3</micrometer.version>
-    <opentelemetry.version>1.46.0</opentelemetry.version>
+    <opentelemetry.version>1.47.0</opentelemetry.version>
     <jackson.version>2.18.2</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.11.4</junit.jupiter.version>

From 1e3ed052380f39eb782bb289abfffa943d6e9abe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2025 00:59:08 +0000
Subject: [PATCH 03/81] Bump io.micrometer:micrometer-tracing-integration-test

Bumps [io.micrometer:micrometer-tracing-integration-test](https://github.com/micrometer-metrics/tracing) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.4.2...v1.4.3)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-integration-test
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 40f8447c6..67f1026e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <junit.jupiter.version>5.11.4</junit.jupiter.version>
     <mockito.version>5.15.2</mockito.version>
     <assertj.version>3.27.3</assertj.version>
-    <micrometer-tracing-test.version>1.4.2</micrometer-tracing-test.version>
+    <micrometer-tracing-test.version>1.4.3</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.80</bouncycastle.version>

From 60cfcf95b40d1cce989c0b3a078a50c1563e034b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2025 00:59:19 +0000
Subject: [PATCH 04/81] Bump io.micrometer:micrometer-core from 1.14.3 to
 1.14.4

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.3 to 1.14.4.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.3...v1.14.4)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 40f8447c6..1aec530d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
-    <micrometer.version>1.14.3</micrometer.version>
+    <micrometer.version>1.14.4</micrometer.version>
     <opentelemetry.version>1.47.0</opentelemetry.version>
     <jackson.version>2.18.2</jackson.version>
     <logback.version>1.2.13</logback.version>

From e9e56e72847661aaf3448eac0828102af8af5ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@tuta.io>
Date: Mon, 17 Feb 2025 09:30:08 +0100
Subject: [PATCH 05/81] Activate Khepri on CI

(cherry picked from commit 3a8afd4853082b2d1aaad9c9caff64fd853c2c12)
---
 ci/start-broker.sh  | 1 +
 ci/start-cluster.sh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ci/start-broker.sh b/ci/start-broker.sh
index 86d81ece9..453dbc078 100755
--- a/ci/start-broker.sh
+++ b/ci/start-broker.sh
@@ -37,5 +37,6 @@ docker run -d --name rabbitmq \
 
 wait_for_message rabbitmq "completed with"
 
+docker exec rabbitmq rabbitmqctl enable_feature_flag --opt-in khepri_db
 docker exec rabbitmq rabbitmq-diagnostics erlang_version
 docker exec rabbitmq rabbitmqctl version
diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh
index efee59ee2..2534c9bd8 100755
--- a/ci/start-cluster.sh
+++ b/ci/start-cluster.sh
@@ -74,6 +74,9 @@ sleep 10
 
 docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
 
+docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
+
 docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status

From 1e1ed9817b8a287101255e852f0c427387bfa7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@tuta.io>
Date: Mon, 17 Feb 2025 14:48:03 +0100
Subject: [PATCH 06/81] Revert "Activate Khepri on CI"

This reverts commit e9e56e72847661aaf3448eac0828102af8af5ba7.
---
 ci/start-broker.sh  | 1 -
 ci/start-cluster.sh | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/ci/start-broker.sh b/ci/start-broker.sh
index 453dbc078..86d81ece9 100755
--- a/ci/start-broker.sh
+++ b/ci/start-broker.sh
@@ -37,6 +37,5 @@ docker run -d --name rabbitmq \
 
 wait_for_message rabbitmq "completed with"
 
-docker exec rabbitmq rabbitmqctl enable_feature_flag --opt-in khepri_db
 docker exec rabbitmq rabbitmq-diagnostics erlang_version
 docker exec rabbitmq rabbitmqctl version
diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh
index 2534c9bd8..efee59ee2 100755
--- a/ci/start-cluster.sh
+++ b/ci/start-cluster.sh
@@ -74,9 +74,6 @@ sleep 10
 
 docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
 
-docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
-docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
-
 docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status

From fd2ca8b1ce55255490530f6be1c8d263822c9afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@tuta.io>
Date: Mon, 17 Feb 2025 14:53:08 +0100
Subject: [PATCH 07/81] Activate Khepri on CI

(cherry picked from commit bee5a7aa51fe9452b1ec6e83a5735b9a0aa5049d)
---
 ci/start-broker.sh                                             | 1 +
 ci/start-cluster.sh                                            | 3 +++
 .../rabbitmq/client/test/functional/ConnectionRecovery.java    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/ci/start-broker.sh b/ci/start-broker.sh
index 86d81ece9..453dbc078 100755
--- a/ci/start-broker.sh
+++ b/ci/start-broker.sh
@@ -37,5 +37,6 @@ docker run -d --name rabbitmq \
 
 wait_for_message rabbitmq "completed with"
 
+docker exec rabbitmq rabbitmqctl enable_feature_flag --opt-in khepri_db
 docker exec rabbitmq rabbitmq-diagnostics erlang_version
 docker exec rabbitmq rabbitmqctl version
diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh
index efee59ee2..2534c9bd8 100755
--- a/ci/start-cluster.sh
+++ b/ci/start-cluster.sh
@@ -74,6 +74,9 @@ sleep 10
 
 docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
 
+docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
+
 docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status
diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
index 8dfb268ae..9e871e72a 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
@@ -23,6 +23,7 @@
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.client.test.TestUtils;
 import com.rabbitmq.tools.Host;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -367,6 +368,7 @@ private void testClientNamedQueueRecoveryWith(String q, boolean noWait) throws I
     }
 
     // bug 26552
+    @Disabled
     @Test public void clientNamedTransientAutoDeleteQueueAndBindingRecovery() throws IOException, InterruptedException, TimeoutException {
         String q   = UUID.randomUUID().toString();
         String x   = "tmp-fanout";

From b75b24bb7cfccde6f9843597b1d11e914c14ead1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@tuta.io>
Date: Mon, 17 Feb 2025 16:55:16 +0100
Subject: [PATCH 08/81] Disable test

(cherry picked from commit 122fdbd9bf44e6ead4b3160c7089de00b3b5f701)
---
 ci/start-broker.sh                                              | 1 +
 ci/start-cluster.sh                                             | 1 +
 .../com/rabbitmq/client/test/functional/DurableOnTransient.java | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/ci/start-broker.sh b/ci/start-broker.sh
index 453dbc078..89ab76572 100755
--- a/ci/start-broker.sh
+++ b/ci/start-broker.sh
@@ -19,6 +19,7 @@ mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/serve
 mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
 mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
 
+rm -rf rabbitmq-configuration
 mkdir -p rabbitmq-configuration/tls
 
 cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh
index 2534c9bd8..6b01992d9 100755
--- a/ci/start-cluster.sh
+++ b/ci/start-cluster.sh
@@ -19,6 +19,7 @@ mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/serve
 mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
 mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
 
+rm -rf rabbitmq-configuration
 mkdir -p rabbitmq-configuration/tls
 
 cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
diff --git a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
index 06c788da1..f807d1a5e 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.rabbitmq.client.GetResponse;
@@ -67,6 +68,7 @@ protected void releaseResources() throws IOException {
         assertNotNull(basicGet());
     }
 
+    @Disabled("Does not apply with Khepri (update datastore while second node is down)")
     @Test public void semiDurableBindingRemoval() throws IOException {
         if (clusteredConnection != null) {
             deleteExchange("x");

From fe28bec9019aabd39880490de36780bf6aec66b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 00:38:53 +0000
Subject: [PATCH 09/81] Bump com.diffplug.spotless:spotless-maven-plugin from
 2.44.2 to 2.44.3

Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.44.2 to 2.44.3.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/maven/2.44.2...maven/2.44.3)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5a4b9da24..02cfe3e66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
     <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
-    <spotless.version>2.44.2</spotless.version>
+    <spotless.version>2.44.3</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>
     <!--
     These groovy scripts are used later in this POM file to generate

From b03ff2fba473ded6c552fc6c88f8b79764c55d42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 00:24:39 +0000
Subject: [PATCH 10/81] Bump org.apache.maven.plugins:maven-compiler-plugin

Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 02cfe3e66..7c2fb7559 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <groovy.all.version>2.4.21</groovy.all.version>
     <keytool.maven.plugin.version>1.7</keytool.maven.plugin.version>
     <build.helper.maven-plugin.version>3.6.0</build.helper.maven-plugin.version>
-    <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
+    <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
     <maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     <maven.failsafe.plugin.version>3.5.2</maven.failsafe.plugin.version>

From c4daece00cbd398e8bfe80d83b526d239e2398d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 00:24:42 +0000
Subject: [PATCH 11/81] Bump org.junit:junit-bom from 5.11.4 to 5.12.0

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.11.4 to 5.12.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.11.4...r5.12.0)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 02cfe3e66..404960b93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.47.0</opentelemetry.version>
     <jackson.version>2.18.2</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.11.4</junit.jupiter.version>
+    <junit.jupiter.version>5.12.0</junit.jupiter.version>
     <mockito.version>5.15.2</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.4.3</micrometer-tracing-test.version>

From 2f88257481a876ca0ca1584a8b3a32165e989db4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Mar 2025 00:12:46 +0000
Subject: [PATCH 12/81] Bump com.fasterxml.jackson.core:jackson-databind from
 2.18.2 to 2.18.3

Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.18.2 to 2.18.3.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3a76b6c54..d00d9a757 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <metrics.version>4.2.30</metrics.version>
     <micrometer.version>1.14.4</micrometer.version>
     <opentelemetry.version>1.47.0</opentelemetry.version>
-    <jackson.version>2.18.2</jackson.version>
+    <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.0</junit.jupiter.version>
     <mockito.version>5.15.2</mockito.version>

From dee463d04455b247cf5b82d705cb3986c139375c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 00:59:43 +0000
Subject: [PATCH 13/81] Bump org.mockito:mockito-core from 5.15.2 to 5.16.0

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.15.2 to 5.16.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.15.2...v5.16.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d00d9a757..88133831b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.0</junit.jupiter.version>
-    <mockito.version>5.15.2</mockito.version>
+    <mockito.version>5.16.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.4.3</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>

From 0d6dcff57e03f990c908d4937ba9231507de50f1 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michaelklishin@icloud.com>
Date: Fri, 21 Feb 2025 20:25:08 -0500
Subject: [PATCH 14/81] Naming

(cherry picked from commit d6002229c5e54b81220fdb8150ab0c3e7b4017b5)
---
 .../impl/recovery/AutorecoveringChannel.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
index 84ceee72b..f78701ce6 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
@@ -540,9 +540,9 @@ public String basicConsume(String queue, boolean autoAck, Map<String, Object> ar
 
     @Override
     public String basicConsume(String queue, boolean autoAck, String consumerTag, boolean noLocal, boolean exclusive, Map<String, Object> arguments, Consumer callback) throws IOException {
-        final String result = delegate.basicConsume(queue, autoAck, consumerTag, noLocal, exclusive, arguments, callback);
-        recordConsumer(result, queue, autoAck, exclusive, arguments, callback);
-        return result;
+        final String tag = delegate.basicConsume(queue, autoAck, consumerTag, noLocal, exclusive, arguments, callback);
+        recordConsumer(tag, queue, autoAck, exclusive, arguments, callback);
+        return tag;
     }
 
     @Override
@@ -886,7 +886,7 @@ private void deleteRecordedExchange(String exchange) {
         this.connection.deleteRecordedExchange(exchange);
     }
 
-    private void recordConsumer(String result,
+    private void recordConsumer(String consumerTag,
                                 String queue,
                                 boolean autoAck,
                                 boolean exclusive,
@@ -894,12 +894,12 @@ private void recordConsumer(String result,
                                 Consumer callback) {
         RecordedConsumer consumer = new RecordedConsumer(this, queue).
                                             autoAck(autoAck).
-                                            consumerTag(result).
+                                            consumerTag(consumerTag).
                                             exclusive(exclusive).
                                             arguments(arguments).
                                             consumer(callback);
-        this.consumerTags.add(result);
-        this.connection.recordConsumer(result, consumer);
+        this.consumerTags.add(consumerTag);
+        this.connection.recordConsumer(consumerTag, consumer);
     }
 
     /**

From 42eebfc129af111a60aa7947d7f8f73261247b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@tuta.io>
Date: Tue, 18 Feb 2025 16:37:58 +0100
Subject: [PATCH 15/81] Use 3-node cluster in test suite

Instead of 2-node cluster. This is a more realistic scenario.

(cherry picked from commit 0adbc6f5e17ef4bf0363633b5bbb47fb93a4f1c5)

Conflicts:
	.github/workflows/test-supported-java-versions-5.x.yml
	.github/workflows/test-supported-java-versions-main.yml
	src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java
	src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java
---
 .github/workflows/test-rabbitmq-alphas.yml    |  24 +--
 .../test-supported-java-versions-5.x.yml      |  13 +-
 .../test-supported-java-versions-main.yml     |  13 +-
 .github/workflows/test.yml                    |  25 +--
 ci/_start-cluster.sh                          |  84 +++++++++++
 ci/cluster/configuration/rabbitmq.conf        |  20 +++
 ci/cluster/docker-compose.yml                 |  49 ++++++
 ci/start-broker.sh                            |  34 +++--
 ci/start-cluster.sh                           |  85 +++--------
 pom.xml                                       | 105 +------------
 .../client/AmqpClientTestExtension.java       |  77 +++-------
 .../test/functional/DurableOnTransient.java   |  25 +--
 .../client/test/ssl/TlsTestUtils.java         | 142 ++++++++++--------
 src/test/java/com/rabbitmq/tools/Host.java    |  40 ++---
 src/test/resources/config.properties          |   3 -
 src/test/resources/hare@localhost.config      |  15 --
 src/test/resources/log4j2-test.properties     |  12 --
 src/test/resources/rabbit@localhost.config    |  15 --
 18 files changed, 365 insertions(+), 416 deletions(-)
 create mode 100755 ci/_start-cluster.sh
 create mode 100644 ci/cluster/configuration/rabbitmq.conf
 create mode 100644 ci/cluster/docker-compose.yml
 delete mode 100644 src/test/resources/config.properties
 delete mode 100644 src/test/resources/hare@localhost.config
 delete mode 100644 src/test/resources/log4j2-test.properties
 delete mode 100644 src/test/resources/rabbit@localhost.config

diff --git a/.github/workflows/test-rabbitmq-alphas.yml b/.github/workflows/test-rabbitmq-alphas.yml
index e3f6a2175..934ccbbdd 100644
--- a/.github/workflows/test-rabbitmq-alphas.yml
+++ b/.github/workflows/test-rabbitmq-alphas.yml
@@ -43,19 +43,19 @@ jobs:
         run: make deps
       - name: Test with NIO
         run: |
-          ./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq \
-            -Dtest-broker.A.nodename=rabbit@$(hostname) -Dtest-broker.B.nodename=hare@$(hostname) \
+          ./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
+            -Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
             -Dmaven.javadoc.skip=true \
-            -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
             --no-transfer-progress
       - name: Test with blocking IO
         run: |
-          ./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
-          -Dtest-broker.A.nodename=rabbit@$(hostname) -Dtest-broker.B.nodename=hare@$(hostname) \
-          -Dmaven.javadoc.skip=true \
-          -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
-          --no-transfer-progress
-      - name: Stop broker A
-        run: docker stop rabbitmq && docker rm rabbitmq
-      - name: Stop broker B
-        run: docker stop hare && docker rm hare
+          ./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
+            -Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
+            -Dmaven.javadoc.skip=true \
+            --no-transfer-progress
+      - name: Stop cluster
+        run: docker compose --file ci/cluster/docker-compose.yml down
diff --git a/.github/workflows/test-supported-java-versions-5.x.yml b/.github/workflows/test-supported-java-versions-5.x.yml
index 60c09da60..bb43ce380 100644
--- a/.github/workflows/test-supported-java-versions-5.x.yml
+++ b/.github/workflows/test-supported-java-versions-5.x.yml
@@ -45,15 +45,18 @@ jobs:
         run: |
           ./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq \
             -Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
-            -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
             -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
             --no-transfer-progress
       - name: Test with blocking IO
         run: |
           ./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
-          -Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
-          -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
-          -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
-          --no-transfer-progress
+            -Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
+            -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
+            --no-transfer-progress \
+            -Dnet.bytebuddy.experimental=true
       - name: Stop broker
         run: docker stop rabbitmq && docker rm rabbitmq
diff --git a/.github/workflows/test-supported-java-versions-main.yml b/.github/workflows/test-supported-java-versions-main.yml
index e96dbc2c5..a5428233e 100644
--- a/.github/workflows/test-supported-java-versions-main.yml
+++ b/.github/workflows/test-supported-java-versions-main.yml
@@ -43,15 +43,18 @@ jobs:
         run: |
           ./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq \
             -Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
-            -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
             -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
             --no-transfer-progress
       - name: Test with blocking IO
         run: |
           ./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
-          -Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
-          -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
-          -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
-          --no-transfer-progress
+            -Dtest-broker.A.nodename=rabbit@$(hostname) -Dmaven.javadoc.skip=true \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
+            -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
+            --no-transfer-progress \
+            -Dnet.bytebuddy.experimental=true
       - name: Stop broker
         run: docker stop rabbitmq && docker rm rabbitmq
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c8b2d5101..c25e5862b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,22 +41,23 @@ jobs:
         run: make deps
       - name: Test with NIO
         run: |
-          ./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq \
-            -Dtest-broker.A.nodename=rabbit@$(hostname) -Dtest-broker.B.nodename=hare@$(hostname) \
+          ./mvnw verify -P use-nio -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
+            -Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
             -Dmaven.javadoc.skip=true \
-            -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
             --no-transfer-progress
       - name: Test with blocking IO
         run: |
-          ./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
-          -Dtest-broker.A.nodename=rabbit@$(hostname) -Dtest-broker.B.nodename=hare@$(hostname) \
-          -Dmaven.javadoc.skip=true \
-          -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
-          --no-transfer-progress
-      - name: Stop broker A
-        run: docker stop rabbitmq && docker rm rabbitmq
-      - name: Stop broker B
-        run: docker stop hare && docker rm hare
+          ./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq0 \
+            -Dtest-broker.A.nodename=rabbit@node0 -Dtest-broker.B.nodename=rabbit@node1 \
+            -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
+            -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
+            -Dmaven.javadoc.skip=true \
+            -Dtest-client-cert.password= -Dtest-tls-certs.dir=rabbitmq-configuration/tls \
+            --no-transfer-progress
+      - name: Stop cluster
+        run: docker compose --file ci/cluster/docker-compose.yml down
       - name: Publish snapshot
         if: ${{ github.event_name != 'pull_request' }}
         run: ./mvnw clean deploy -Psnapshots -DskipITs -DskipTests --no-transfer-progress
diff --git a/ci/_start-cluster.sh b/ci/_start-cluster.sh
new file mode 100755
index 000000000..6b01992d9
--- /dev/null
+++ b/ci/_start-cluster.sh
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
+
+wait_for_message() {
+  while ! docker logs "$1" | grep -q "$2";
+  do
+      sleep 5
+      echo "Waiting 5 seconds for $1 to start..."
+  done
+}
+
+make -C "${PWD}"/tls-gen/basic
+
+mv tls-gen/basic/result/server_$(hostname -s)_certificate.pem tls-gen/basic/result/server_certificate.pem
+mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/server_key.pem
+mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
+mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
+
+rm -rf rabbitmq-configuration
+mkdir -p rabbitmq-configuration/tls
+
+cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
+chmod -R o+r rabbitmq-configuration/tls/*
+chmod -R g+r rabbitmq-configuration/tls/*
+./mvnw -q clean resources:testResources -Dtest-tls-certs.dir=/etc/rabbitmq/tls
+cp target/test-classes/rabbit@localhost.config rabbitmq-configuration/rabbit@localhost.config
+cp target/test-classes/hare@localhost.config rabbitmq-configuration/hare@localhost.config
+
+echo "Running RabbitMQ ${RABBITMQ_IMAGE}"
+
+docker rm -f rabbitmq 2>/dev/null || echo "rabbitmq was not running"
+docker run -d --name rabbitmq \
+    --network host \
+    -v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \
+    --env RABBITMQ_CONFIG_FILE=/etc/rabbitmq/rabbit@localhost.config \
+    --env RABBITMQ_NODENAME=rabbit@$(hostname) \
+    --env RABBITMQ_NODE_PORT=5672 \
+    --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
+    "${RABBITMQ_IMAGE}"
+
+# for CLI commands to share the same cookie
+docker exec rabbitmq bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
+docker exec rabbitmq chmod 0600 /var/lib/rabbitmq/.erlang.cookie
+
+wait_for_message rabbitmq "completed with"
+
+docker run -d --name hare \
+    --network host \
+    -v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \
+    --env RABBITMQ_CONFIG_FILE=/etc/rabbitmq/hare@localhost.config \
+    --env RABBITMQ_NODENAME=hare@$(hostname) \
+    --env RABBITMQ_NODE_PORT=5673 \
+    --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
+    "${RABBITMQ_IMAGE}"
+
+# for CLI commands to share the same cookie
+docker exec hare bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
+docker exec hare chmod 0600 /var/lib/rabbitmq/.erlang.cookie
+
+wait_for_message hare "completed with"
+
+docker exec hare rabbitmqctl --node hare@$(hostname) status
+
+docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) is_running
+docker exec hare rabbitmq-diagnostics --node hare@$(hostname) is_running
+
+docker exec hare rabbitmqctl --node hare@$(hostname) stop_app
+docker exec hare rabbitmqctl --node hare@$(hostname) join_cluster rabbit@$(hostname)
+docker exec hare rabbitmqctl --node hare@$(hostname) start_app
+
+sleep 10
+
+docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
+
+docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
+
+docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) cluster_status
diff --git a/ci/cluster/configuration/rabbitmq.conf b/ci/cluster/configuration/rabbitmq.conf
new file mode 100644
index 000000000..652395d76
--- /dev/null
+++ b/ci/cluster/configuration/rabbitmq.conf
@@ -0,0 +1,20 @@
+cluster_formation.peer_discovery_backend  = rabbit_peer_discovery_classic_config
+cluster_formation.classic_config.nodes.1 = rabbit@node0
+cluster_formation.classic_config.nodes.2 = rabbit@node1
+cluster_formation.classic_config.nodes.3 = rabbit@node2
+loopback_users = none
+
+listeners.ssl.default = 5671
+
+ssl_options.cacertfile = /etc/rabbitmq/tls/ca_certificate.pem
+ssl_options.certfile   = /etc/rabbitmq/tls/server_certificate.pem
+ssl_options.keyfile    = /etc/rabbitmq/tls/server_key.pem
+ssl_options.verify     = verify_peer
+ssl_options.fail_if_no_peer_cert = false
+ssl_options.honor_cipher_order   = true
+
+auth_mechanisms.1 = PLAIN
+auth_mechanisms.2 = ANONYMOUS
+auth_mechanisms.3 = AMQPLAIN
+auth_mechanisms.4 = EXTERNAL
+auth_mechanisms.5 = RABBIT-CR-DEMO
diff --git a/ci/cluster/docker-compose.yml b/ci/cluster/docker-compose.yml
new file mode 100644
index 000000000..2d438519b
--- /dev/null
+++ b/ci/cluster/docker-compose.yml
@@ -0,0 +1,49 @@
+services:
+  node0:
+    environment:
+      - RABBITMQ_ERLANG_COOKIE='secret_cookie'
+    networks:
+      - rabbitmq-cluster
+    hostname: node0
+    container_name: rabbitmq0
+    image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
+    pull_policy: always
+    ports:
+      - "5672:5672"
+      - "5671:5671"
+    tty: true
+    volumes:
+      - ./configuration/:/etc/rabbitmq/
+      - ../../rabbitmq-configuration/tls:/etc/rabbitmq/tls/
+  node1:
+    environment:
+      - RABBITMQ_ERLANG_COOKIE='secret_cookie'
+    networks:
+      - rabbitmq-cluster
+    hostname: node1
+    container_name: rabbitmq1
+    image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
+    pull_policy: always
+    ports:
+      - "5673:5672"
+    tty: true
+    volumes:
+      - ./configuration/:/etc/rabbitmq/
+      - ../../rabbitmq-configuration/tls:/etc/rabbitmq/tls/
+  node2:
+    environment:
+      - RABBITMQ_ERLANG_COOKIE='secret_cookie'
+    networks:
+      - rabbitmq-cluster
+    hostname: node2
+    container_name: rabbitmq2
+    image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
+    pull_policy: always
+    ports:
+      - "5674:5672"
+    tty: true
+    volumes:
+      - ./configuration/:/etc/rabbitmq/
+      - ../../rabbitmq-configuration/tls:/etc/rabbitmq/tls/
+networks:
+  rabbitmq-cluster:
diff --git a/ci/start-broker.sh b/ci/start-broker.sh
index 89ab76572..ad13368cf 100755
--- a/ci/start-broker.sh
+++ b/ci/start-broker.sh
@@ -12,21 +12,33 @@ wait_for_message() {
   done
 }
 
-make -C "${PWD}"/tls-gen/basic
+rm -rf rabbitmq-configuration
+mkdir -p rabbitmq-configuration/tls
 
-mv tls-gen/basic/result/server_$(hostname -s)_certificate.pem tls-gen/basic/result/server_certificate.pem
-mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/server_key.pem
-mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
-mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
+make -C "${PWD}"/tls-gen/basic
 
 rm -rf rabbitmq-configuration
 mkdir -p rabbitmq-configuration/tls
-
-cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
-chmod -R o+r rabbitmq-configuration/tls/*
-chmod -R g+r rabbitmq-configuration/tls/*
-./mvnw -q clean resources:testResources -Dtest-tls-certs.dir=/etc/rabbitmq/tls
-cp target/test-classes/rabbit@localhost.config rabbitmq-configuration/rabbitmq.config
+cp -R "${PWD}"/tls-gen/basic/result/* rabbitmq-configuration/tls
+chmod o+r rabbitmq-configuration/tls/*
+chmod g+r rabbitmq-configuration/tls/*
+
+echo "loopback_users = none
+
+listeners.ssl.default = 5671
+
+ssl_options.cacertfile = /etc/rabbitmq/tls/ca_certificate.pem
+ssl_options.certfile   = /etc/rabbitmq/tls/server_$(hostname)_certificate.pem
+ssl_options.keyfile    = /etc/rabbitmq/tls/server_$(hostname)_key.pem
+ssl_options.verify     = verify_peer
+ssl_options.fail_if_no_peer_cert = false
+ssl_options.honor_cipher_order   = true
+
+auth_mechanisms.1 = PLAIN
+auth_mechanisms.2 = ANONYMOUS
+auth_mechanisms.3 = AMQPLAIN
+auth_mechanisms.4 = EXTERNAL
+auth_mechanisms.5 = RABBIT-CR-DEMO" >> rabbitmq-configuration/rabbitmq.conf
 
 echo "Running RabbitMQ ${RABBITMQ_IMAGE}"
 
diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh
index 6b01992d9..85a8ce5c1 100755
--- a/ci/start-cluster.sh
+++ b/ci/start-cluster.sh
@@ -1,84 +1,39 @@
 #!/usr/bin/env bash
 
-LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
+export RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
 
 wait_for_message() {
   while ! docker logs "$1" | grep -q "$2";
   do
-      sleep 5
-      echo "Waiting 5 seconds for $1 to start..."
+      sleep 2
+      echo "Waiting 2 seconds for $1 to start..."
   done
 }
 
-make -C "${PWD}"/tls-gen/basic
-
-mv tls-gen/basic/result/server_$(hostname -s)_certificate.pem tls-gen/basic/result/server_certificate.pem
-mv tls-gen/basic/result/server_$(hostname -s)_key.pem tls-gen/basic/result/server_key.pem
-mv tls-gen/basic/server_$(hostname -s) tls-gen/basic/server
-mv tls-gen/basic/client_$(hostname -s) tls-gen/basic/client
-
 rm -rf rabbitmq-configuration
 mkdir -p rabbitmq-configuration/tls
 
-cp -R "${PWD}"/tls-gen/basic/* rabbitmq-configuration/tls
-chmod -R o+r rabbitmq-configuration/tls/*
-chmod -R g+r rabbitmq-configuration/tls/*
-./mvnw -q clean resources:testResources -Dtest-tls-certs.dir=/etc/rabbitmq/tls
-cp target/test-classes/rabbit@localhost.config rabbitmq-configuration/rabbit@localhost.config
-cp target/test-classes/hare@localhost.config rabbitmq-configuration/hare@localhost.config
-
-echo "Running RabbitMQ ${RABBITMQ_IMAGE}"
-
-docker rm -f rabbitmq 2>/dev/null || echo "rabbitmq was not running"
-docker run -d --name rabbitmq \
-    --network host \
-    -v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \
-    --env RABBITMQ_CONFIG_FILE=/etc/rabbitmq/rabbit@localhost.config \
-    --env RABBITMQ_NODENAME=rabbit@$(hostname) \
-    --env RABBITMQ_NODE_PORT=5672 \
-    --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
-    "${RABBITMQ_IMAGE}"
-
-# for CLI commands to share the same cookie
-docker exec rabbitmq bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
-docker exec rabbitmq chmod 0600 /var/lib/rabbitmq/.erlang.cookie
-
-wait_for_message rabbitmq "completed with"
-
-docker run -d --name hare \
-    --network host \
-    -v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \
-    --env RABBITMQ_CONFIG_FILE=/etc/rabbitmq/hare@localhost.config \
-    --env RABBITMQ_NODENAME=hare@$(hostname) \
-    --env RABBITMQ_NODE_PORT=5673 \
-    --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
-    "${RABBITMQ_IMAGE}"
-
-# for CLI commands to share the same cookie
-docker exec hare bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
-docker exec hare chmod 0600 /var/lib/rabbitmq/.erlang.cookie
-
-wait_for_message hare "completed with"
+make -C "${PWD}"/tls-gen/basic
 
-docker exec hare rabbitmqctl --node hare@$(hostname) status
+rm -rf rabbitmq-configuration
+mkdir -p rabbitmq-configuration/tls
+cp -R "${PWD}"/tls-gen/basic/result/* rabbitmq-configuration/tls
+mv rabbitmq-configuration/tls/server_$(hostname)_certificate.pem rabbitmq-configuration/tls/server_certificate.pem
+mv rabbitmq-configuration/tls/server_$(hostname)_key.pem rabbitmq-configuration/tls/server_key.pem
+chmod o+r rabbitmq-configuration/tls/*
+chmod g+r rabbitmq-configuration/tls/*
 
-docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) is_running
-docker exec hare rabbitmq-diagnostics --node hare@$(hostname) is_running
+docker compose --file ci/cluster/docker-compose.yml down
+docker compose --file ci/cluster/docker-compose.yml up --detach
 
-docker exec hare rabbitmqctl --node hare@$(hostname) stop_app
-docker exec hare rabbitmqctl --node hare@$(hostname) join_cluster rabbit@$(hostname)
-docker exec hare rabbitmqctl --node hare@$(hostname) start_app
+wait_for_message rabbitmq0 "completed with"
 
-sleep 10
+docker exec rabbitmq0 rabbitmqctl await_online_nodes 3
 
-docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
+docker exec rabbitmq0 rabbitmqctl enable_feature_flag --opt-in khepri_db
+docker exec rabbitmq1 rabbitmqctl enable_feature_flag --opt-in khepri_db
+docker exec rabbitmq2 rabbitmqctl enable_feature_flag --opt-in khepri_db
 
-docker exec hare rabbitmqctl --node hare@$(hostname) enable_feature_flag --opt-in khepri_db
-docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) enable_feature_flag --opt-in khepri_db
+docker exec rabbitmq0 rabbitmqctl cluster_status
 
-docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
-docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
-docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status
-docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) cluster_status
+docker compose --file ci/cluster/docker-compose.yml ps
diff --git a/pom.xml b/pom.xml
index 88133831b..07841d3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@
     <maven.source.plugin.version>3.3.1</maven.source.plugin.version>
     <groovy.maven.plugin.version>2.1.1</groovy.maven.plugin.version>
     <groovy.all.version>2.4.21</groovy.all.version>
-    <keytool.maven.plugin.version>1.7</keytool.maven.plugin.version>
     <build.helper.maven-plugin.version>3.6.0</build.helper.maven-plugin.version>
     <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
     <maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
@@ -117,16 +116,10 @@
     <rabbitmq.dir>${deps.dir}/rabbit</rabbitmq.dir>
     <rabbitmqctl.bin>${rabbitmq.dir}/scripts/rabbitmqctl</rabbitmqctl.bin>
 
-    <test-keystore.ca>${project.build.directory}/ca.keystore</test-keystore.ca>
-    <test-keystore.empty>${project.build.directory}/empty.keystore</test-keystore.empty>
-    <test-keystore.password>bunnies</test-keystore.password>
-
     <test-broker.A.nodename>rabbit@localhost</test-broker.A.nodename>
     <test-broker.A.node_port>5672</test-broker.A.node_port>
-    <test-broker.A.config_file>${project.build.directory}/test-classes/${test-broker.A.nodename}</test-broker.A.config_file>
-    <test-broker.B.nodename>hare@localhost</test-broker.B.nodename>
+    <test-broker.B.nodename>rabbit@node1</test-broker.B.nodename>
     <test-broker.B.node_port>5673</test-broker.B.node_port>
-    <test-broker.B.config_file>${project.build.directory}/test-classes/${test-broker.B.nodename}</test-broker.B.config_file>
 
     <!-- to sign artifacts when releasing -->
     <gpg.keyname>6026DFCA</gpg.keyname>
@@ -185,35 +178,6 @@
       </properties>
     </profile>
 
-    <profile>
-      <!--
-      If the caller decided to provide an external RabbitMQ
-      broker/cluster, he can specify the path to his test TLS
-      certificates with the ${test-tls-certs.dir} property.
-
-      Thus, if the CA certificate exists, we also enable the generation
-      of the two Java keystores.
-      -->
-      <id>use-provided-test-keystores</id>
-      <activation>
-        <file>
-          <exists>${test-tls-certs.dir}/testca/cacert.pem</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>keytool-maven-plugin</artifactId>
-            <version>${keytool.maven.plugin.version}</version>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <!--
       Tests are integration tests, not unit tests, because they depend
@@ -245,18 +209,10 @@
                 <rabbitmq.dir>${rabbitmq.dir}</rabbitmq.dir>
                 <rabbitmqctl.bin>${rabbitmqctl.bin}</rabbitmqctl.bin>
 
-                <test-keystore.ca>${test-keystore.ca}</test-keystore.ca>
-                <test-keystore.empty>${test-keystore.empty}</test-keystore.empty>
-                <test-keystore.password>${test-keystore.password}</test-keystore.password>
-                <test-client-cert.path>${test-tls-certs.dir}/client/keycert.p12</test-client-cert.path>
-                <test-client-cert.password>changeme</test-client-cert.password>
-
                 <test-broker.A.nodename>${test-broker.A.nodename}</test-broker.A.nodename>
                 <test-broker.A.node_port>${test-broker.A.node_port}</test-broker.A.node_port>
-                <test-broker.A.config_file>${test-broker.A.config_file}</test-broker.A.config_file>
                 <test-broker.B.nodename>${test-broker.B.nodename}</test-broker.B.nodename>
                 <test-broker.B.node_port>${test-broker.B.node_port}</test-broker.B.node_port>
-                <test-broker.B.config_file>${test-broker.B.config_file}</test-broker.B.config_file>
               </systemPropertyVariables>
               <environmentVariables>
                 <DEPS_DIR>${deps.dir}</DEPS_DIR>
@@ -773,24 +729,6 @@
               </source>
             </configuration>
           </execution>
-
-          <!--
-          We always remove the generated Java keystores because
-          keytool(1) complains if the destination file already exists
-          with the content we want to import.
-          -->
-          <execution>
-            <phase>generate-test-resources</phase>
-            <id>remove-old-test-keystores</id>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>
-                ${groovy-scripts.dir}/remove_old_test_keystores.groovy
-              </source>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
 
@@ -840,47 +778,6 @@
         </configuration>
       </plugin>
 
-      <!-- Generate two Java keystores for the SSLTests testsuite. -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>keytool-maven-plugin</artifactId>
-        <version>${keytool.maven.plugin.version}</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-test-ca-keystore</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>importCertificate</goal>
-            </goals>
-            <configuration>
-              <file>${test-tls-certs.dir}/testca/cacert.pem</file>
-              <keystore>${test-keystore.ca}</keystore>
-              <storepass>${test-keystore.password}</storepass>
-              <noprompt>true</noprompt>
-              <alias>server1</alias>
-            </configuration>
-          </execution>
-          <execution>
-            <id>generate-test-empty-keystore</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>importCertificate</goal>
-              <goal>deleteAlias</goal>
-            </goals>
-            <configuration>
-              <file>${test-tls-certs.dir}/testca/cacert.pem</file>
-              <keystore>${test-keystore.empty}</keystore>
-              <storepass>${test-keystore.password}</storepass>
-              <noprompt>true</noprompt>
-              <alias>server1</alias>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java b/src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java
index bd41d2a2c..dcffa744b 100644
--- a/src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java
+++ b/src/test/java/com/rabbitmq/client/AmqpClientTestExtension.java
@@ -1,4 +1,5 @@
-// Copyright (c) 2023-2024 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+// Copyright (c) 2023-2025 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom
+// Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2
@@ -24,9 +25,7 @@
 import com.rabbitmq.client.test.server.ServerTestSuite;
 import com.rabbitmq.client.test.ssl.SslTestSuite;
 import com.rabbitmq.tools.Host;
-import java.io.File;
 import java.net.Socket;
-import java.util.Properties;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -36,31 +35,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AmqpClientTestExtension implements ExecutionCondition, BeforeAllCallback,
-    BeforeEachCallback,
-    AfterEachCallback {
+public class AmqpClientTestExtension
+    implements ExecutionCondition, BeforeAllCallback, BeforeEachCallback, AfterEachCallback {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(AmqpClientTestExtension.class);
 
-  static {
-    Properties TESTS_PROPS = new Properties(System.getProperties());
-    String make = System.getenv("MAKE");
-    if (make != null) {
-      TESTS_PROPS.setProperty("make.bin", make);
-    }
-    try {
-      TESTS_PROPS.load(Host.class.getClassLoader().getResourceAsStream("config.properties"));
-    } catch (Exception e) {
-      System.out.println(
-          "\"build.properties\" or \"config.properties\" not found" +
-              " in classpath. Please copy \"build.properties\" and" +
-              " \"config.properties\" into src/test/resources. Ignore" +
-              " this message if running with ant.");
-    } finally {
-      System.setProperties(TESTS_PROPS);
-    }
-  }
-
   private static boolean isFunctionalSuite(ExtensionContext context) {
     return isTestSuite(context, FunctionalTestSuite.class);
   }
@@ -86,8 +65,7 @@ public static boolean requiredProperties() {
     String rabbitmqctl = Host.rabbitmqctlCommand();
     if (rabbitmqctl == null) {
       System.err.println(
-          "rabbitmqctl required; please set \"rabbitmqctl.bin\" system" +
-              " property");
+          "rabbitmqctl required; please set \"rabbitmqctl.bin\" system" + " property");
       return false;
     }
 
@@ -95,20 +73,7 @@ public static boolean requiredProperties() {
   }
 
   public static boolean isSSLAvailable() {
-    String sslClientCertsDir = System.getProperty("test-client-cert.path");
-    String hostname = System.getProperty("broker.hostname");
-    String port = System.getProperty("broker.sslport");
-    if (sslClientCertsDir == null || hostname == null || port == null) {
-      return false;
-    }
-
-    // If certificate is present and some server is listening on port 5671
-    if (new File(sslClientCertsDir).exists() &&
-        checkServerListening(hostname, Integer.parseInt(port))) {
-      return true;
-    } else {
-      return false;
-    }
+    return checkServerListening("localhost", 5671);
   }
 
   private static boolean checkServerListening(String host, int port) {
@@ -132,40 +97,42 @@ private static boolean checkServerListening(String host, int port) {
   public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
     // HA test suite must be checked first because it contains other test suites
     if (isHaSuite(context)) {
-      return requiredProperties() ? enabled("Required properties available")
+      return requiredProperties()
+          ? enabled("Required properties available")
           : disabled("Required properties not available");
     } else if (isServerSuite(context)) {
-      return requiredProperties() ? enabled("Required properties available")
+      return requiredProperties()
+          ? enabled("Required properties available")
           : disabled("Required properties not available");
     } else if (isFunctionalSuite(context)) {
-      return requiredProperties() ? enabled("Required properties available")
+      return requiredProperties()
+          ? enabled("Required properties available")
           : disabled("Required properties not available");
     } else if (isSslSuite(context)) {
-      return requiredProperties() && isSSLAvailable() ? enabled(
-          "Required properties and TLS available")
+      return requiredProperties() && isSSLAvailable()
+          ? enabled("Required properties and TLS available")
           : disabled("Required properties or TLS not available");
     }
     return enabled("ok");
   }
 
   @Override
-  public void beforeAll(ExtensionContext context) {
-
-  }
+  public void beforeAll(ExtensionContext context) {}
 
   @Override
   public void beforeEach(ExtensionContext context) {
     LOGGER.info(
         "Starting test: {}.{} (nio? {})",
-        context.getTestClass().get().getSimpleName(), context.getTestMethod().get().getName(),
-        TestUtils.USE_NIO
-    );
+        context.getTestClass().get().getSimpleName(),
+        context.getTestMethod().get().getName(),
+        TestUtils.USE_NIO);
   }
 
   @Override
   public void afterEach(ExtensionContext context) {
-    LOGGER.info("Test finished: {}.{}",
-        context.getTestClass().get().getSimpleName(), context.getTestMethod().get().getName());
+    LOGGER.info(
+        "Test finished: {}.{}",
+        context.getTestClass().get().getSimpleName(),
+        context.getTestMethod().get().getName());
   }
-
 }
diff --git a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
index f807d1a5e..767e32df0 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/DurableOnTransient.java
@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.rabbitmq.client.GetResponse;
@@ -68,7 +67,6 @@ protected void releaseResources() throws IOException {
         assertNotNull(basicGet());
     }
 
-    @Disabled("Does not apply with Khepri (update datastore while second node is down)")
     @Test public void semiDurableBindingRemoval() throws IOException {
         if (clusteredConnection != null) {
             deleteExchange("x");
@@ -78,18 +76,25 @@ protected void releaseResources() throws IOException {
             channel.queueBind("q", "x", "k");
 
             stopSecondary();
+            boolean restarted = false;
+            try {
+                deleteExchange("x");
 
-            deleteExchange("x");
-
-            startSecondary();
+                startSecondary();
+                restarted = true;
 
-            declareTransientTopicExchange("x");
+                declareTransientTopicExchange("x");
 
-            basicPublishVolatile("x", "k");
-            assertDelivered("q", 0);
+                basicPublishVolatile("x", "k");
+                assertDelivered("q", 0);
 
-            deleteQueue("q");
-            deleteExchange("x");
+                deleteQueue("q");
+                deleteExchange("x");
+            } finally {
+                if (!restarted) {
+                    startSecondary();
+                }
+            }
         }
     }
 }
diff --git a/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java
index 65815d422..f85829c11 100644
--- a/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java
+++ b/src/test/java/com/rabbitmq/client/test/ssl/TlsTestUtils.java
@@ -1,4 +1,5 @@
-// Copyright (c) 2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+// Copyright (c) 2007-2025 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom
+// Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2
@@ -15,82 +16,38 @@
 
 package com.rabbitmq.client.test.ssl;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
+import com.rabbitmq.tools.Host;
 import java.io.FileInputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collectors;
-import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 
 class TlsTestUtils {
 
+  static final String[] PROTOCOLS = new String[] {"TLSv1.3", "TLSv1.2"};
+
   private TlsTestUtils() {}
 
   static SSLContext badVerifiedSslContext() throws Exception {
-    return verifiedSslContext(() -> getSSLContext(), emptyKeystoreCa());
+    return sslContext(trustManagerFactory(clientCertificate()));
   }
 
   static SSLContext verifiedSslContext() throws Exception {
-    return verifiedSslContext(() -> getSSLContext(), keystoreCa());
-  }
-
-  static SSLContext verifiedSslContext(CallableSupplier<SSLContext> sslContextSupplier) throws Exception {
-    return verifiedSslContext(sslContextSupplier, keystoreCa());
-  }
-
-  static SSLContext verifiedSslContext(CallableSupplier<SSLContext> sslContextSupplier, String keystorePath) throws Exception {
-    // for local testing, run ./mvnw test-compile -Dtest-tls-certs.dir=/tmp/tls-gen/basic
-    // (generates the Java keystores)
-    assertNotNull(keystorePath);
-    String keystorePasswd = keystorePassword();
-    assertNotNull(keystorePasswd);
-    char [] keystorePassword = keystorePasswd.toCharArray();
-
-    KeyStore tks = KeyStore.getInstance("JKS");
-    tks.load(new FileInputStream(keystorePath), keystorePassword);
-
-    TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-    tmf.init(tks);
-
-    String p12Path = clientCertPath();
-    assertNotNull(p12Path);
-    String p12Passwd = clientCertPassword();
-    assertNotNull(p12Passwd);
-    KeyStore ks = KeyStore.getInstance("PKCS12");
-    char [] p12Password = p12Passwd.toCharArray();
-    ks.load(new FileInputStream(p12Path), p12Password);
-
-    KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-    kmf.init(ks, p12Password);
-
-    SSLContext c = sslContextSupplier.get();
-    c.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-    return c;
+    return sslContext(trustManagerFactory(caCertificate()));
   }
 
-  static String keystoreCa() {
-    return System.getProperty("test-keystore.ca", "./target/ca.keystore");
-  }
-
-  static String emptyKeystoreCa() {
-    return System.getProperty("test-keystore.empty", "./target/empty.keystore");
-  }
-
-  static String keystorePassword() {
-    return System.getProperty("test-keystore.password", "bunnies");
-  }
-
-  static String clientCertPath() {
-    return System.getProperty("test-client-cert.path", "/tmp/tls-gen/basic/client/keycert.p12");
-  }
-
-  static String clientCertPassword() {
-    return System.getProperty("test-client-cert.password", "");
+  static SSLContext verifiedSslContext(CallableSupplier<SSLContext> sslContextSupplier)
+      throws Exception {
+    return sslContext(sslContextSupplier, trustManagerFactory(caCertificate()));
   }
 
   public static SSLContext getSSLContext() throws NoSuchAlgorithmException {
@@ -112,15 +69,78 @@ public static SSLContext getSSLContext() throws NoSuchAlgorithmException {
   static Collection<String> availableTlsProtocols() {
     try {
       String[] protocols = SSLContext.getDefault().getSupportedSSLParameters().getProtocols();
-      return Arrays.stream(protocols).filter(p -> p.toLowerCase().startsWith("tls")).collect(
-          Collectors.toList());
+      return Arrays.stream(protocols)
+          .filter(p -> p.toLowerCase().startsWith("tls"))
+          .collect(Collectors.toList());
     } catch (NoSuchAlgorithmException e) {
       throw new RuntimeException(e);
     }
   }
 
+  static SSLContext sslContext(TrustManagerFactory trustManagerFactory) throws Exception {
+    return sslContext(() -> SSLContext.getInstance(PROTOCOLS[0]), trustManagerFactory);
+  }
+
+  static SSLContext sslContext(
+      CallableSupplier<SSLContext> sslContextSupplier, TrustManagerFactory trustManagerFactory)
+      throws Exception {
+    SSLContext sslContext = sslContextSupplier.get();
+    sslContext.init(
+        null, trustManagerFactory == null ? null : trustManagerFactory.getTrustManagers(), null);
+    return sslContext;
+  }
+
+  static TrustManagerFactory trustManagerFactory(Certificate certificate) throws Exception {
+    KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+    keyStore.load(null, null);
+    keyStore.setCertificateEntry("some-certificate", certificate);
+    TrustManagerFactory trustManagerFactory =
+        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+    trustManagerFactory.init(keyStore);
+    return trustManagerFactory;
+  }
+
+  static X509Certificate caCertificate() throws Exception {
+    return loadCertificate(caCertificateFile());
+  }
+
+  static String caCertificateFile() {
+    return tlsArtefactPath(
+        System.getProperty("ca.certificate", "./rabbitmq-configuration/tls/ca_certificate.pem"));
+  }
+
+  static X509Certificate clientCertificate() throws Exception {
+    return loadCertificate(clientCertificateFile());
+  }
+
+  static String clientCertificateFile() {
+    return tlsArtefactPath(
+        System.getProperty(
+            "client.certificate",
+            "./rabbitmq-configuration/tls/client_" + hostname() + "_certificate.pem"));
+  }
+
+  static X509Certificate loadCertificate(String file) throws Exception {
+    try (FileInputStream inputStream = new FileInputStream(file)) {
+      CertificateFactory fact = CertificateFactory.getInstance("X.509");
+      return (X509Certificate) fact.generateCertificate(inputStream);
+    }
+  }
+
+  private static String tlsArtefactPath(String in) {
+    return in.replace("$(hostname)", hostname()).replace("$(hostname -s)", hostname());
+  }
+
+  private static String hostname() {
+    try {
+      return InetAddress.getLocalHost().getHostName();
+    } catch (UnknownHostException e) {
+      return Host.hostname();
+    }
+  }
+
   @FunctionalInterface
-  interface CallableSupplier <T> {
+  interface CallableSupplier<T> {
 
     T get() throws Exception;
   }
diff --git a/src/test/java/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java
index 96cf6b0da..5304e120c 100644
--- a/src/test/java/com/rabbitmq/tools/Host.java
+++ b/src/test/java/com/rabbitmq/tools/Host.java
@@ -42,6 +42,14 @@ public class Host {
     private static final String DOCKER_PREFIX = "DOCKER:";
     private static final Pattern CONNECTION_NAME_PATTERN = Pattern.compile("\"connection_name\",\"(?<name>[a-zA-Z0-9\\-]+)?\"");
 
+    public static String hostname() {
+      try {
+        return executeCommand("hostname").output();
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
     public static String capture(InputStream is)
         throws IOException
     {
@@ -189,17 +197,6 @@ public static void clearResourceAlarm(String source) throws IOException {
         rabbitmqctl("eval 'rabbit_alarm:clear_alarm({resource_limit, " + source + ", node()}).'");
     }
 
-    public static ProcessState invokeMakeTarget(String command) throws IOException {
-        File rabbitmqctl = new File(rabbitmqctlCommand());
-        return executeCommand(makeCommand() +
-                              " -C \'" + rabbitmqDir() + "\'" +
-                              " RABBITMQCTL=\'" + rabbitmqctl.getAbsolutePath() + "\'" +
-                              " RABBITMQ_NODENAME=\'" + nodenameA() + "\'" +
-                              " RABBITMQ_NODE_PORT=" + node_portA() +
-                              " RABBITMQ_CONFIG_FILE=\'" + config_fileA() + "\'" +
-                              " " + command);
-    }
-
     public static void startRabbitOnNode() throws IOException {
         rabbitmqctl("start_app");
         tryConnectFor(10_000);
@@ -210,7 +207,7 @@ public static void stopRabbitOnNode() throws IOException {
     }
 
     public static void tryConnectFor(int timeoutInMs) throws IOException {
-        tryConnectFor(timeoutInMs, node_portA() == null ? 5672 : Integer.valueOf(node_portA()));
+        tryConnectFor(timeoutInMs, 5672);
     }
 
     public static void tryConnectFor(int timeoutInMs, int port) throws IOException {
@@ -245,15 +242,6 @@ public static String nodenameA()
         return System.getProperty("test-broker.A.nodename");
     }
 
-    public static String node_portA()
-    {
-        return System.getProperty("test-broker.A.node_port");
-    }
-
-    public static String config_fileA()
-    {
-        return System.getProperty("test-broker.A.config_file");
-    }
 
     public static String nodenameB()
     {
@@ -265,11 +253,6 @@ public static String node_portB()
         return System.getProperty("test-broker.B.node_port");
     }
 
-    public static String config_fileB()
-    {
-        return System.getProperty("test-broker.B.config_file");
-    }
-
     public static String rabbitmqctlCommand() {
         String rabbitmqCtl = System.getProperty("rabbitmqctl.bin");
         if (rabbitmqCtl == null) {
@@ -291,11 +274,6 @@ public static boolean isOnDocker() {
         return rabbitmqCtl.startsWith(DOCKER_PREFIX);
     }
 
-    public static String rabbitmqDir()
-    {
-        return System.getProperty("rabbitmq.dir");
-    }
-
     public static void closeConnection(String pid) throws IOException {
         rabbitmqctl("close_connection '" + pid + "' 'Closed via rabbitmqctl'");
     }
diff --git a/src/test/resources/config.properties b/src/test/resources/config.properties
deleted file mode 100644
index 6562e2f80..000000000
--- a/src/test/resources/config.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-broker.hostname=localhost
-broker.port=5672
-broker.sslport=5671
diff --git a/src/test/resources/hare@localhost.config b/src/test/resources/hare@localhost.config
deleted file mode 100644
index 41667a9c7..000000000
--- a/src/test/resources/hare@localhost.config
+++ /dev/null
@@ -1,15 +0,0 @@
-% vim:ft=erlang:
-
-[
-  {rabbit, [
-      {ssl_listeners, [5670]},
-      {ssl_options, [
-          {cacertfile, "${test-tls-certs.dir}/testca/cacert.pem"},
-          {certfile,   "${test-tls-certs.dir}/server/cert.pem"},
-          {keyfile,    "${test-tls-certs.dir}/server/key.pem"},
-          {verify, verify_peer},
-          {fail_if_no_peer_cert, false},
-          {honor_cipher_order, true}]},
-      {auth_mechanisms, ['PLAIN', 'ANONYMOUS', 'AMQPLAIN', 'EXTERNAL', 'RABBIT-CR-DEMO']}
-    ]}
-].
diff --git a/src/test/resources/log4j2-test.properties b/src/test/resources/log4j2-test.properties
deleted file mode 100644
index b7e0a6869..000000000
--- a/src/test/resources/log4j2-test.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-status = error
-dest = err
-name = PropertiesConfig
-
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %m%n
-
-logger.com.rabbitmq.level = info
-rootLogger.level = error
-rootLogger.appenderRef.stdout.ref = STDOUT
\ No newline at end of file
diff --git a/src/test/resources/rabbit@localhost.config b/src/test/resources/rabbit@localhost.config
deleted file mode 100644
index 9e3b77c94..000000000
--- a/src/test/resources/rabbit@localhost.config
+++ /dev/null
@@ -1,15 +0,0 @@
-% vim:ft=erlang:
-
-[
-  {rabbit, [
-      {ssl_listeners, [5671]},
-      {ssl_options, [
-          {cacertfile, "${test-tls-certs.dir}/testca/cacert.pem"},
-          {certfile,   "${test-tls-certs.dir}/server/cert.pem"},
-          {keyfile,    "${test-tls-certs.dir}/server/key.pem"},
-          {verify, verify_peer},
-          {fail_if_no_peer_cert, false},
-          {honor_cipher_order, true}]},
-      {auth_mechanisms, ['PLAIN', 'ANONYMOUS', 'AMQPLAIN', 'EXTERNAL', 'RABBIT-CR-DEMO']}
-    ]}
-].

From 0b0cc0adfb5f10b87fcbd3390ad867d00d602c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@tuta.io>
Date: Wed, 19 Feb 2025 14:35:16 +0100
Subject: [PATCH 16/81] Delete TLS-related groovy scripts

(cherry picked from commit 5da298c3f89759040dc4465e467af4d97dcb8704)
---
 .../scripts/query_test_tls_certs_dir.groovy   | 25 -------------------
 .../scripts/remove_old_test_keystores.groovy  |  8 ------
 2 files changed, 33 deletions(-)
 delete mode 100644 src/main/scripts/query_test_tls_certs_dir.groovy
 delete mode 100644 src/main/scripts/remove_old_test_keystores.groovy

diff --git a/src/main/scripts/query_test_tls_certs_dir.groovy b/src/main/scripts/query_test_tls_certs_dir.groovy
deleted file mode 100644
index 2c86bb8c1..000000000
--- a/src/main/scripts/query_test_tls_certs_dir.groovy
+++ /dev/null
@@ -1,25 +0,0 @@
-String[] command = [
-  properties['make.bin'],
-  '-C', properties['rabbitmq.dir'],
-  '--no-print-directory',
-  'show-test-tls-certs-dir',
-  "DEPS_DIR=${properties['deps.dir']}",
-]
-
-def pb = new ProcessBuilder(command)
-pb.redirectErrorStream(true)
-
-def process = pb.start()
-
-// We are only interested in the last line of output. Previous lines, if
-// any, are related to the generation of the test certificates.
-def whole_output = ""
-process.inputStream.eachLine {
-  whole_output += it
-  project.properties['test-tls-certs.dir'] = it.trim()
-}
-process.waitFor()
-if (process.exitValue() != 0) {
-  println(whole_output.trim())
-  fail("Failed to query test TLS certs directory with command: ${command.join(' ')}")
-}
diff --git a/src/main/scripts/remove_old_test_keystores.groovy b/src/main/scripts/remove_old_test_keystores.groovy
deleted file mode 100644
index e08775e4e..000000000
--- a/src/main/scripts/remove_old_test_keystores.groovy
+++ /dev/null
@@ -1,8 +0,0 @@
-def dir = new File(project.build.directory)
-
-// This pattern starts with `.*`. This is normally useless and even
-// inefficient but the matching doesn't work without it...
-def pattern = ~/.*\.keystore$/
-dir.eachFileMatch(pattern) { file ->
-  file.delete()
-}

From 847fcda2879f9f9ba6dd507a927c06582bdfd469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@tuta.io>
Date: Fri, 21 Feb 2025 16:53:18 +0100
Subject: [PATCH 17/81] Set loopback users back to initial value after test

(cherry picked from commit 46b245f3601df40444687d08c630b958d57191ee)
---
 .../test/functional/ConnectionRecovery.java   |  2 --
 .../client/test/server/LoopbackUsers.java     | 22 ++++++++++++++-----
 src/test/java/com/rabbitmq/tools/Host.java    |  4 ++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
index 9e871e72a..8dfb268ae 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
@@ -23,7 +23,6 @@
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.client.test.TestUtils;
 import com.rabbitmq.tools.Host;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -368,7 +367,6 @@ private void testClientNamedQueueRecoveryWith(String q, boolean noWait) throws I
     }
 
     // bug 26552
-    @Disabled
     @Test public void clientNamedTransientAutoDeleteQueueAndBindingRecovery() throws IOException, InterruptedException, TimeoutException {
         String q   = UUID.randomUUID().toString();
         String x   = "tmp-fanout";
diff --git a/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java b/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java
index 813e4d23f..e3bd70a7b 100644
--- a/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java
+++ b/src/test/java/com/rabbitmq/client/test/server/LoopbackUsers.java
@@ -48,14 +48,26 @@ public class LoopbackUsers {
     @Test public void loopback() throws IOException, TimeoutException {
 	      if (!Host.isOnDocker()) {
             String addr = findRealIPAddress().getHostAddress();
-            assertGuestFail(addr);
-            Host.rabbitmqctl("eval 'application:set_env(rabbit, loopback_users, []).'");
-            assertGuestSucceed(addr);
-            Host.rabbitmqctl("eval 'application:set_env(rabbit, loopback_users, [<<\"guest\">>]).'");
-            assertGuestFail(addr);
+            String initialValue = getLoopbackUsers();
+            try {
+                setLoopbackUsers("[]");
+                assertGuestSucceed(addr);
+                setLoopbackUsers("[<<\"guest\">>]");
+                assertGuestFail(addr);
+            } finally {
+                setLoopbackUsers(initialValue);
+            }
         }
     }
 
+    private static String getLoopbackUsers() throws IOException {
+        return Host.rabbitmqctl("eval '{ok, V} = application:get_env(rabbit, loopback_users), V.'").output();
+    }
+
+    private static void setLoopbackUsers(String value) throws IOException {
+        Host.rabbitmqctl(String.format("eval 'application:set_env(rabbit, loopback_users, %s).'", value));
+    }
+
     private void assertGuestSucceed(String addr) throws IOException, TimeoutException {
         succeedConnect("guest", addr);
         succeedConnect("guest", "localhost");
diff --git a/src/test/java/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java
index 5304e120c..ad8799c11 100644
--- a/src/test/java/com/rabbitmq/tools/Host.java
+++ b/src/test/java/com/rabbitmq/tools/Host.java
@@ -80,7 +80,7 @@ public static ProcessState executeCommand(String command) throws IOException
         return new ProcessState(pr, inputState, errorState);
     }
 
-    static class ProcessState {
+    public static class ProcessState {
 
         private final Process process;
         private final InputStreamPumpState inputState;
@@ -93,7 +93,7 @@ static class ProcessState {
             this.errorState = errorState;
         }
 
-        private String output() {
+        public String output() {
             return inputState.buffer.toString();
         }
 

From 94b9d3b0501dd8f7cc13fb13b5dbdc2ac14f1f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Wed, 5 Mar 2025 11:41:04 +0100
Subject: [PATCH 18/81] Remove unnecessary throws

(cherry picked from commit 44c9dc2c86206b725aecad138e2e1a51ef18954d)
---
 .../com/rabbitmq/client/impl/WorkPoolTests.java   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java b/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java
index 19d874ced..8306c1055 100644
--- a/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java
+++ b/src/test/java/com/rabbitmq/client/impl/WorkPoolTests.java
@@ -41,9 +41,8 @@ public class WorkPoolTests {
 
     /**
      * Test add work and remove work
-     * @throws Exception untested
      */
-    @Test public void basicInOut() throws Exception {
+    @Test public void basicInOut() {
         Object one = new Object();
         Object two = new Object();
 
@@ -70,9 +69,8 @@ public class WorkPoolTests {
 
     /**
      * Test add work when work in progress.
-     * @throws Exception untested
      */
-    @Test public void workInWhileInProgress() throws Exception {
+    @Test public void workInWhileInProgress() {
         Object one = new Object();
         Object two = new Object();
 
@@ -98,9 +96,8 @@ public class WorkPoolTests {
 
     /**
      * Test multiple work keys.
-     * @throws Exception untested
      */
-    @Test public void interleavingKeys() throws Exception {
+    @Test public void interleavingKeys() {
         Object one = new Object();
         Object two = new Object();
         Object three = new Object();
@@ -129,9 +126,8 @@ public class WorkPoolTests {
 
     /**
      * Test removal of key (with work)
-     * @throws Exception untested
      */
-    @Test public void unregisterKey() throws Exception {
+    @Test public void unregisterKey() {
         Object one = new Object();
         Object two = new Object();
         Object three = new Object();
@@ -154,9 +150,8 @@ public class WorkPoolTests {
 
     /**
      * Test removal of all keys (with work).
-     * @throws Exception untested
      */
-    @Test public void unregisterAllKeys() throws Exception {
+    @Test public void unregisterAllKeys() {
         Object one = new Object();
         Object two = new Object();
         Object three = new Object();

From 22b1e1bc1da839988310ec6dd5661313c0c9a0d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 00:13:20 +0000
Subject: [PATCH 19/81] Bump opentelemetry.version from 1.47.0 to 1.48.0

Bumps `opentelemetry.version` from 1.47.0 to 1.48.0.

Updates `io.opentelemetry:opentelemetry-api` from 1.47.0 to 1.48.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.47.0...v1.48.0)

Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.47.0 to 1.48.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.47.0...v1.48.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-sdk-testing
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 07841d3e3..266011ec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
     <micrometer.version>1.14.4</micrometer.version>
-    <opentelemetry.version>1.47.0</opentelemetry.version>
+    <opentelemetry.version>1.48.0</opentelemetry.version>
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.0</junit.jupiter.version>

From f43ea58b8415f8c500d5ce69836589a87ec1d603 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Mar 2025 00:17:01 +0000
Subject: [PATCH 20/81] Bump io.micrometer:micrometer-core from 1.14.4 to
 1.14.5

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.4 to 1.14.5.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.4...v1.14.5)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 266011ec5..d8e32c0a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
-    <micrometer.version>1.14.4</micrometer.version>
+    <micrometer.version>1.14.5</micrometer.version>
     <opentelemetry.version>1.48.0</opentelemetry.version>
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>

From 4c8125a5ee4c40b4a9ca7e6e9ba621ce863ec480 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Mar 2025 00:17:08 +0000
Subject: [PATCH 21/81] Bump io.micrometer:micrometer-tracing-integration-test

Bumps [io.micrometer:micrometer-tracing-integration-test](https://github.com/micrometer-metrics/tracing) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-integration-test
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 266011ec5..e52265581 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <junit.jupiter.version>5.12.0</junit.jupiter.version>
     <mockito.version>5.16.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
-    <micrometer-tracing-test.version>1.4.3</micrometer-tracing-test.version>
+    <micrometer-tracing-test.version>1.4.4</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.80</bouncycastle.version>

From 88aced025ad88993a3b516200487414141227d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Thu, 13 Mar 2025 08:37:51 +0100
Subject: [PATCH 22/81] Test against RabbitMQ 4.1 alpha

(cherry picked from commit 1765236e36da063775621835db7d565daa81fbec)
---
 .github/workflows/test-rabbitmq-alphas.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-rabbitmq-alphas.yml b/.github/workflows/test-rabbitmq-alphas.yml
index 934ccbbdd..10db388a9 100644
--- a/.github/workflows/test-rabbitmq-alphas.yml
+++ b/.github/workflows/test-rabbitmq-alphas.yml
@@ -16,7 +16,10 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        rabbitmq-image: [ 'pivotalrabbitmq/rabbitmq:v4.0.x', 'pivotalrabbitmq/rabbitmq:main' ]
+        rabbitmq-image:
+          - pivotalrabbitmq/rabbitmq:v4.0.x-otp27
+          - pivotalrabbitmq/rabbitmq:v4.1.x-otp27
+          - pivotalrabbitmq/rabbitmq:main-otp27
     name:  Test against ${{ matrix.rabbitmq-image }}
     steps:
       - uses: actions/checkout@v4

From db98b7a15770e9754681b3c3d46c1b006a10b2db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 00:17:33 +0000
Subject: [PATCH 23/81] Bump org.junit:junit-bom from 5.12.0 to 5.12.1

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.12.0 to 5.12.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 81d997417..98c753f93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.48.0</opentelemetry.version>
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.12.0</junit.jupiter.version>
+    <junit.jupiter.version>5.12.1</junit.jupiter.version>
     <mockito.version>5.16.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.4.4</micrometer-tracing-test.version>

From 80cae5bdd70b58621db3791e1779265db552a8eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 03:09:18 +0000
Subject: [PATCH 24/81] Bump org.mockito:mockito-core from 5.16.0 to 5.16.1

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.16.0 to 5.16.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.16.0...v5.16.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 98c753f93..cbffdea1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.1</junit.jupiter.version>
-    <mockito.version>5.16.0</mockito.version>
+    <mockito.version>5.16.1</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.4.4</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>

From e00945384ecce559a9ee6b8a78c742361f9d5db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Mon, 17 Mar 2025 10:33:30 +0100
Subject: [PATCH 25/81] Use -R flag in cp command

Compatible MacOS/Linux.

(cherry picked from commit 7f105b24f7af6d22a851f320c408c9172bb39f9a)
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d9041b265..f320fd349 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ $(DEPS_DIR)/rabbitmq_codegen:
 	git clone -n --depth=1 --filter=tree:0 https://github.com/rabbitmq/rabbitmq-server.git $(DEPS_DIR)/rabbitmq-server
 	git -C $(DEPS_DIR)/rabbitmq-server sparse-checkout set --no-cone deps/rabbitmq_codegen
 	git -C $(DEPS_DIR)/rabbitmq-server checkout
-	cp -r $(DEPS_DIR)/rabbitmq-server/deps/rabbitmq_codegen "$@"
+	cp -R $(DEPS_DIR)/rabbitmq-server/deps/rabbitmq_codegen "$@"
 	rm -rf $(DEPS_DIR)/rabbitmq-server
 
 tests: deps

From dff74a4521a16aaae79e4ae41d617a324283248e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Mar 2025 00:10:38 +0000
Subject: [PATCH 26/81] Bump org.sonarsource.scanner.maven:sonar-maven-plugin

Bumps [org.sonarsource.scanner.maven:sonar-maven-plugin](https://github.com/SonarSource/sonar-scanner-maven) from 5.0.0.4389 to 5.1.0.4751.
- [Release notes](https://github.com/SonarSource/sonar-scanner-maven/releases)
- [Commits](https://github.com/SonarSource/sonar-scanner-maven/compare/5.0.0.4389...5.1.0.4751)

---
updated-dependencies:
- dependency-name: org.sonarsource.scanner.maven:sonar-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cbffdea1b..1ab88883e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -639,7 +639,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>5.0.0.4389</version>
+          <version>5.1.0.4751</version>
         </plugin>
       </plugins>
     </pluginManagement>

From 367e3486039b425f28b597d86d55bf153ea4e817 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Mar 2025 01:26:53 +0000
Subject: [PATCH 27/81] Bump org.apache.maven.plugins:maven-surefire-plugin
 from 3.5.2 to 3.5.3

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.2...surefire-3.5.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1ab88883e..0839d59af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <groovy.all.version>2.4.21</groovy.all.version>
     <build.helper.maven-plugin.version>3.6.0</build.helper.maven-plugin.version>
     <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
-    <maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>3.5.3</maven.surefire.plugin.version>
     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     <maven.failsafe.plugin.version>3.5.2</maven.failsafe.plugin.version>
     <maven.gpg.plugin.version>3.2.7</maven.gpg.plugin.version>

From 590fcbd997e2b1e82a37c2d29e6f9ef340876d38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Mar 2025 01:27:00 +0000
Subject: [PATCH 28/81] Bump org.apache.maven.plugins:maven-failsafe-plugin
 from 3.5.2 to 3.5.3

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.2...surefire-3.5.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1ab88883e..ac3f7ce5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
     <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
     <maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
-    <maven.failsafe.plugin.version>3.5.2</maven.failsafe.plugin.version>
+    <maven.failsafe.plugin.version>3.5.3</maven.failsafe.plugin.version>
     <maven.gpg.plugin.version>3.2.7</maven.gpg.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
     <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>

From 1ab1f318891abcfd69f0b036487f1eabf37e35b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 00:15:45 +0000
Subject: [PATCH 29/81] Bump opentelemetry.version from 1.48.0 to 1.49.0

Bumps `opentelemetry.version` from 1.48.0 to 1.49.0.

Updates `io.opentelemetry:opentelemetry-api` from 1.48.0 to 1.49.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.48.0...v1.49.0)

Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.48.0 to 1.49.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.48.0...v1.49.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-api
  dependency-version: 1.49.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-sdk-testing
  dependency-version: 1.49.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0b039b404..9bc6dbca1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
     <micrometer.version>1.14.5</micrometer.version>
-    <opentelemetry.version>1.48.0</opentelemetry.version>
+    <opentelemetry.version>1.49.0</opentelemetry.version>
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.1</junit.jupiter.version>

From cd49fc00eab5895ca5f36fbe8282e691c5fb0d98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 00:15:54 +0000
Subject: [PATCH 30/81] Bump org.mockito:mockito-core from 5.16.1 to 5.17.0

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.16.1 to 5.17.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.16.1...v5.17.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-version: 5.17.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0b039b404..d88b9a8f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.1</junit.jupiter.version>
-    <mockito.version>5.16.1</mockito.version>
+    <mockito.version>5.17.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.4.4</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>

From a9b08cdae2470cdd6417c4161c950804adae7f18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 01:37:08 +0000
Subject: [PATCH 31/81] Bump com.diffplug.spotless:spotless-maven-plugin from
 2.44.3 to 2.44.4

Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.44.3 to 2.44.4.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/maven/2.44.3...maven/2.44.4)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-version: 2.44.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eba8d3d70..e872557fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
     <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
-    <spotless.version>2.44.3</spotless.version>
+    <spotless.version>2.44.4</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>
     <!--
     These groovy scripts are used later in this POM file to generate

From 8741473908ea80d38ca2fb3b9a6d5b99e546ae0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Apr 2025 00:09:06 +0000
Subject: [PATCH 32/81] Bump org.junit:junit-bom from 5.12.1 to 5.12.2

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.12.1 to 5.12.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.12.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e872557fb..cc7c87882 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.49.0</opentelemetry.version>
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.12.1</junit.jupiter.version>
+    <junit.jupiter.version>5.12.2</junit.jupiter.version>
     <mockito.version>5.17.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.4.4</micrometer-tracing-test.version>

From a81d302ed4bb0434abc339dcf8c899dd3e5c9241 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Apr 2025 00:09:14 +0000
Subject: [PATCH 33/81] Bump com.google.code.gson:gson from 2.12.1 to 2.13.0

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.12.1 to 2.13.0.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.12.1...gson-parent-2.13.0)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-version: 2.13.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e872557fb..569f5c239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.80</bouncycastle.version>
     <netcrusher.version>0.10</netcrusher.version>
-    <gson.version>2.12.1</gson.version>
+    <gson.version>2.13.0</gson.version>
 
     <maven.javadoc.plugin.version>3.11.2</maven.javadoc.plugin.version>
     <maven.release.plugin.version>3.1.1</maven.release.plugin.version>

From 2040b93448a84dd92e27a687e18050cf5819ef5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 00:55:06 +0000
Subject: [PATCH 34/81] Bump io.micrometer:micrometer-tracing-integration-test

Bumps [io.micrometer:micrometer-tracing-integration-test](https://github.com/micrometer-metrics/tracing) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.4.4...v1.4.5)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-integration-test
  dependency-version: 1.4.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d5a43cfdb..92795baa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <junit.jupiter.version>5.12.2</junit.jupiter.version>
     <mockito.version>5.17.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
-    <micrometer-tracing-test.version>1.4.4</micrometer-tracing-test.version>
+    <micrometer-tracing-test.version>1.4.5</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.80</bouncycastle.version>

From b8df09108f6fec95e50f4a809dc6c93bace2c631 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 00:55:12 +0000
Subject: [PATCH 35/81] Bump io.micrometer:micrometer-core from 1.14.5 to
 1.14.6

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.5 to 1.14.6.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.5...v1.14.6)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-version: 1.14.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d5a43cfdb..b879c7cf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
-    <micrometer.version>1.14.5</micrometer.version>
+    <micrometer.version>1.14.6</micrometer.version>
     <opentelemetry.version>1.49.0</opentelemetry.version>
     <jackson.version>2.18.3</jackson.version>
     <logback.version>1.2.13</logback.version>

From e012dad7b832d3b87253d107716e5e732c93c040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Wed, 16 Apr 2025 09:43:26 +0200
Subject: [PATCH 36/81] Use RabbitMQ 4.1 as default on CI

(cherry picked from commit d3c585a7ed0a95775413e9eded7b6039ac2150ad)
---
 .github/workflows/test-rabbitmq-alphas.yml | 1 -
 ci/cluster/docker-compose.yml              | 6 +++---
 ci/start-broker.sh                         | 2 +-
 ci/start-cluster.sh                        | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-rabbitmq-alphas.yml b/.github/workflows/test-rabbitmq-alphas.yml
index 10db388a9..692ed3067 100644
--- a/.github/workflows/test-rabbitmq-alphas.yml
+++ b/.github/workflows/test-rabbitmq-alphas.yml
@@ -17,7 +17,6 @@ jobs:
     strategy:
       matrix:
         rabbitmq-image:
-          - pivotalrabbitmq/rabbitmq:v4.0.x-otp27
           - pivotalrabbitmq/rabbitmq:v4.1.x-otp27
           - pivotalrabbitmq/rabbitmq:main-otp27
     name:  Test against ${{ matrix.rabbitmq-image }}
diff --git a/ci/cluster/docker-compose.yml b/ci/cluster/docker-compose.yml
index 2d438519b..cf0dd75c5 100644
--- a/ci/cluster/docker-compose.yml
+++ b/ci/cluster/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       - rabbitmq-cluster
     hostname: node0
     container_name: rabbitmq0
-    image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
+    image: ${RABBITMQ_IMAGE:-rabbitmq:4.1}
     pull_policy: always
     ports:
       - "5672:5672"
@@ -22,7 +22,7 @@ services:
       - rabbitmq-cluster
     hostname: node1
     container_name: rabbitmq1
-    image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
+    image: ${RABBITMQ_IMAGE:-rabbitmq:4.1}
     pull_policy: always
     ports:
       - "5673:5672"
@@ -37,7 +37,7 @@ services:
       - rabbitmq-cluster
     hostname: node2
     container_name: rabbitmq2
-    image: ${RABBITMQ_IMAGE:-rabbitmq:4.0}
+    image: ${RABBITMQ_IMAGE:-rabbitmq:4.1}
     pull_policy: always
     ports:
       - "5674:5672"
diff --git a/ci/start-broker.sh b/ci/start-broker.sh
index ad13368cf..a73a08f27 100755
--- a/ci/start-broker.sh
+++ b/ci/start-broker.sh
@@ -2,7 +2,7 @@
 
 LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
+RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.1}
 
 wait_for_message() {
   while ! docker logs "$1" | grep -q "$2";
diff --git a/ci/start-cluster.sh b/ci/start-cluster.sh
index 85a8ce5c1..6a5042c09 100755
--- a/ci/start-cluster.sh
+++ b/ci/start-cluster.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.0}
+export RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:4.1}
 
 wait_for_message() {
   while ! docker logs "$1" | grep -q "$2";

From 3d2dab15d5dc3e0aa7c5205b40940cd95c7b4d2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Apr 2025 00:33:30 +0000
Subject: [PATCH 37/81] Bump com.google.code.gson:gson from 2.13.0 to 2.13.1

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.13.0 to 2.13.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.13.0...gson-parent-2.13.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-version: 2.13.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e3564ad85..59494d48f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.80</bouncycastle.version>
     <netcrusher.version>0.10</netcrusher.version>
-    <gson.version>2.13.0</gson.version>
+    <gson.version>2.13.1</gson.version>
 
     <maven.javadoc.plugin.version>3.11.2</maven.javadoc.plugin.version>
     <maven.release.plugin.version>3.1.1</maven.release.plugin.version>

From cda9923cb0d89a6ee6b966f6472be639aac39a12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Apr 2025 00:33:38 +0000
Subject: [PATCH 38/81] Bump com.fasterxml.jackson.core:jackson-databind from
 2.18.3 to 2.19.0

Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.18.3 to 2.19.0.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e3564ad85..173835db9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <metrics.version>4.2.30</metrics.version>
     <micrometer.version>1.14.6</micrometer.version>
     <opentelemetry.version>1.49.0</opentelemetry.version>
-    <jackson.version>2.18.3</jackson.version>
+    <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.2</junit.jupiter.version>
     <mockito.version>5.17.0</mockito.version>

From f9c301876d229ddd87468b915a5067466c9c628c Mon Sep 17 00:00:00 2001
From: Michael Klishin <michaelklishin@icloud.com>
Date: Sun, 20 Apr 2025 02:07:17 -0400
Subject: [PATCH 39/81] AutorecoveringConnection: clean up bindings of deleted
 exchanges

so that they (the bindings) do not reappear after
connection recovery.

Noticed while working on ruby-amqp/bunny#704.

(cherry picked from commit aaff1cc322b5e26ced53dfe40090964e39eb97e8)
---
 .../recovery/AutorecoveringConnection.java    | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
index ca5131687..5f92eacd1 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -1094,8 +1094,12 @@ void recordExchange(String exchange, RecordedExchange x) {
 
     void deleteRecordedExchange(String exchange) {
         this.recordedExchanges.remove(exchange);
-        Set<RecordedBinding> xs = this.removeBindingsWithDestination(exchange);
-        for (RecordedBinding b : xs) {
+        Set<RecordedBinding> xs1 = this.removeBindingsWithDestination(exchange);
+        for (RecordedBinding b : xs1) {
+            this.maybeDeleteRecordedAutoDeleteExchange(b.getSource());
+        }
+        Set<RecordedBinding> xs2 = this.removeBindingsWithSource(exchange);
+        for (RecordedBinding b : xs2) {
             this.maybeDeleteRecordedAutoDeleteExchange(b.getSource());
         }
     }
@@ -1172,6 +1176,20 @@ Set<RecordedBinding> removeBindingsWithDestination(String s) {
         return result;
     }
 
+    Set<RecordedBinding> removeBindingsWithSource(String s) {
+        final Set<RecordedBinding> result = new LinkedHashSet<>();
+        synchronized (this.recordedBindings) {
+            for (Iterator<RecordedBinding> it = this.recordedBindings.iterator(); it.hasNext(); ) {
+                RecordedBinding b = it.next();
+                if (b.getSource().equals(s)) {
+                    it.remove();
+                    result.add(b);
+                }
+            }
+        }
+        return result;
+    }
+
     public Map<String, RecordedQueue> getRecordedQueues() {
         return recordedQueues;
     }

From 30f10332582fd0252c040deb2236836a5d41600d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Mon, 5 May 2025 17:56:40 +0200
Subject: [PATCH 40/81] Add test for recorded binding clean-up after exchange
 deletion

(cherry picked from commit b451798ea64b7d5606cca5f74f7a63689c3afbef)
---
 .../recovery/AutorecoveringConnection.java    | 18 ++++++------------
 .../test/functional/ConnectionRecovery.java   | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
index 5f92eacd1..be9259947 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -1163,25 +1163,19 @@ boolean hasMoreConsumersOnQueue(Collection<RecordedConsumer> consumers, String q
     }
 
     Set<RecordedBinding> removeBindingsWithDestination(String s) {
-        final Set<RecordedBinding> result = new LinkedHashSet<>();
-        synchronized (this.recordedBindings) {
-            for (Iterator<RecordedBinding> it = this.recordedBindings.iterator(); it.hasNext(); ) {
-                RecordedBinding b = it.next();
-                if(b.getDestination().equals(s)) {
-                    it.remove();
-                    result.add(b);
-                }
-            }
-        }
-        return result;
+        return this.removeBindingsWithCondition(b -> b.getSource().equals(s));
     }
 
     Set<RecordedBinding> removeBindingsWithSource(String s) {
+        return this.removeBindingsWithCondition(b -> b.getSource().equals(s));
+    }
+
+    private Set<RecordedBinding> removeBindingsWithCondition(Predicate<RecordedBinding> condition) {
         final Set<RecordedBinding> result = new LinkedHashSet<>();
         synchronized (this.recordedBindings) {
             for (Iterator<RecordedBinding> it = this.recordedBindings.iterator(); it.hasNext(); ) {
                 RecordedBinding b = it.next();
-                if (b.getSource().equals(s)) {
+                if (condition.test(b)) {
                     it.remove();
                     result.add(b);
                 }
diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
index 8dfb268ae..f50f0aba3 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java
@@ -865,6 +865,21 @@ public void handleDelivery(String consumerTag, Envelope envelope, BasicPropertie
         }
     }
 
+    @Test public void thatBindingFromDeletedExchangeIsDeleted() throws IOException, InterruptedException {
+        String q = generateQueueName();
+        channel.queueDeclare(q, false, false, false, null);
+        try {
+            String x = generateExchangeName();
+            channel.exchangeDeclare(x, "fanout");
+            channel.queueBind(q, x, "");
+            assertRecordedBinding(connection, 1);
+            channel.exchangeDelete(x);
+            assertRecordedBinding(connection, 0);
+        } finally {
+            channel.queueDelete(q);
+        }
+    }
+
     private void assertConsumerCount(int exp, String q) throws IOException {
         assertThat(channel.queueDeclarePassive(q).getConsumerCount()).isEqualTo(exp);
     }
@@ -1017,4 +1032,8 @@ private static void assertRecordedQueues(Connection conn, int size) {
     private static void assertRecordedExchanges(Connection conn, int size) {
         assertThat(((AutorecoveringConnection)conn).getRecordedExchanges()).hasSize(size);
     }
+
+    private static void assertRecordedBinding(Connection conn, int size) {
+        assertThat(((AutorecoveringConnection)conn).getRecordedBindings()).hasSize(size);
+    }
 }

From 6e56c27e97e72efbaa8e2831237d1d5e719d1c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Mon, 5 May 2025 19:51:45 +0200
Subject: [PATCH 41/81] Fix condition to delete exchange binding

(cherry picked from commit 8dff80c4f26138263cbb570a92eb1fac0a5f47b7)
---
 .../rabbitmq/client/impl/recovery/AutorecoveringConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
index be9259947..084e2d363 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -1163,7 +1163,7 @@ boolean hasMoreConsumersOnQueue(Collection<RecordedConsumer> consumers, String q
     }
 
     Set<RecordedBinding> removeBindingsWithDestination(String s) {
-        return this.removeBindingsWithCondition(b -> b.getSource().equals(s));
+        return this.removeBindingsWithCondition(b -> b.getDestination().equals(s));
     }
 
     Set<RecordedBinding> removeBindingsWithSource(String s) {

From f141a5578dc86990567cdbec47dca0699595b1f9 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michaelklishin@icloud.com>
Date: Sat, 19 Apr 2025 22:15:10 -0400
Subject: [PATCH 42/81] Cosmetics

(cherry picked from commit 2c7f1888d488c6a4d2f190e0ab388fd2e94a8210)
---
 .../client/impl/recovery/AutorecoveringConnection.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
index 084e2d363..01917f480 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -1068,7 +1068,8 @@ void deleteRecordedQueue(String queue) {
     
     /**
      * Exclude the queue from the list of queues to recover after connection failure.
-     * Intended to be used in usecases where you want to remove the queue from this connection's recovery list but don't want to delete the queue from the server.
+     * Intended to be used in scenarios where you want to remove the queue from this connection's recovery list but don't want to delete the queue from the server.
+     * For example, in tests.
      * 
      * @param queue queue name to exclude from recorded recovery queues
      * @param ifUnused if true, the RecordedQueue will only be excluded if no local consumers are using it.

From c53be6f58cbe6cbed72de6dfcfc84af3a4714f58 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michaelklishin@icloud.com>
Date: Sat, 19 Apr 2025 23:44:12 -0400
Subject: [PATCH 43/81] Cosmetics [skip ci]

(cherry picked from commit 1ee992a2bfedba45d8bf28fcaad23cf4c1f5a7b7)
---
 .../java/com/rabbitmq/client/impl/recovery/RetryResult.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/RetryResult.java b/src/main/java/com/rabbitmq/client/impl/recovery/RetryResult.java
index 9250c74f7..491a34fcd 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/RetryResult.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/RetryResult.java
@@ -16,7 +16,7 @@
 package com.rabbitmq.client.impl.recovery;
 
 /**
- * The retry of a retried topology recovery operation.
+ * The retry of a retriable topology recovery operation.
  *
  * @since 5.4.0
  */

From df2ed3de497d3275b35c03e3f515b4dba12dc992 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michaelklishin@icloud.com>
Date: Sat, 19 Apr 2025 23:53:42 -0400
Subject: [PATCH 44/81] Cosmetics [skip ci]

(cherry picked from commit fbaceb6993ec5e57ad6e98553769fafe8823fc08)
---
 .../client/impl/recovery/AutorecoveringConnection.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
index 01917f480..adc804d62 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -1118,8 +1118,8 @@ void maybeDeleteRecordedAutoDeleteQueue(String queue) {
             synchronized (this.recordedQueues) {
                 if(!hasMoreConsumersOnQueue(this.consumers.values(), queue)) {
                     RecordedQueue q = this.recordedQueues.get(queue);
-                    // last consumer on this connection is gone, remove recorded queue
-                    // if it is auto-deleted. See bug 26364.
+                    // the last consumer on this connection is gone, remove the recorded queue
+                    // if it is auto-deleted
                     if(q != null && q.isAutoDelete()) {
                         deleteRecordedQueue(queue);
                     }
@@ -1132,8 +1132,8 @@ void maybeDeleteRecordedAutoDeleteExchange(String exchange) {
         synchronized (this.recordedExchanges) {
             if(!hasMoreDestinationsBoundToExchange(Utility.copy(this.recordedBindings), exchange)) {
                 RecordedExchange x = this.recordedExchanges.get(exchange);
-                // last binding where this exchange is the source is gone, remove recorded exchange
-                // if it is auto-deleted. See bug 26364.
+                // the last binding where this exchange is the source is gone, remove the recorded exchange
+                // if it is auto-deleted
                 if(x != null && x.isAutoDelete()) {
                     deleteRecordedExchange(exchange);
                 }

From 26402f0f31623655d65c7a7263f2f3df763d2883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Tue, 6 May 2025 16:55:11 +0200
Subject: [PATCH 45/81] Null-proof channel state retrieval in
 AbstractMetricsCollector

A channel message may have been closed by the time a metrics method is
called (e.g. when cancelling a consumer the metrics collector is called
after the RPC is completed), so the channel state may no longer be
there.

This commit null-proofs methods rely on the channel state retrieval.

Fixes #1592

(cherry picked from commit de6b708e1941e0960f4e5c715fcbf3174936599f)

Conflicts:
	src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java
---
 .../client/impl/AbstractMetricsCollector.java  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java b/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java
index ec6605636..887578a7a 100644
--- a/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java
+++ b/src/main/java/com/rabbitmq/client/impl/AbstractMetricsCollector.java
@@ -160,9 +160,12 @@ public void basicConsume(Channel channel, String consumerTag, boolean autoAck) {
         try {
             if(!autoAck) {
                 ChannelState channelState = channelState(channel);
+                if (channelState == null) {
+                    return;
+                }
                 channelState.lock.lock();
                 try {
-                    channelState(channel).consumersWithManualAck.add(consumerTag);
+                    channelState.consumersWithManualAck.add(consumerTag);
                 } finally {
                     channelState.lock.unlock();
                 }
@@ -176,9 +179,12 @@ public void basicConsume(Channel channel, String consumerTag, boolean autoAck) {
     public void basicCancel(Channel channel, String consumerTag) {
         try {
             ChannelState channelState = channelState(channel);
+            if (channelState == null) {
+                return;
+            }
             channelState.lock.lock();
             try {
-                channelState(channel).consumersWithManualAck.remove(consumerTag);
+                channelState.consumersWithManualAck.remove(consumerTag);
             } finally {
                 channelState.lock.unlock();
             }
@@ -193,9 +199,12 @@ public void consumedMessage(Channel channel, long deliveryTag, boolean autoAck)
             markConsumedMessage();
             if(!autoAck) {
                 ChannelState channelState = channelState(channel);
+                if (channelState == null) {
+                    return;
+                }
                 channelState.lock.lock();
                 try {
-                    channelState(channel).unackedMessageDeliveryTags.add(deliveryTag);
+                    channelState.unackedMessageDeliveryTags.add(deliveryTag);
                 } finally {
                     channelState.lock.unlock();
                 }
@@ -210,6 +219,9 @@ public void consumedMessage(Channel channel, long deliveryTag, String consumerTa
         try {
             markConsumedMessage();
             ChannelState channelState = channelState(channel);
+            if (channelState == null) {
+                return;
+            }
             channelState.lock.lock();
             try {
                 if(channelState.consumersWithManualAck.contains(consumerTag)) {

From afeaf0e9943682b6145996b066b802641322172b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 00:52:03 +0000
Subject: [PATCH 46/81] Bump opentelemetry.version from 1.49.0 to 1.50.0

Bumps `opentelemetry.version` from 1.49.0 to 1.50.0.

Updates `io.opentelemetry:opentelemetry-api` from 1.49.0 to 1.50.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.49.0...v1.50.0)

Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.49.0 to 1.50.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.49.0...v1.50.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-api
  dependency-version: 1.50.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-sdk-testing
  dependency-version: 1.50.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0c2722d9e..23feb84d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
     <micrometer.version>1.14.6</micrometer.version>
-    <opentelemetry.version>1.49.0</opentelemetry.version>
+    <opentelemetry.version>1.50.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.2</junit.jupiter.version>

From a23caa536547ab95d453fc4cf82960a5263cb55d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 May 2025 00:22:24 +0000
Subject: [PATCH 47/81] Bump io.micrometer:micrometer-core from 1.14.6 to
 1.14.7

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-version: 1.14.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 23feb84d5..f10158c18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
-    <micrometer.version>1.14.6</micrometer.version>
+    <micrometer.version>1.14.7</micrometer.version>
     <opentelemetry.version>1.50.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>

From 983950348f8c54415f59dcbe2973fe0d54113d73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 May 2025 00:24:32 +0000
Subject: [PATCH 48/81] Bump io.micrometer:micrometer-tracing-integration-test

Bumps [io.micrometer:micrometer-tracing-integration-test](https://github.com/micrometer-metrics/tracing) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.4.5...v1.4.6)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-integration-test
  dependency-version: 1.4.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 23feb84d5..01aa94005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <junit.jupiter.version>5.12.2</junit.jupiter.version>
     <mockito.version>5.17.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
-    <micrometer-tracing-test.version>1.4.5</micrometer-tracing-test.version>
+    <micrometer-tracing-test.version>1.4.6</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.80</bouncycastle.version>

From 65afbb96d08faa25f5a11ca2bb38a6aceb71499d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 May 2025 00:30:41 +0000
Subject: [PATCH 49/81] Bump io.micrometer:micrometer-tracing-integration-test

Bumps [io.micrometer:micrometer-tracing-integration-test](https://github.com/micrometer-metrics/tracing) from 1.4.6 to 1.5.0.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.4.6...v1.5.0)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-integration-test
  dependency-version: 1.5.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fc9489174..9817de4b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <junit.jupiter.version>5.12.2</junit.jupiter.version>
     <mockito.version>5.17.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
-    <micrometer-tracing-test.version>1.4.6</micrometer-tracing-test.version>
+    <micrometer-tracing-test.version>1.5.0</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.80</bouncycastle.version>

From b955a2a23b0513007b847b368dc7f9b78b6ed9d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 May 2025 00:30:47 +0000
Subject: [PATCH 50/81] Bump io.micrometer:micrometer-core from 1.14.7 to
 1.15.0

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.7 to 1.15.0.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.7...v1.15.0)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-version: 1.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fc9489174..7f13b19ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.30</metrics.version>
-    <micrometer.version>1.14.7</micrometer.version>
+    <micrometer.version>1.15.0</micrometer.version>
     <opentelemetry.version>1.50.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>

From 0fc2f50ca636c2351cd6d6dd877dce86f4468b44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 May 2025 00:55:45 +0000
Subject: [PATCH 51/81] Bump org.mockito:mockito-core from 5.17.0 to 5.18.0

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.17.0 to 5.18.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.17.0...v5.18.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-version: 5.18.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index da731a220..fb3568d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.12.2</junit.jupiter.version>
-    <mockito.version>5.17.0</mockito.version>
+    <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.5.0</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>

From 24ab7486b56acb5f082ef52ce6498b07598262ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 May 2025 00:52:04 +0000
Subject: [PATCH 52/81] Bump io.dropwizard.metrics:metrics-core from 4.2.30 to
 4.2.32

Bumps [io.dropwizard.metrics:metrics-core](https://github.com/dropwizard/metrics) from 4.2.30 to 4.2.32.
- [Release notes](https://github.com/dropwizard/metrics/releases)
- [Commits](https://github.com/dropwizard/metrics/compare/v4.2.30...v4.2.32)

---
updated-dependencies:
- dependency-name: io.dropwizard.metrics:metrics-core
  dependency-version: 4.2.32
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fb3568d2b..201da6ba2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
-    <metrics.version>4.2.30</metrics.version>
+    <metrics.version>4.2.32</metrics.version>
     <micrometer.version>1.15.0</micrometer.version>
     <opentelemetry.version>1.50.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>

From 77334b577359c08e5a6dbaee0521dd6cce6f32dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 May 2025 01:01:22 +0000
Subject: [PATCH 53/81] Bump com.diffplug.spotless:spotless-maven-plugin from
 2.44.4 to 2.44.5

Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.44.4 to 2.44.5.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/maven/2.44.4...maven/2.44.5)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-version: 2.44.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 201da6ba2..e9f29e5c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
     <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
-    <spotless.version>2.44.4</spotless.version>
+    <spotless.version>2.44.5</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>
     <!--
     These groovy scripts are used later in this POM file to generate

From e23e3693daf3d0e5ad7d210032d3d0aff080b1c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jun 2025 00:48:25 +0000
Subject: [PATCH 54/81] Bump org.junit:junit-bom from 5.12.2 to 5.13.0

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.12.2 to 5.13.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.12.2...r5.13.0)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e9f29e5c4..072a629e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.50.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.12.2</junit.jupiter.version>
+    <junit.jupiter.version>5.13.0</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.5.0</micrometer-tracing-test.version>

From a96e0fcb2826010e093de461120786cb15e598e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Jun 2025 00:55:49 +0000
Subject: [PATCH 55/81] Bump org.codehaus.mojo:build-helper-maven-plugin from
 3.6.0 to 3.6.1

Bumps [org.codehaus.mojo:build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/3.6.0...3.6.1)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:build-helper-maven-plugin
  dependency-version: 3.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 072a629e0..9998f53bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <maven.source.plugin.version>3.3.1</maven.source.plugin.version>
     <groovy.maven.plugin.version>2.1.1</groovy.maven.plugin.version>
     <groovy.all.version>2.4.21</groovy.all.version>
-    <build.helper.maven-plugin.version>3.6.0</build.helper.maven-plugin.version>
+    <build.helper.maven-plugin.version>3.6.1</build.helper.maven-plugin.version>
     <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
     <maven.surefire.plugin.version>3.5.3</maven.surefire.plugin.version>
     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>

From 60c2880628af5883e4d3206319f96228c616103c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Jun 2025 00:55:56 +0000
Subject: [PATCH 56/81] Bump org.bouncycastle:bcpkix-jdk18on from 1.80 to 1.81

Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.80 to 1.81.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcpkix-jdk18on
  dependency-version: '1.81'
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 072a629e0..74aa318c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
     <micrometer-tracing-test.version>1.5.0</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
-    <bouncycastle.version>1.80</bouncycastle.version>
+    <bouncycastle.version>1.81</bouncycastle.version>
     <netcrusher.version>0.10</netcrusher.version>
     <gson.version>2.13.1</gson.version>
 

From 0b494da7368449c146b781ae77fcb26c10db07b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 00:46:42 +0000
Subject: [PATCH 57/81] Bump org.junit:junit-bom from 5.13.0 to 5.13.1

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.13.0...r5.13.1)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d3a5a8bf4..c801b40cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.50.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.13.0</junit.jupiter.version>
+    <junit.jupiter.version>5.13.1</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.5.0</micrometer-tracing-test.version>

From f21547809582690a1672443ea123002624758574 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 00:47:16 +0000
Subject: [PATCH 58/81] Bump opentelemetry.version from 1.50.0 to 1.51.0

Bumps `opentelemetry.version` from 1.50.0 to 1.51.0.

Updates `io.opentelemetry:opentelemetry-api` from 1.50.0 to 1.51.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.50.0...v1.51.0)

Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.50.0 to 1.51.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.50.0...v1.51.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-api
  dependency-version: 1.51.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-sdk-testing
  dependency-version: 1.51.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d3a5a8bf4..56c5f7862 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.32</metrics.version>
     <micrometer.version>1.15.0</micrometer.version>
-    <opentelemetry.version>1.50.0</opentelemetry.version>
+    <opentelemetry.version>1.51.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.13.0</junit.jupiter.version>

From 7c2e195e78a6ecb858ec66032dff7ebd2e6a4280 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 00:40:28 +0000
Subject: [PATCH 59/81] Bump io.micrometer:micrometer-core from 1.15.0 to
 1.15.1

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.15.0 to 1.15.1.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.15.0...v1.15.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-version: 1.15.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b95f417b7..c26737d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.32</metrics.version>
-    <micrometer.version>1.15.0</micrometer.version>
+    <micrometer.version>1.15.1</micrometer.version>
     <opentelemetry.version>1.51.0</opentelemetry.version>
     <jackson.version>2.19.0</jackson.version>
     <logback.version>1.2.13</logback.version>

From 526f4ee7ad9178e2b99d3927280d548041a2c7f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 00:40:33 +0000
Subject: [PATCH 60/81] Bump io.micrometer:micrometer-tracing-integration-test

Bumps [io.micrometer:micrometer-tracing-integration-test](https://github.com/micrometer-metrics/tracing) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.5.0...v1.5.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-integration-test
  dependency-version: 1.5.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b95f417b7..4bb3de77f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <junit.jupiter.version>5.13.1</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
-    <micrometer-tracing-test.version>1.5.0</micrometer-tracing-test.version>
+    <micrometer-tracing-test.version>1.5.1</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.81</bouncycastle.version>

From a84152ea1b35505bbf3d25fcd68de17620b576c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Thu, 12 Jun 2025 17:40:11 +0200
Subject: [PATCH 61/81] Configure project to publish to Central Portal

OSSRH reaches EOL on June 30th, 2025.

(cherry picked from commit 1b0110e66fd375219adffc238a8318ea72144b40)

Conflicts:
	src/test/java/SanityCheck.java
---
 .github/workflows/publish-snapshot.yml |   8 +-
 .github/workflows/release.yml          |  21 +---
 .github/workflows/test.yml             |   6 +-
 ci/evaluate-release.sh                 |  14 ---
 pom.xml                                | 129 +++----------------------
 5 files changed, 23 insertions(+), 155 deletions(-)
 delete mode 100755 ci/evaluate-release.sh

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
index be18a1bef..63e7b6a4b 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -18,7 +18,7 @@ jobs:
           distribution: 'zulu'
           java-version: '21'
           cache: 'maven'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
@@ -28,6 +28,6 @@ jobs:
       - name: Publish snapshot
         run: ./mvnw clean deploy -Psnapshots -DskipITs -DskipTests --no-transfer-progress
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
\ No newline at end of file
+          MAVEN_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 06569df11..1524b4b8e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,8 +9,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Evaluate release type
-        run:  ci/evaluate-release.sh
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -21,30 +19,19 @@ jobs:
           distribution: 'temurin'
           java-version: '8'
           cache: 'maven'
-          server-id: ${{ env.maven_server_id }}
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
       - name: Get dependencies
         run: make deps
-      - name: Release AMQP Java Client (GA)
-        if: ${{ env.ga_release == 'true' }}
+      - name: Release AMQP Java Client
         run:  |
           git config user.name "rabbitmq-ci"
           git config user.email "rabbitmq-ci@users.noreply.github.com"
           ci/release-java-client.sh
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-      - name: Release AMQP Java Client (Milestone/RC)
-        if: ${{ env.ga_release != 'true' }}
-        run:  |
-          git config user.name "rabbitmq-ci"
-          git config user.email "rabbitmq-ci@users.noreply.github.com"
-          ci/release-java-client.sh
-        env:
-          MAVEN_USERNAME: ''
-          MAVEN_PASSWORD: ${{ secrets.PACKAGECLOUD_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c25e5862b..97c0ab436 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
           distribution: 'zulu'
           java-version: '21'
           cache: 'maven'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
@@ -62,6 +62,6 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         run: ./mvnw clean deploy -Psnapshots -DskipITs -DskipTests --no-transfer-progress
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/ci/evaluate-release.sh b/ci/evaluate-release.sh
deleted file mode 100755
index 4ad656d7a..000000000
--- a/ci/evaluate-release.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-source ./release-versions.txt
-
-if [[ $RELEASE_VERSION == *[RCM]* ]]
-then
-  echo "prerelease=true" >> $GITHUB_ENV
-  echo "ga_release=false" >> $GITHUB_ENV
-  echo "maven_server_id=packagecloud-rabbitmq-maven-milestones" >> $GITHUB_ENV
-else
-  echo "prerelease=false" >> $GITHUB_ENV
-  echo "ga_release=true" >> $GITHUB_ENV
-  echo "maven_server_id=ossrh" >> $GITHUB_ENV
-fi
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8c159586a..22f8b8e66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,9 +86,8 @@
     <maven.gpg.plugin.version>3.2.7</maven.gpg.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
     <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
-    <maven.packagecloud.wagon.version>0.0.6</maven.packagecloud.wagon.version>
-    <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
+    <central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
     <spotless.version>2.44.5</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>
@@ -316,12 +315,6 @@
           </plugin>
         </plugins>
       </build>
-      <distributionManagement>
-        <snapshotRepository>
-          <id>ossrh</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-      </distributionManagement>
     </profile>
 
     <!--
@@ -332,19 +325,6 @@
       <build>
         <plugins>
 
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>${nexus-staging-maven-plugin.version}</version>
-            <extensions>true</extensions>
-            <configuration>
-              <serverId>ossrh</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>false</autoReleaseAfterClose>
-              <stagingProgressTimeoutMinutes>20</stagingProgressTimeoutMinutes>
-            </configuration>
-          </plugin>
-
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
@@ -383,97 +363,8 @@
           </plugin>
         </plugins>
       </build>
-      <distributionManagement>
-        <repository>
-          <id>ossrh</id>
-          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-      </distributionManagement>
     </profile>
 
-    <!--
-      The "milestone" Maven profile is used to push release artifacts to the
-      PackageCloud Milestones Maven Repository.
-    -->
-    <profile>
-      <id>milestone</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>${maven.javadoc.plugin.version}</version>
-            <configuration>
-              <additionalOptions>${javadoc.opts}</additionalOptions>
-              <additionalJOption>${javadoc.joption}</additionalJOption>
-              <quiet>true</quiet>
-              <source>8</source>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>net.nicoulaj.maven.plugins</groupId>
-            <artifactId>checksum-maven-plugin</artifactId>
-            <version>${checksum.maven.plugin.version}</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>files</goal>
-                </goals>
-                <configuration>
-                  <fileSets>
-                    <fileSet>
-                      <directory>${project.build.directory}</directory>
-                      <includes>
-                        <include>*.jar</include>
-                        <include>*.pom</include>
-                      </includes>
-                    </fileSet>
-                  </fileSets>
-                  <algorithms>
-                    <algorithm>MD5</algorithm>
-                    <algorithm>SHA-1</algorithm>
-                  </algorithms>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>${maven.gpg.plugin.version}</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-                <configuration>
-                  <keyname>${gpg.keyname}</keyname>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <distributionManagement>
-        <repository>
-          <id>packagecloud-rabbitmq-maven-milestones</id>
-          <url>packagecloud+https://packagecloud.io/rabbitmq/maven-milestones</url>
-        </repository>
-      </distributionManagement>
-    </profile>
     <profile>
       <id>mockito-4-on-java-8</id>
       <activation>
@@ -907,14 +798,18 @@
         </configuration>
       </plugin>
 
+      <plugin>
+          <groupId>org.sonatype.central</groupId>
+          <artifactId>central-publishing-maven-plugin</artifactId>
+          <version>${central-publishing-maven-plugin.version}</version>
+          <extensions>true</extensions>
+          <configuration>
+              <publishingServerId>central</publishingServerId>
+              <autoPublish>true</autoPublish>
+          </configuration>
+      </plugin>
+
     </plugins>
-    <extensions>
-      <extension>
-        <groupId>io.packagecloud.maven.wagon</groupId>
-        <artifactId>maven-packagecloud-wagon</artifactId>
-        <version>${maven.packagecloud.wagon.version}</version>
-      </extension>
-    </extensions>
   </build>
 
 </project>

From 6ac5e5ec1fc9402a2c761f4a4824136cea197304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Fri, 13 Jun 2025 09:36:24 +0200
Subject: [PATCH 62/81] Disable auto-publish

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 22f8b8e66..489d39126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -805,7 +805,7 @@
           <extensions>true</extensions>
           <configuration>
               <publishingServerId>central</publishingServerId>
-              <autoPublish>true</autoPublish>
+              <autoPublish>false</autoPublish>
           </configuration>
       </plugin>
 

From e08e5f71ebe59d66d32fa6ee6c589eba6dedf9a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jun 2025 00:37:41 +0000
Subject: [PATCH 63/81] Bump com.fasterxml.jackson.core:jackson-databind from
 2.19.0 to 2.19.1

Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.19.0 to 2.19.1.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.19.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 489d39126..34a7ddf8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <metrics.version>4.2.32</metrics.version>
     <micrometer.version>1.15.1</micrometer.version>
     <opentelemetry.version>1.51.0</opentelemetry.version>
-    <jackson.version>2.19.0</jackson.version>
+    <jackson.version>2.19.1</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.13.1</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>

From 8762c06551a53b247b1e5ea704bfba44c2de614a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Jun 2025 00:45:42 +0000
Subject: [PATCH 64/81] Bump
 org.sonatype.central:central-publishing-maven-plugin

Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.7.0 to 0.8.0.
- [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits)

---
updated-dependencies:
- dependency-name: org.sonatype.central:central-publishing-maven-plugin
  dependency-version: 0.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34a7ddf8b..c20763a13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
     <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
-    <central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
+    <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
     <spotless.version>2.44.5</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>

From 34429fec24ba4058b80d17b3ed515480dcdf792b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Jun 2025 01:01:03 +0000
Subject: [PATCH 65/81] Bump io.dropwizard.metrics:metrics-core from 4.2.32 to
 4.2.33

Bumps [io.dropwizard.metrics:metrics-core](https://github.com/dropwizard/metrics) from 4.2.32 to 4.2.33.
- [Release notes](https://github.com/dropwizard/metrics/releases)
- [Commits](https://github.com/dropwizard/metrics/compare/v4.2.32...v4.2.33)

---
updated-dependencies:
- dependency-name: io.dropwizard.metrics:metrics-core
  dependency-version: 4.2.33
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c20763a13..724c57984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
-    <metrics.version>4.2.32</metrics.version>
+    <metrics.version>4.2.33</metrics.version>
     <micrometer.version>1.15.1</micrometer.version>
     <opentelemetry.version>1.51.0</opentelemetry.version>
     <jackson.version>2.19.1</jackson.version>

From 479c39d625d178cb2d2151445ab268a4d45bfda5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 00:08:49 +0000
Subject: [PATCH 66/81] Bump org.junit:junit-bom from 5.13.1 to 5.13.2

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.1 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.1...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 724c57984..f3066cf6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.51.0</opentelemetry.version>
     <jackson.version>2.19.1</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.13.1</junit.jupiter.version>
+    <junit.jupiter.version>5.13.2</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.5.1</micrometer-tracing-test.version>

From 3c8138de00cec3b49611f3732bda8f836e098f55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Jul 2025 00:34:45 +0000
Subject: [PATCH 67/81] Bump org.apache.maven.plugins:maven-gpg-plugin from
 3.2.7 to 3.2.8

Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.7 to 3.2.8.
- [Release notes](https://github.com/apache/maven-gpg-plugin/releases)
- [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.7...maven-gpg-plugin-3.2.8)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-gpg-plugin
  dependency-version: 3.2.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f3066cf6e..1e46dee99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
     <maven.surefire.plugin.version>3.5.3</maven.surefire.plugin.version>
     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     <maven.failsafe.plugin.version>3.5.3</maven.failsafe.plugin.version>
-    <maven.gpg.plugin.version>3.2.7</maven.gpg.plugin.version>
+    <maven.gpg.plugin.version>3.2.8</maven.gpg.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
     <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>

From 227244c876802f42af2a93d38302ef249aacd32c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 00:18:46 +0000
Subject: [PATCH 68/81] Bump org.junit:junit-bom from 5.13.2 to 5.13.3

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.2 to 5.13.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.2...r5.13.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1e46dee99..728ae0905 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.51.0</opentelemetry.version>
     <jackson.version>2.19.1</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.13.2</junit.jupiter.version>
+    <junit.jupiter.version>5.13.3</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.5.1</micrometer-tracing-test.version>

From 3b8c53d9400994681af4ac8b2f099026857fbcae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 03:44:29 +0000
Subject: [PATCH 69/81] Bump com.diffplug.spotless:spotless-maven-plugin from
 2.44.5 to 2.45.0

Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.44.5 to 2.45.0.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/maven/2.44.5...lib/2.45.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-version: 2.45.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 728ae0905..27a6f7fd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
     <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
-    <spotless.version>2.44.5</spotless.version>
+    <spotless.version>2.45.0</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>
     <!--
     These groovy scripts are used later in this POM file to generate

From 67c1a8447121feb55d9e42dc18e640debd0258f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 03:52:18 +0000
Subject: [PATCH 70/81] Bump io.micrometer:micrometer-tracing-integration-test

Bumps [io.micrometer:micrometer-tracing-integration-test](https://github.com/micrometer-metrics/tracing) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.5.1...v1.5.2)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-integration-test
  dependency-version: 1.5.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 27a6f7fd3..c9356e3ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <junit.jupiter.version>5.13.3</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
-    <micrometer-tracing-test.version>1.5.1</micrometer-tracing-test.version>
+    <micrometer-tracing-test.version>1.5.2</micrometer-tracing-test.version>
     <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <bouncycastle.version>1.81</bouncycastle.version>

From fb8c270a3bca3ef688c225040518a38a48c38cbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 05:25:04 +0000
Subject: [PATCH 71/81] Bump io.micrometer:micrometer-core from 1.15.1 to
 1.15.2

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.15.1 to 1.15.2.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.15.1...v1.15.2)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-version: 1.15.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 27a6f7fd3..b0ba25f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <spotless.check.skip>true</spotless.check.skip>
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.33</metrics.version>
-    <micrometer.version>1.15.1</micrometer.version>
+    <micrometer.version>1.15.2</micrometer.version>
     <opentelemetry.version>1.51.0</opentelemetry.version>
     <jackson.version>2.19.1</jackson.version>
     <logback.version>1.2.13</logback.version>

From c3be8a062a27708ae54f54803267e49be16fdee1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 05:28:27 +0000
Subject: [PATCH 72/81] Bump opentelemetry.version from 1.51.0 to 1.52.0

Bumps `opentelemetry.version` from 1.51.0 to 1.52.0.

Updates `io.opentelemetry:opentelemetry-api` from 1.51.0 to 1.52.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.51.0...v1.52.0)

Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.51.0 to 1.52.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.51.0...v1.52.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-api
  dependency-version: 1.52.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-sdk-testing
  dependency-version: 1.52.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 958da4e49..2ef370548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <slf4j.version>1.7.36</slf4j.version>
     <metrics.version>4.2.33</metrics.version>
     <micrometer.version>1.15.2</micrometer.version>
-    <opentelemetry.version>1.51.0</opentelemetry.version>
+    <opentelemetry.version>1.52.0</opentelemetry.version>
     <jackson.version>2.19.1</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.13.3</junit.jupiter.version>

From cb124f1aa0877fceb1afd1a6ed3745904827a32f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jul 2025 00:36:25 +0000
Subject: [PATCH 73/81] Bump com.diffplug.spotless:spotless-maven-plugin from
 2.45.0 to 2.46.0

Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.45.0 to 2.46.0.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/lib/2.45.0...maven/2.46.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-version: 2.46.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2ef370548..14c9d5dbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
     <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
-    <spotless.version>2.45.0</spotless.version>
+    <spotless.version>2.46.0</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>
     <!--
     These groovy scripts are used later in this POM file to generate

From 13bdb1ff8b4b329ef4b08b7cbdcdb95a6e2a4924 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jul 2025 00:36:48 +0000
Subject: [PATCH 74/81] Bump com.fasterxml.jackson.core:jackson-databind from
 2.19.1 to 2.19.2

Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.19.1 to 2.19.2.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.19.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2ef370548..f8f07d605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <metrics.version>4.2.33</metrics.version>
     <micrometer.version>1.15.2</micrometer.version>
     <opentelemetry.version>1.52.0</opentelemetry.version>
-    <jackson.version>2.19.1</jackson.version>
+    <jackson.version>2.19.2</jackson.version>
     <logback.version>1.2.13</logback.version>
     <junit.jupiter.version>5.13.3</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>

From 9d0284a2daca59c361f79d93057a811e9d8cdf59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Mon, 21 Jul 2025 14:49:53 +0200
Subject: [PATCH 75/81] Add test for blocked connection

And make sure channel shutdown listener is called.

(cherry picked from commit d2920647b747c4381fe4a65c5069122c27754e56)

Conflicts:
	src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java
---
 .../client/test/BlockedConnectionTest.java    | 40 ++++++++++++++++++-
 .../rabbitmq/client/test/BrokerTestCase.java  |  4 +-
 .../client/test/LambdaCallbackTest.java       | 14 +------
 .../client/test/server/BlockedConnection.java | 14 ++-----
 src/test/java/com/rabbitmq/tools/Host.java    | 14 +++----
 5 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java b/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java
index d3ceb146f..5cb825a01 100644
--- a/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java
+++ b/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java
@@ -1,4 +1,5 @@
-// Copyright (c) 2023 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+// Copyright (c) 2007-2025 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom
+// Inc. and/or its subsidiaries.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2
@@ -18,11 +19,18 @@
 import static com.rabbitmq.client.test.TestUtils.LatchConditions.completed;
 import static com.rabbitmq.client.test.TestUtils.waitAtMost;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
+
+import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeoutException;
+
+import com.rabbitmq.client.MessageProperties;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -59,4 +67,34 @@ void errorInBlockListenerShouldCloseConnection(boolean nio) throws Exception {
     waitAtMost(() -> !c.isOpen());
   }
 
+  @Test
+  void shutdownListenerShouldBeCalledWhenChannelDies() throws Exception {
+    long confirmTimeout = Duration.ofSeconds(2).toMillis();
+    ConnectionFactory cf = TestUtils.connectionFactory();
+    Connection c = cf.newConnection();
+    boolean blocked = false;
+    try {
+      CountDownLatch blockedLatch = new CountDownLatch(1);
+      c.addBlockedListener(reason -> blockedLatch.countDown(), () -> {});
+      Channel ch = c.createChannel();
+      CountDownLatch chShutdownLatch = new CountDownLatch(1);
+      ch.addShutdownListener(cause -> chShutdownLatch.countDown());
+      ch.confirmSelect();
+      ch.basicPublish("", "", MessageProperties.BASIC, "".getBytes());
+      ch.waitForConfirmsOrDie(confirmTimeout);
+      block();
+      blocked = true;
+      ch.basicPublish("", "", MessageProperties.BASIC, "".getBytes());
+      assertThat(blockedLatch).is(completed());
+      ch.basicPublish("", "", MessageProperties.BASIC, "".getBytes());
+      assertThatThrownBy(() -> ch.waitForConfirmsOrDie(confirmTimeout))
+          .isInstanceOf(TimeoutException.class);
+      assertThat(chShutdownLatch).is(completed());
+    } finally {
+      if (blocked) {
+        unblock();
+      }
+      c.close();
+    }
+  }
 }
diff --git a/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java
index 22b2042f7..cdd988930 100644
--- a/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java
+++ b/src/test/java/com/rabbitmq/client/test/BrokerTestCase.java
@@ -315,12 +315,12 @@ protected void clearResourceAlarm(String source) throws IOException {
         Host.clearResourceAlarm(source);
     }
 
-    protected void block() throws IOException, InterruptedException {
+    protected void block() throws IOException {
         Host.rabbitmqctl("set_vm_memory_high_watermark 0.000000001");
         setResourceAlarm("disk");
     }
 
-    protected void unblock() throws IOException, InterruptedException {
+    protected void unblock() throws IOException {
         Host.rabbitmqctl("set_vm_memory_high_watermark 0.4");
         clearResourceAlarm("disk");
     }
diff --git a/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java b/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java
index 1fb6c2e82..acc8266c1 100644
--- a/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java
+++ b/src/test/java/com/rabbitmq/client/test/LambdaCallbackTest.java
@@ -39,11 +39,7 @@ protected void createResources() throws IOException, TimeoutException {
     @Override
     protected void releaseResources() throws IOException {
         channel.queueDelete(queue);
-        try {
-            unblock();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        unblock();
     }
 
     @Test public void shutdownListener() throws Exception {
@@ -78,13 +74,7 @@ protected void releaseResources() throws IOException {
         final CountDownLatch latch = new CountDownLatch(1);
         try(Connection connection = TestUtils.connectionFactory().newConnection()) {
             connection.addBlockedListener(
-                reason -> {
-                    try {
-                        unblock();
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-            },
+                reason -> unblock(),
                 () -> latch.countDown()
             );
             block();
diff --git a/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java b/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java
index cc8be03e0..3de06c3d8 100644
--- a/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java
+++ b/src/test/java/com/rabbitmq/client/test/server/BlockedConnection.java
@@ -35,11 +35,7 @@
 
 public class BlockedConnection extends BrokerTestCase {
     protected void releaseResources() throws IOException {
-        try {
-            unblock();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+        unblock();
     }
     // this test first opens a connection, then triggers
     // and alarm and blocks
@@ -79,14 +75,10 @@ private Connection connection(final CountDownLatch latch) throws IOException, Ti
         Connection connection = factory.newConnection();
         connection.addBlockedListener(new BlockedListener() {
             public void handleBlocked(String reason) throws IOException {
-                try {
-                    unblock();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+                unblock();
             }
 
-            public void handleUnblocked() throws IOException {
+            public void handleUnblocked() {
                 latch.countDown();
             }
         });
diff --git a/src/test/java/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java
index ad8799c11..36976ee68 100644
--- a/src/test/java/com/rabbitmq/tools/Host.java
+++ b/src/test/java/com/rabbitmq/tools/Host.java
@@ -254,10 +254,7 @@ public static String node_portB()
     }
 
     public static String rabbitmqctlCommand() {
-        String rabbitmqCtl = System.getProperty("rabbitmqctl.bin");
-        if (rabbitmqCtl == null) {
-            throw new IllegalStateException("Please define the rabbitmqctl.bin system property");
-        }
+        String rabbitmqCtl = rabbitmqctl();
         if (rabbitmqCtl.startsWith(DOCKER_PREFIX)) {
             String containerId = rabbitmqCtl.split(":")[1];
             return "docker exec " + containerId + " rabbitmqctl";
@@ -266,11 +263,12 @@ public static String rabbitmqctlCommand() {
         }
     }
 
+    private static String rabbitmqctl() {
+        return System.getProperty("rabbitmqctl.bin", "DOCKER:rabbitmq");
+    }
+
     public static boolean isOnDocker() {
-        String rabbitmqCtl = System.getProperty("rabbitmqctl.bin");
-        if (rabbitmqCtl == null) {
-            throw new IllegalStateException("Please define the rabbitmqctl.bin system property");
-        }
+        String rabbitmqCtl = rabbitmqctl();
         return rabbitmqCtl.startsWith(DOCKER_PREFIX);
     }
 

From eb18ca4e2862c9128f040691495d93ef01a79660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Mon, 21 Jul 2025 16:30:38 +0200
Subject: [PATCH 76/81] Call consumer shutdown callback even if close times out

References #1651

(cherry picked from commit f9b69f3038c0579cdb081e983aeae134f3df25a6)
---
 .../com/rabbitmq/client/impl/ChannelN.java    | 13 +++++-
 .../client/test/BlockedConnectionTest.java    |  4 ++
 ...cation.java => ConsumerNotifications.java} | 45 ++++++++++++-------
 .../test/functional/FunctionalTestSuite.java  |  2 +-
 4 files changed, 45 insertions(+), 19 deletions(-)
 rename src/test/java/com/rabbitmq/client/test/functional/{ConsumerCancelNotification.java => ConsumerNotifications.java} (83%)

diff --git a/src/main/java/com/rabbitmq/client/impl/ChannelN.java b/src/main/java/com/rabbitmq/client/impl/ChannelN.java
index b44c60e86..4ee371273 100644
--- a/src/main/java/com/rabbitmq/client/impl/ChannelN.java
+++ b/src/main/java/com/rabbitmq/client/impl/ChannelN.java
@@ -33,6 +33,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Main interface to AMQP protocol functionality. Public API -
@@ -609,10 +610,13 @@ protected void close(int closeCode,
             signal.initCause(cause);
         }
 
+        AtomicBoolean finishProcessShutdownSignalCalled = new AtomicBoolean(false);
         BlockingRpcContinuation<AMQCommand> k = new BlockingRpcContinuation<AMQCommand>(){
             @Override
             public AMQCommand transformReply(AMQCommand command) {
-                ChannelN.this.finishProcessShutdownSignal();
+                if (finishProcessShutdownSignalCalled.compareAndSet(false, true)) {
+                    ChannelN.this.finishProcessShutdownSignal();
+                }
                 return command;
             }};
         boolean notify = false;
@@ -643,6 +647,13 @@ public AMQCommand transformReply(AMQCommand command) {
             if (!abort)
                 throw ioe;
         } finally {
+            if (finishProcessShutdownSignalCalled.compareAndSet(false, true)) {
+                try {
+                    ChannelN.this.finishProcessShutdownSignal();
+                } catch (Exception e) {
+                    LOGGER.info("Error while processing shutdown signal: {}", e.getMessage());
+                }
+            }
             if (abort || notify) {
                 // Now we know everything's been cleaned up and there should
                 // be no more surprises arriving on the wire. Release the
diff --git a/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java b/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java
index 5cb825a01..7af27fbfd 100644
--- a/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java
+++ b/src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java
@@ -77,6 +77,9 @@ void shutdownListenerShouldBeCalledWhenChannelDies() throws Exception {
       CountDownLatch blockedLatch = new CountDownLatch(1);
       c.addBlockedListener(reason -> blockedLatch.countDown(), () -> {});
       Channel ch = c.createChannel();
+      String q = ch.queueDeclare().getQueue();
+      CountDownLatch consShutdownLatch = new CountDownLatch(1);
+      ch.basicConsume(q, (ctag, msg) -> { }, (ctag, r) -> consShutdownLatch.countDown());
       CountDownLatch chShutdownLatch = new CountDownLatch(1);
       ch.addShutdownListener(cause -> chShutdownLatch.countDown());
       ch.confirmSelect();
@@ -89,6 +92,7 @@ void shutdownListenerShouldBeCalledWhenChannelDies() throws Exception {
       ch.basicPublish("", "", MessageProperties.BASIC, "".getBytes());
       assertThatThrownBy(() -> ch.waitForConfirmsOrDie(confirmTimeout))
           .isInstanceOf(TimeoutException.class);
+      assertThat(consShutdownLatch).is(completed());
       assertThat(chShutdownLatch).is(completed());
     } finally {
       if (blocked) {
diff --git a/src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java b/src/test/java/com/rabbitmq/client/test/functional/ConsumerNotifications.java
similarity index 83%
rename from src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java
rename to src/test/java/com/rabbitmq/client/test/functional/ConsumerNotifications.java
index e7f32dedb..3f32da152 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/ConsumerNotifications.java
@@ -28,10 +28,11 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class ConsumerCancelNotification extends BrokerTestCase {
+public class ConsumerNotifications extends BrokerTestCase {
 
     private final String queue = "cancel_notification_queue";
 
@@ -42,7 +43,7 @@ public class ConsumerCancelNotification extends BrokerTestCase {
         channel.queueDeclare(queue, false, true, false, null);
         Consumer consumer = new DefaultConsumer(channel) {
             @Override
-            public void handleCancel(String consumerTag) throws IOException {
+            public void handleCancel(String consumerTag) {
                 try {
                     result.put(true);
                 } catch (InterruptedException e) {
@@ -55,7 +56,31 @@ public void handleCancel(String consumerTag) throws IOException {
         assertTrue(result.take());
     }
 
-    class AlteringConsumer extends DefaultConsumer {
+    @Test public void consumerCancellationHandlerUsesBlockingOperations()
+            throws IOException, InterruptedException {
+        final String altQueue = "basic.cancel.fallback";
+        channel.queueDeclare(queue, false, true, false, null);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        final AlteringConsumer consumer = new AlteringConsumer(channel, altQueue, latch);
+
+        channel.basicConsume(queue, consumer);
+        channel.queueDelete(queue);
+
+        latch.await(2, TimeUnit.SECONDS);
+    }
+
+    @Test
+    void handleShutdownShouldBeCalledWhenChannelIsClosed() throws Exception {
+        Channel ch = connection.createChannel();
+        String q = ch.queueDeclare().getQueue();
+        CountDownLatch latch = new CountDownLatch(1);
+        ch.basicConsume(q, (ctag, msg) -> {}, (ctag, r) -> latch.countDown());
+        ch.close();
+        assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
+    }
+
+    private static class AlteringConsumer extends DefaultConsumer {
         private final String altQueue;
         private final CountDownLatch latch;
 
@@ -81,18 +106,4 @@ public void handleCancel(String consumerTag) {
             }
         }
     }
-
-    @Test public void consumerCancellationHandlerUsesBlockingOperations()
-            throws IOException, InterruptedException {
-        final String altQueue = "basic.cancel.fallback";
-        channel.queueDeclare(queue, false, true, false, null);
-
-        CountDownLatch latch = new CountDownLatch(1);
-        final AlteringConsumer consumer = new AlteringConsumer(channel, altQueue, latch);
-
-        channel.basicConsume(queue, consumer);
-        channel.queueDelete(queue);
-
-        latch.await(2, TimeUnit.SECONDS);
-    }
 }
diff --git a/src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java
index 650e9f233..4fef629cf 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java
@@ -53,7 +53,7 @@
     DefaultExchange.class,
     UnbindAutoDeleteExchange.class,
     Confirm.class,
-    ConsumerCancelNotification.class,
+    ConsumerNotifications.class,
     UnexpectedFrames.class,
     PerQueueTTL.class,
     PerMessageTTL.class,

From d0a73c767ce5e7b97b7a6974dbb9c57380a8c01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Mon, 21 Jul 2025 16:43:16 +0200
Subject: [PATCH 77/81] Refactor BlockingCell with modern concurrency utilities

"Modern" as in "from the 21st century".

(cherry picked from commit a676f1c1f1212f0e83f5f47cd61a1c3ead8dd84b)
---
 .../com/rabbitmq/utility/BlockingCell.java    | 59 ++++++++-----------
 .../utility/BlockingValueOrException.java     |  4 +-
 2 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/rabbitmq/utility/BlockingCell.java b/src/main/java/com/rabbitmq/utility/BlockingCell.java
index 0792ebde7..dae25c1b5 100644
--- a/src/main/java/com/rabbitmq/utility/BlockingCell.java
+++ b/src/main/java/com/rabbitmq/utility/BlockingCell.java
@@ -16,27 +16,24 @@
 
 package com.rabbitmq.utility;
 
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * Simple one-shot IPC mechanism. Essentially a one-place buffer that cannot be emptied once filled.
  */
 public class BlockingCell<T> {
-    /** Indicator of not-yet-filledness */
-    private boolean _filled = false;
 
-    /** Will be null until a value is supplied, and possibly still then. */
-    private T _value;
+    private final AtomicReference<T> value = new AtomicReference<>();
+    private final CountDownLatch latch = new CountDownLatch(1);
 
     private static final long NANOS_IN_MILLI = 1000L * 1000L;
 
     private static final long INFINITY = -1;
 
-    /** Instantiate a new BlockingCell waiting for a value of the specified type. */
-    public BlockingCell() {
-        // no special handling required in default constructor
-    }
-
     /**
      * Wait for a value, and when one arrives, return it (without clearing it). If there's already a value present, there's no need to wait - the existing value
      * is returned.
@@ -44,11 +41,9 @@ public BlockingCell() {
      *
      * @throws InterruptedException if this thread is interrupted
      */
-    public synchronized T get() throws InterruptedException {
-        while (!_filled) {
-            wait();
-        }
-        return _value;
+    public T get() throws InterruptedException {
+        this.latch.await();
+        return this.value.get();
     }
 
     /**
@@ -60,30 +55,27 @@ public synchronized T get() throws InterruptedException {
      * @return the waited-for value
      * @throws InterruptedException if this thread is interrupted
      */
-    public synchronized T get(long timeout) throws InterruptedException, TimeoutException {
+    public T get(long timeout) throws InterruptedException, TimeoutException {
         if (timeout == INFINITY) return get();
 
         if (timeout < 0) {
             throw new IllegalArgumentException("Timeout cannot be less than zero");
         }
 
-        long now = System.nanoTime() / NANOS_IN_MILLI;
-        long maxTime = now + timeout;
-        while (!_filled && (now = (System.nanoTime() / NANOS_IN_MILLI)) < maxTime) {
-            wait(maxTime - now);
-        }
+        boolean done = this.latch.await(timeout, MILLISECONDS);
 
-        if (!_filled)
+        if (!done) {
             throw new TimeoutException();
+        }
 
-        return _value;
+        return this.value.get();
     }
 
     /**
      * As get(), but catches and ignores InterruptedException, retrying until a value appears.
      * @return the waited-for value
      */
-    public synchronized T uninterruptibleGet() {
+    public T uninterruptibleGet() {
         boolean wasInterrupted = false;
         try {
             while (true) {
@@ -110,7 +102,7 @@ public synchronized T uninterruptibleGet() {
      * @param timeout timeout in milliseconds. -1 means 'infinity': never time out
      * @return the waited-for value
      */
-    public synchronized T uninterruptibleGet(int timeout) throws TimeoutException {
+    public T uninterruptibleGet(int timeout) throws TimeoutException {
         long now = System.nanoTime() / NANOS_IN_MILLI;
         long runTime = now + timeout;
         boolean wasInterrupted = false;
@@ -128,7 +120,6 @@ public synchronized T uninterruptibleGet(int timeout) throws TimeoutException {
                 Thread.currentThread().interrupt();
             }
         }
-
         throw new TimeoutException();
     }
 
@@ -136,13 +127,12 @@ public synchronized T uninterruptibleGet(int timeout) throws TimeoutException {
      * Store a value in this BlockingCell, throwing {@link IllegalStateException} if the cell already has a value.
      * @param newValue the new value to store
      */
-    public synchronized void set(T newValue) {
-        if (_filled) {
+    public void set(T newValue) {
+        if (this.value.compareAndSet(null, newValue)) {
+            this.latch.countDown();
+        } else {
             throw new IllegalStateException("BlockingCell can only be set once");
         }
-        _value = newValue;
-        _filled = true;
-        notifyAll();
     }
 
     /**
@@ -150,11 +140,12 @@ public synchronized void set(T newValue) {
      * @return true if this call to setIfUnset actually updated the BlockingCell; false if the cell already had a value.
      * @param newValue the new value to store
      */
-    public synchronized boolean setIfUnset(T newValue) {
-        if (_filled) {
+    public boolean setIfUnset(T newValue) {
+        if (this.value.compareAndSet(null, newValue)) {
+            this.latch.countDown();
+            return true;
+        } else {
             return false;
         }
-        set(newValue);
-        return true;
     }
 }
diff --git a/src/main/java/com/rabbitmq/utility/BlockingValueOrException.java b/src/main/java/com/rabbitmq/utility/BlockingValueOrException.java
index 41f93249d..720127745 100644
--- a/src/main/java/com/rabbitmq/utility/BlockingValueOrException.java
+++ b/src/main/java/com/rabbitmq/utility/BlockingValueOrException.java
@@ -21,11 +21,11 @@ public class BlockingValueOrException<V, E extends Throwable & SensibleClone<E>>
     extends BlockingCell<ValueOrException<V, E>>
 {
     public void setValue(V v) {
-        super.set(ValueOrException.<V, E>makeValue(v));
+        super.set(ValueOrException.makeValue(v));
     }
 
     public void setException(E e) {
-        super.set(ValueOrException.<V, E>makeException(e));
+        super.set(ValueOrException.makeException(e));
     }
 
     public V uninterruptibleGetValue() throws E {

From b411f8efbbe9b117b73f4e6440bfedf4d2ff99f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 06:32:08 +0000
Subject: [PATCH 78/81] Bump org.junit:junit-bom from 5.13.3 to 5.13.4

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-version: 5.13.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 79e9776c5..09b3ccd11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <opentelemetry.version>1.52.0</opentelemetry.version>
     <jackson.version>2.19.2</jackson.version>
     <logback.version>1.2.13</logback.version>
-    <junit.jupiter.version>5.13.3</junit.jupiter.version>
+    <junit.jupiter.version>5.13.4</junit.jupiter.version>
     <mockito.version>5.18.0</mockito.version>
     <assertj.version>3.27.3</assertj.version>
     <micrometer-tracing-test.version>1.5.2</micrometer-tracing-test.version>

From 8160f396ab1158b57b90558a6ee1b17d394deab4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 06:32:20 +0000
Subject: [PATCH 79/81] Bump com.diffplug.spotless:spotless-maven-plugin from
 2.46.0 to 2.46.1

Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.46.0 to 2.46.1.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/maven/2.46.0...maven/2.46.1)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-version: 2.46.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 79e9776c5..967644b1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
     <checksum.maven.plugin.version>1.11</checksum.maven.plugin.version>
     <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
     <jshell-maven-plugin.version>1.4</jshell-maven-plugin.version>
-    <spotless.version>2.46.0</spotless.version>
+    <spotless.version>2.46.1</spotless.version>
     <google-java-format.version>1.19.2</google-java-format.version>
     <!--
     These groovy scripts are used later in this POM file to generate

From b137a30380eca9c49c003af9331f0bb03417da5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Tue, 22 Jul 2025 09:34:19 +0200
Subject: [PATCH 80/81] Set release version to 5.26.0

---
 release-versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-versions.txt b/release-versions.txt
index 8b3d8b35c..8550fe9f2 100644
--- a/release-versions.txt
+++ b/release-versions.txt
@@ -1,3 +1,3 @@
-RELEASE_VERSION="5.25.0"
-DEVELOPMENT_VERSION="5.26.0-SNAPSHOT"
+RELEASE_VERSION="5.26.0"
+DEVELOPMENT_VERSION="5.27.0-SNAPSHOT"
 RELEASE_BRANCH="5.x.x-stable"

From a8f7e2cb29f401afd050626a303c036ec714fce2 Mon Sep 17 00:00:00 2001
From: rabbitmq-ci <rabbitmq-ci@users.noreply.github.com>
Date: Tue, 22 Jul 2025 07:35:37 +0000
Subject: [PATCH 81/81] [maven-release-plugin] prepare release v5.26.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index edfa5758a..4bbc1a239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.rabbitmq</groupId>
   <artifactId>amqp-client</artifactId>
-  <version>5.26.0-SNAPSHOT</version>
+  <version>5.26.0</version>
   <packaging>jar</packaging>
 
   <name>RabbitMQ Java Client</name>
@@ -42,7 +42,7 @@
     <url>https://github.com/rabbitmq/rabbitmq-java-client</url>
     <connection>scm:git:git://github.com/rabbitmq/rabbitmq-java-client.git</connection>
     <developerConnection>scm:git:https://github.com/rabbitmq/rabbitmq-java-client.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>v5.26.0</tag>
   </scm>
 
   <organization>

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/rabbitmq/rabbitmq-java-client/compare/rabbitmq:cd449fe...rabbitmq:a8f7e2c.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/rabbitmq/rabbitmq-java-client/compare/rabbitmq:cd449fe...rabbitmq:a8f7e2c.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/rabbitmq/rabbitmq-java-client/compare/rabbitmq:cd449fe...rabbitmq:a8f7e2c.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/rabbitmq/rabbitmq-java-client/compare/rabbitmq:cd449fe...rabbitmq:a8f7e2c.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>