Skip to content

Commit 6d18ea5

Browse files
committed
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
2 parents ad61236 + 21a9f4b commit 6d18ea5

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

Diff for: spring-boot-project/spring-boot-docs/build.gradle

+23-20
Original file line numberDiff line numberDiff line change
@@ -201,29 +201,32 @@ dokkatoo {
201201
moduleName.set("Spring Boot Kotlin API")
202202
}
203203

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

0 commit comments

Comments
 (0)