Merge branch '4.0.x'

snicoll · snicoll · commit 927b2eefdcca · 2025-12-29T15:04:15.000+01:00
Closes gh-48637
diff --git a/cli/spring-boot-cli/build.gradle b/cli/spring-boot-cli/build.gradle
@@ -63,7 +63,7 @@ dependencies {
 
 architectureCheck {
 	nullMarked {
-		enabled  = false
+		enabled  = true
 		ignoredPackages = ['org.springframework.boot.cli.json']
 	}
 }
diff --git a/configuration-metadata/spring-boot-configuration-metadata/build.gradle b/configuration-metadata/spring-boot-configuration-metadata/build.gradle
@@ -38,6 +38,5 @@ dependencies {
 architectureCheck {
 	nullMarked {
 		enabled  = false
-		ignoredPackages = ["org.springframework.boot.configurationmetadata.json"]
 	}
 }
diff --git a/configuration-metadata/spring-boot-configuration-processor/build.gradle b/configuration-metadata/spring-boot-configuration-processor/build.gradle
@@ -33,7 +33,6 @@ sourceSets {
 architectureCheck {
 	nullMarked {
 		enabled  = false
-		ignoredPackages = ["org.springframework.boot.configurationprocessor.json"]
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ dependencies {`
`63`	`63`
`64`	`64`	`architectureCheck {`
`65`	`65`	`nullMarked {`
`66`		`- enabled = false`
	`66`	`+ enabled = true`
`67`	`67`	`ignoredPackages = ['org.springframework.boot.cli.json']`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,5 @@ dependencies {`
`38`	`38`	`architectureCheck {`
`39`	`39`	`nullMarked {`
`40`	`40`	`enabled = false`
`41`		`- ignoredPackages = ["org.springframework.boot.configurationmetadata.json"]`
`42`	`41`	`}`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ sourceSets {`
`33`	`33`	`architectureCheck {`
`34`	`34`	`nullMarked {`
`35`	`35`	`enabled = false`
`36`		`- ignoredPackages = ["org.springframework.boot.configurationprocessor.json"]`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`