[lucene-solr] branch master updated: 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

[us...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new b7c60e5  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
b7c60e5 is described below

commit b7c60e53eb8d7c7c01ccd7c00add2662e503fd08
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Mon May 18 09:03:25 2020 +0200

    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
---
 gradle/documentation/changes-to-html.gradle | 5 ++++-
 gradle/render-javadoc.gradle                | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gradle/documentation/changes-to-html.gradle b/gradle/documentation/changes-to-html.gradle
index 25dee76..e3a3848 100644
--- a/gradle/documentation/changes-to-html.gradle
+++ b/gradle/documentation/changes-to-html.gradle
@@ -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
       ]
     }
 
diff --git a/gradle/render-javadoc.gradle b/gradle/render-javadoc.gradle
index ab5f0ae..7fcee58 100644
--- a/gradle/render-javadoc.gradle
+++ b/gradle/render-javadoc.gradle
@@ -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() {