Merge branch '2.5.x' into 2.6.x

Closes gh-31078

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -80,13 +80,15 @@ bom {
 				"artemis-core-client" {
 					exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
 				},
+				"artemis-jdbc-store",
 				"artemis-jms-client" {
 					exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
 				},
 				"artemis-jms-server" {
 					exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
 				},
 				"artemis-journal",
+				"artemis-quorum-api",
 				"artemis-selector",
 				"artemis-server" {
 					exclude group: "commons-logging", module: "commons-logging"