Merge branch '3.3.x' into 3.4.x

wilkinsona · wilkinsona · commit 611240c6ade6 · 2025-04-24T16:42:05.000+01:00
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -203,6 +203,7 @@ dokkatoo {
 }
 
 def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) {
+	dependsOn configurations.resolvedBom
 	destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))
 	options {
 		author = true

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ dokkatoo {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) {`
	`206`	`+ dependsOn configurations.resolvedBom`
`206`	`207`	`destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))`
`207`	`208`	`options {`
`208`	`209`	`author = true`