Merge branch '2.5.x'

Closes gh-28341
spring-projects · Oct 14, 2021 · 05aab86 · 05aab86
2 parents 2d837a6 + 865615e
commit 05aab86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -608,6 +608,13 @@ bom {
 			]
 		}
 	}
+	library("Jakarta Management", "1.1.4") {
+		group("jakarta.management.j2ee") {
+			modules = [
+				"jakarta.management.j2ee-api"
+			]
+		}
+	}
 	library("Jakarta Persistence", "2.2.3") {
 		prohibit("[3.0.0-RC1,)") {
 			because "it uses the jakarta.* namespace"

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
@@ -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")
 }