Skip to content

Commit c0125e2

Browse files
committed
Merge branch '3.4.x'
Closes gh-45227
2 parents 92fe6b0 + b7ac4f3 commit c0125e2

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

spring-boot-project/spring-boot-docs/build.gradle

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -200,29 +200,32 @@ dokkatoo {
200200
moduleName.set("Spring Boot Kotlin API")
201201
}
202202

203-
task aggregatedJavadoc(type: Javadoc) {
204-
project.rootProject.gradle.projectsEvaluated {
205-
Set<Project> publishedProjects = rootProject.subprojects.findAll { it != project }
206-
.findAll { it.plugins.hasPlugin(JavaPlugin) && it.plugins.hasPlugin(MavenPublishPlugin) }
207-
.findAll { !it.path.contains(":spring-boot-tools:") ||
208-
it.path.contains(":spring-boot-tools:spring-boot-buildpack-platform") ||
209-
it.path.contains(":spring-boot-tools:spring-boot-loader-tools") ||
210-
(it.path.contains(":spring-boot-tools:spring-boot-loader") && !it.path.contains("spring-boot-loader-classic"))}
211-
.findAll { !it.name.startsWith('spring-boot-starter') }
203+
def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) {
204+
destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))
205+
options {
206+
author = true
207+
docTitle = "Spring Boot ${project.version} API"
208+
memberLevel = "protected"
209+
outputLevel = "quiet"
210+
splitIndex = true
211+
use = true
212+
windowTitle = "Spring Boot ${project.version} API"
213+
}
214+
doFirst(new ConfigureJavadocLinks(configurations.resolvedBom, ["Spring Framework", "Spring Security", "Tomcat"]))
215+
}
216+
217+
project.rootProject.gradle.projectsEvaluated {
218+
Set<Project> publishedProjects = rootProject.subprojects.findAll { it != project }
219+
.findAll { it.plugins.hasPlugin(JavaPlugin) && it.plugins.hasPlugin(MavenPublishPlugin) }
220+
.findAll { !it.path.contains(":spring-boot-tools:") ||
221+
it.path.contains(":spring-boot-tools:spring-boot-buildpack-platform") ||
222+
it.path.contains(":spring-boot-tools:spring-boot-loader-tools") ||
223+
(it.path.contains(":spring-boot-tools:spring-boot-loader") && !it.path.contains("spring-boot-loader-classic"))}
224+
.findAll { !it.name.startsWith('spring-boot-starter') }
225+
aggregatedJavadoc.configure {
212226
dependsOn publishedProjects.javadoc
213227
source publishedProjects.javadoc.source
214228
classpath = project.files(publishedProjects.javadoc.classpath)
215-
destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))
216-
options {
217-
author = true
218-
docTitle = "Spring Boot ${project.version} API"
219-
memberLevel = "protected"
220-
outputLevel = "quiet"
221-
splitIndex = true
222-
use = true
223-
windowTitle = "Spring Boot ${project.version} API"
224-
}
225-
doFirst(new ConfigureJavadocLinks(configurations.resolvedBom, ["Spring Framework", "Spring Security", "Tomcat"]))
226229
}
227230
}
228231

0 commit comments

Comments
 (0)