Skip to content

Commit 067e6c2

Browse files
rwinchrstoyanchev
authored andcommitted
fix framework-docs.gradle
1 parent 35229c8 commit 067e6c2

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ configure(rootProject) {
155155

156156
nohttp {
157157
source.exclude "**/test-output/**"
158+
source.exclude "**/.gradle/**"
158159
allowlistFile = project.file("src/nohttp/allowlist.lines")
159160
def rootPath = file(rootDir).toPath()
160161
def projectDirs = allprojects.collect { it.projectDir } + "${rootDir}/buildSrc"

framework-docs/framework-docs.gradle

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,18 @@ antora {
3636

3737

3838
tasks.named("generateAntoraYml") {
39-
dependsOn dependencyVersions
4039
asciidocAttributes = project.provider( {
4140
return ["spring-version": project.version ]
4241
} )
4342
}
4443

44+
tasks.create("generateAntoraResources") {
45+
dependsOn 'generateAntoraYml'
46+
}
47+
48+
tasks.named("check") {
49+
dependsOn 'antora'
50+
}
4551

4652
jar {
4753
enabled = false
@@ -57,6 +63,15 @@ repositories {
5763
}
5864
}
5965

66+
dependencies {
67+
api(project(":spring-context"))
68+
api(project(":spring-web"))
69+
api("jakarta.servlet:jakarta.servlet-api")
70+
71+
implementation(project(":spring-core-test"))
72+
implementation("org.assertj:assertj-core")
73+
}
74+
6075
/**
6176
* Produce Javadoc for all Spring Framework modules in "build/docs/javadoc"
6277
*/
@@ -109,9 +124,9 @@ rootProject.tasks.dokkaHtmlMultiModule.configure {
109124
}
110125

111126
/**
112-
* Zip all docs (API and reference) into a single archive
127+
* Zip all Java docs (javadoc & kdoc) into a single archive
113128
*/
114-
task docsZip(type: Zip, dependsOn: ['api', 'antora', rootProject.tasks.dokkaHtmlMultiModule]) {
129+
task docsZip(type: Zip, dependsOn: ['api', rootProject.tasks.dokkaHtmlMultiModule]) {
115130
group = "Distribution"
116131
description = "Builds -${archiveClassifier} archive containing api and reference " +
117132
"for deployment at https://docs.spring.io/spring-framework/docs/."
@@ -124,9 +139,6 @@ task docsZip(type: Zip, dependsOn: ['api', 'antora', rootProject.tasks.dokkaHtml
124139
from (api) {
125140
into "javadoc-api"
126141
}
127-
from ("build/site") {
128-
into "reference/html"
129-
}
130142
from (rootProject.tasks.dokkaHtmlMultiModule.outputDirectory) {
131143
into "kdoc-api"
132144
}

0 commit comments

Comments
 (0)