diff --git a/build.gradle b/build.gradle index a80f74f2e49..2bd350ca85f 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/framework-docs/framework-docs.gradle b/framework-docs/framework-docs.gradle index 5c26a91b428..59c29569a4e 100644 --- a/framework-docs/framework-docs.gradle +++ b/framework-docs/framework-docs.gradle @@ -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" }