Merge branch '3.4.x'

wilkinsona · wilkinsona · commit 0351e33b18e7 · 2025-04-24T16:42:14.000+01:00
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -201,6 +201,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
`@@ -201,6 +201,7 @@ dokkatoo {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) {`
	`204`	`+ dependsOn configurations.resolvedBom`
`204`	`205`	`destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))`
`205`	`206`	`options {`
`206`	`207`	`author = true`