@@ -12,7 +12,7 @@ plugins {
1212 `kotlin- library- conventions`
1313}
1414
15- val modularProjects: List <Project > by rootProject.extra
15+ val modularProjects: List <Project > by rootProject
1616
1717// Because we need to set up Javadoc aggregation
1818modularProjects.forEach { evaluationDependsOn(it.path) }
@@ -50,6 +50,7 @@ asciidoctorj {
5050
5151val snapshot = rootProject.version.toString().contains(" SNAPSHOT" )
5252val docsVersion = if (snapshot) " snapshot" else rootProject.version
53+ val releaseBranch = if (snapshot) " master" else " r${rootProject.version} "
5354val docsDir = file(" $buildDir /ghpages-docs" )
5455val replaceCurrentDocs = project.hasProperty(" replaceCurrentDocs" )
5556val uploadPdfs = ! snapshot
@@ -150,15 +151,15 @@ tasks {
150151 attributes(mapOf (
151152 " linkToPdf" to uploadPdfs,
152153 " jupiter-version" to version,
153- " platform-version" to project.properties[ " platformVersion" ] ,
154- " vintage-version" to project.properties[ " vintageVersion" ] ,
154+ " platform-version" to project.property( " platformVersion" ) ,
155+ " vintage-version" to project.property( " vintageVersion" ) ,
155156 " bom-version" to version,
156157 " junit4-version" to Versions .junit4,
157158 " apiguardian-version" to Versions .apiGuardian,
158159 " ota4j-version" to Versions .ota4j,
159160 " surefire-version" to Versions .surefire,
160- " release-branch" to project.properties[ " releaseBranch" ] ,
161- " docs-version" to project.properties[ " docsVersion" ] ,
161+ " release-branch" to releaseBranch,
162+ " docs-version" to docsVersion,
162163 " revnumber" to version,
163164 " consoleLauncherOptionsFile" to consoleLauncherOptionsFile,
164165 " experimentalApisTableFile" to experimentalApisTableFile,
0 commit comments