fix framework-docs.gradle

This commit is contained in:
Rob Winch
2023-04-18 15:12:18 -05:00
committed by rstoyanchev
parent 35229c8bff
commit 067e6c2a9e
2 changed files with 19 additions and 6 deletions

View File

@@ -155,6 +155,7 @@ configure(rootProject) {
nohttp {
source.exclude "**/test-output/**"
source.exclude "**/.gradle/**"
allowlistFile = project.file("src/nohttp/allowlist.lines")
def rootPath = file(rootDir).toPath()
def projectDirs = allprojects.collect { it.projectDir } + "${rootDir}/buildSrc"

View File

@@ -36,12 +36,18 @@ antora {
tasks.named("generateAntoraYml") {
dependsOn dependencyVersions
asciidocAttributes = project.provider( {
return ["spring-version": project.version ]
} )
}
tasks.create("generateAntoraResources") {
dependsOn 'generateAntoraYml'
}
tasks.named("check") {
dependsOn 'antora'
}
jar {
enabled = false
@@ -57,6 +63,15 @@ repositories {
}
}
dependencies {
api(project(":spring-context"))
api(project(":spring-web"))
api("jakarta.servlet:jakarta.servlet-api")
implementation(project(":spring-core-test"))
implementation("org.assertj:assertj-core")
}
/**
* Produce Javadoc for all Spring Framework modules in "build/docs/javadoc"
*/
@@ -109,9 +124,9 @@ rootProject.tasks.dokkaHtmlMultiModule.configure {
}
/**
* Zip all docs (API and reference) into a single archive
* Zip all Java docs (javadoc & kdoc) into a single archive
*/
task docsZip(type: Zip, dependsOn: ['api', 'antora', rootProject.tasks.dokkaHtmlMultiModule]) {
task docsZip(type: Zip, dependsOn: ['api', rootProject.tasks.dokkaHtmlMultiModule]) {
group = "Distribution"
description = "Builds -${archiveClassifier} archive containing api and reference " +
"for deployment at https://docs.spring.io/spring-framework/docs/."
@@ -124,9 +139,6 @@ task docsZip(type: Zip, dependsOn: ['api', 'antora', rootProject.tasks.dokkaHtml
from (api) {
into "javadoc-api"
}
from ("build/site") {
into "reference/html"
}
from (rootProject.tasks.dokkaHtmlMultiModule.outputDirectory) {
into "kdoc-api"
}