Merge branch '3.3.x'

Closes gh-41875

Author: wilkinsona

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

@@ -17,34 +17,15 @@ bom {
 	library("ActiveMQ", "6.1.3") {
 		group("org.apache.activemq") {
 			modules = [
-					"activemq-amqp",
-					"activemq-blueprint",
-					"activemq-broker",
-					"activemq-client",
 					"activemq-console" {
 						exclude group: "commons-logging", module: "commons-logging"
 					},
-					"activemq-http",
-					"activemq-jaas",
-					"activemq-jdbc-store",
-					"activemq-jms-pool",
-					"activemq-kahadb-store",
-					"activemq-karaf",
-					"activemq-log4j-appender",
-					"activemq-mqtt",
-					"activemq-openwire-generator",
-					"activemq-openwire-legacy",
-					"activemq-osgi",
-					"activemq-pool",
-					"activemq-ra",
-					"activemq-run",
-					"activemq-runtime-config",
-					"activemq-shiro",
 					"activemq-spring" {
 						exclude group: "commons-logging", module: "commons-logging"
-					},
-					"activemq-stomp",
-					"activemq-web"
+					}
+			]
+			imports = [
+					"activemq-bom"
 			]
 		}
 		links {