Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28340
This commit is contained in:
Andy Wilkinson 2021-10-14 14:10:33 +01:00
commit 865615e099
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -599,6 +599,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"

2
spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle
View File

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