From ce1a1415ab3ac26b15d91b108f7277f95bd08e54 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 14 Oct 2021 14:10:18 +0100
Subject: [PATCH] Use official Jakarta Management API dependency in ActiveMQ
 starter

Fixes gh-28339
---
 spring-boot-project/spring-boot-dependencies/build.gradle  | 7 +++++++
 .../spring-boot-starter-activemq/build.gradle              | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 4354404f7b..0c1ead734f 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -548,6 +548,13 @@ bom {
 			]
 		}
 	}
+	library("Jakarta Management", "1.1.4") {
+		group("jakarta.management.j2ee") {
+			modules = [
+				"jakarta.management.j2ee-api"
+			]
+		}
+	}
 	library("Jakarta Persistence", "2.2.3") {
 		group("jakarta.persistence") {
 			modules = [
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle
index a57e591da8..224b4ae390 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle
@@ -8,7 +8,9 @@ dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
 	api("org.springframework:spring-jms")
 	api("org.apache.activemq:activemq-broker") {
+		exclude group: "org.apache.geronimo.specs", module: "geronimo-j2ee-management_1.1_spec"
 		exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_1.1_spec"
 	}
 	api("jakarta.jms:jakarta.jms-api")
+	api("jakarta.management.j2ee:jakarta.management.j2ee-api")
 }