Merge branch '4.0.x'

wilkinsona · wilkinsona · commit e76d19ee490d · 2026-02-12T12:02:29.000Z
diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle
@@ -490,7 +490,7 @@ bom {
 			dependencyManagementDeclaredIn("org.glassfish.jaxb:jaxb-bom") {
 				excluding { candidate -> candidate.classifier().equals("sources") }
 				excluding { candidate ->
-					def permittedGroups = Set.of("org.glassfix.jaxb", "com.sun.xml.bind")
+					def permittedGroups = Set.of("org.glassfish.jaxb", "com.sun.xml.bind")
 					return !permittedGroups.contains(candidate.groupId())
 				}
 			}
@@ -951,9 +951,7 @@ bom {
 	library("Jakarta XML Bind", "4.0.4") {
 		alignWith {
 			version {
-				of "jakarta.xml.bind:jakarta.xml.bind-api"
 				from "org.glassfish.jaxb:jaxb-core"
-				managedBy "Glassfish JAXB"
 			}
 		}
 		group("jakarta.xml.bind") {

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ bom {`
`490`	`490`	`dependencyManagementDeclaredIn("org.glassfish.jaxb:jaxb-bom") {`
`491`	`491`	`excluding { candidate -> candidate.classifier().equals("sources") }`
`492`	`492`	`excluding { candidate ->`
`493`		`- def permittedGroups = Set.of("org.glassfix.jaxb", "com.sun.xml.bind")`
	`493`	`+ def permittedGroups = Set.of("org.glassfish.jaxb", "com.sun.xml.bind")`
`494`	`494`	`return !permittedGroups.contains(candidate.groupId())`
`495`	`495`	`}`
`496`	`496`	`}`
`@@ -951,9 +951,7 @@ bom {`
`951`	`951`	`library("Jakarta XML Bind", "4.0.4") {`
`952`	`952`	`alignWith {`
`953`	`953`	`version {`
`954`		`- of "jakarta.xml.bind:jakarta.xml.bind-api"`
`955`	`954`	`from "org.glassfish.jaxb:jaxb-core"`
`956`		`- managedBy "Glassfish JAXB"`
`957`	`955`	`}`
`958`	`956`	`}`
`959`	`957`	`group("jakarta.xml.bind") {`