LUCENE-9321: Lazy evaluate project properties in the render-javadocs / changes2html task, also make URL (as its passed on command line) an input of task

This commit is contained in:
Uwe Schindler 2020-05-18 09:03:25 +02:00
parent 06df50e759
commit b7c60e53eb
2 changed files with 6 additions and 3 deletions

View File

@ -34,6 +34,9 @@ class ChangesToHtmlTask extends DefaultTask {
@OutputDirectory
File targetDir = project.file("${project.docroot}/changes")
@Input
def luceneDocUrl = "${->project.luceneDocUrl}"
def loadVersions(File outfile) {
// load version properties from DOAP RDF
def prefix = "doap.${project.name}".toString()
@ -58,7 +61,7 @@ class ChangesToHtmlTask extends DefaultTask {
project.rootProject.file("${siteDir}/changes2html.pl").toString(),
"${project.name}",
versionsFile.toString(),
project.luceneDocUrl.concat('/')
luceneDocUrl.concat('/') // slash required at end by perl script
]
}

View File

@ -146,10 +146,10 @@ class RenderJavadocTask extends DefaultTask {
def offlineLinks = [:]
@Input
def luceneDocUrl = project.luceneDocUrl
def luceneDocUrl = "${->project.luceneDocUrl}"
@Input
def solrDocUrl = project.solrDocUrl
def solrDocUrl = "${->project.solrDocUrl}"
/** Utility method to recursively collect all tasks with same name like this one that we depend on */
private Set findRenderTasksInDependencies() {