Merge commit '228cbf9776'

Author: michaelklishin

deps/rabbit/docs/rabbitmq.conf.example

@@ -384,6 +384,17 @@
 ## properties that may conflict or significantly change queue behavior and semantics, such as the 'exclusive' field.
 # quorum_queue.property_equivalence.relaxed_checks_on_redeclaration = true
 
+## Sets the initial quorum queue replica count for newly declared quorum queues.
+## This value can be overridden using the 'x-quorum-initial-group-size' queue argument
+## at declaration time.
+# quorum_queue.initial_cluster_size = 3
+
+## Sets the maximum number of unconfirmed messages a channel can send
+## before publisher flow control is triggered.
+## The current default is configured to provide good performance and stability
+## when there are multiple publishers sending to the same quorum queue.
+# quorum_queue.commands_soft_limit = 32
+
 ## Changes classic queue storage implementation version.
 ## In 4.0.x, version 2 is the default and this is a forward compatibility setting,
 ## that is, it will be useful when a new version is developed.

deps/rabbit/priv/schema/rabbit.schema

@@ -2610,6 +2610,15 @@ end}.
 {mapping, "quorum_queue.property_equivalence.relaxed_checks_on_redeclaration", "rabbit.quorum_relaxed_checks_on_redeclaration", [
     {datatype, {enum, [true, false]}}]}.
 
+{mapping, "quorum_queue.initial_cluster_size", "rabbit.quorum_cluster_size", [
+  {datatype, integer},
+  {validators, ["non_zero_positive_integer"]}
+]}.
+
+{mapping, "quorum_queue.commands_soft_limit", "rabbit.quorum_commands_soft_limit", [
+  {datatype, integer},
+  {validators, ["non_zero_positive_integer"]}
+]}.
 
 %%
 %% Quorum Queue membership reconciliation

deps/rabbit/test/amqp_jms_SUITE_data/pom.xml

@@ -8,12 +8,12 @@
   <name>rabbitmq-amqp-jms-tests</name>
   <url>https://www.rabbitmq.com</url>
   <properties>
-    <junit.jupiter.version>5.12.1</junit.jupiter.version>
+    <junit.jupiter.version>5.12.2</junit.jupiter.version>
     <assertj.version>3.27.3</assertj.version>
     <qpid-jms-client.version>2.7.0</qpid-jms-client.version>
     <amqp-client.version>[0.6.0-SNAPSHOT,)</amqp-client.version>
     <logback.version>1.5.18</logback.version>
-    <spotless.version>2.44.3</spotless.version>
+    <spotless.version>2.44.4</spotless.version>
     <google-java-format.version>1.26.0</google-java-format.version>
     <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
     <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -1067,6 +1067,20 @@ credential_validator.regexp = ^abc\\d+",
      ]}],
    []},
 
+  {quorum_queue_initial_cluster_size,
+   "quorum_queue.initial_cluster_size = 3",
+   [{rabbit, [
+      {quorum_cluster_size, 3}
+     ]}],
+   []},
+
+  {quorum_queue_commands_soft_limit,
+   "quorum_queue.commands_soft_limit = 32",
+   [{rabbit, [
+      {quorum_commands_soft_limit, 32}
+     ]}],
+   []},
+
   %%
   %% Runtime parameters
   %%

deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot/pom.xml

@@ -35,7 +35,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <junit.jupiter.version>5.12.1</junit.jupiter.version>
+        <junit.jupiter.version>5.12.2</junit.jupiter.version>
     </properties>
 
     <groupId>com.rabbitmq.examples</groupId>

deps/rabbitmq_mqtt/test/java_SUITE_data/pom.xml

@@ -16,14 +16,14 @@
     <paho.v5.version>[1.2.5,)</paho.v5.version>
     <paho.v3.version>[1.2.5,)</paho.v3.version>
     <amqp-client.version>5.25.0</amqp-client.version>
-    <junit.version>5.12.1</junit.version>
+    <junit.version>5.12.2</junit.version>
     <assertj.version>3.27.3</assertj.version>
     <logback.version>1.2.13</logback.version>
     <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
     <groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
     <groovy.version>2.4.21</groovy.version>
     <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-    <spotless.version>2.44.3</spotless.version>
+    <spotless.version>2.44.4</spotless.version>
     <google-java-format.version>1.17.0</google-java-format.version>
     <test-keystore.ca>${project.build.directory}/ca.keystore</test-keystore.ca>
     <test-keystore.password>bunnychow</test-keystore.password>

deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml

@@ -27,12 +27,12 @@
 
     <properties>
         <stream-client.version>[0.12.0-SNAPSHOT,)</stream-client.version>
-        <junit.jupiter.version>5.12.1</junit.jupiter.version>
+        <junit.jupiter.version>5.12.2</junit.jupiter.version>
         <assertj.version>3.27.3</assertj.version>
         <logback.version>1.2.13</logback.version>
         <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
         <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-        <spotless.version>2.44.3</spotless.version>
+        <spotless.version>2.44.4</spotless.version>
         <google-java-format.version>1.17.0</google-java-format.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml

@@ -27,15 +27,15 @@
 
     <properties>
         <stream-client.version>[0.12.0-SNAPSHOT,)</stream-client.version>
-        <junit.jupiter.version>5.12.1</junit.jupiter.version>
+        <junit.jupiter.version>5.12.2</junit.jupiter.version>
         <assertj.version>3.27.3</assertj.version>
         <logback.version>1.2.13</logback.version>
         <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
         <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-        <spotless.version>2.44.3</spotless.version>
+        <spotless.version>2.44.4</spotless.version>
         <google-java-format.version>1.18.1</google-java-format.version>
         <okhttp.version>4.12.0</okhttp.version>
-        <gson.version>2.12.1</gson.version>
+        <gson.version>2.13.0</gson.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>