Merge pull request #45223 from ngocnhan-tran1996
* gh-45223: Polish "Avoid eager creation of aggregatedJavadoc task" Avoid eager creation of aggregatedJavadoc task Closes gh-45223
This commit is contained in:
commit
6d18ea5e11
|
@ -201,18 +201,7 @@ dokkatoo {
|
|||
moduleName.set("Spring Boot Kotlin API")
|
||||
}
|
||||
|
||||
task aggregatedJavadoc(type: Javadoc) {
|
||||
project.rootProject.gradle.projectsEvaluated {
|
||||
Set<Project> publishedProjects = rootProject.subprojects.findAll { it != project }
|
||||
.findAll { it.plugins.hasPlugin(JavaPlugin) && it.plugins.hasPlugin(MavenPublishPlugin) }
|
||||
.findAll { !it.path.contains(":spring-boot-tools:") ||
|
||||
it.path.contains(":spring-boot-tools:spring-boot-buildpack-platform") ||
|
||||
it.path.contains(":spring-boot-tools:spring-boot-loader-tools") ||
|
||||
(it.path.contains(":spring-boot-tools:spring-boot-loader") && !it.path.contains("spring-boot-loader-classic"))}
|
||||
.findAll { !it.name.startsWith('spring-boot-starter') }
|
||||
dependsOn publishedProjects.javadoc
|
||||
source publishedProjects.javadoc.source
|
||||
classpath = project.files(publishedProjects.javadoc.classpath)
|
||||
def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) {
|
||||
destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))
|
||||
options {
|
||||
author = true
|
||||
|
@ -225,6 +214,20 @@ task aggregatedJavadoc(type: Javadoc) {
|
|||
}
|
||||
doFirst(new ConfigureJavadocLinks(configurations.resolvedBom, ["Spring Framework", "Spring Security", "Tomcat"]))
|
||||
}
|
||||
|
||||
project.rootProject.gradle.projectsEvaluated {
|
||||
Set<Project> publishedProjects = rootProject.subprojects.findAll { it != project }
|
||||
.findAll { it.plugins.hasPlugin(JavaPlugin) && it.plugins.hasPlugin(MavenPublishPlugin) }
|
||||
.findAll { !it.path.contains(":spring-boot-tools:") ||
|
||||
it.path.contains(":spring-boot-tools:spring-boot-buildpack-platform") ||
|
||||
it.path.contains(":spring-boot-tools:spring-boot-loader-tools") ||
|
||||
(it.path.contains(":spring-boot-tools:spring-boot-loader") && !it.path.contains("spring-boot-loader-classic"))}
|
||||
.findAll { !it.name.startsWith('spring-boot-starter') }
|
||||
aggregatedJavadoc.configure {
|
||||
dependsOn publishedProjects.javadoc
|
||||
source publishedProjects.javadoc.source
|
||||
classpath = project.files(publishedProjects.javadoc.classpath)
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register("documentTestSlices", org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) {
|
||||
|
|
Loading…
Reference in New Issue