Skip to content

Commit 865615e

Browse files
committed
Merge branch '2.4.x' into 2.5.x
Closes gh-28340
2 parents 3800f06 + ce1a141 commit 865615e

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,13 @@ bom {
599599
]
600600
}
601601
}
602+
library("Jakarta Management", "1.1.4") {
603+
group("jakarta.management.j2ee") {
604+
modules = [
605+
"jakarta.management.j2ee-api"
606+
]
607+
}
608+
}
602609
library("Jakarta Persistence", "2.2.3") {
603610
prohibit("[3.0.0-RC1,)") {
604611
because "it uses the jakarta.* namespace"

spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
99
api("org.springframework:spring-jms")
1010
api("org.apache.activemq:activemq-broker") {
11+
exclude group: "org.apache.geronimo.specs", module: "geronimo-j2ee-management_1.1_spec"
1112
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_1.1_spec"
1213
}
1314
api("jakarta.jms:jakarta.jms-api")
15+
api("jakarta.management.j2ee:jakarta.management.j2ee-api")
1416
}

0 commit comments

Comments
 (0)