[lucene-solr] branch jira/LUCENE-9312 updated: LUCENE-9312: evaluate 'javadocCmdPath' property in task definition

[to...@apache.org]

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

tomoko pushed a commit to branch jira/LUCENE-9312
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/LUCENE-9312 by this push:
     new c43188d  LUCENE-9312: evaluate 'javadocCmdPath' property in task definition
c43188d is described below

commit c43188d0282082c77f70f9a219f34a4e45118b4b
Author: Tomoko Uchida <to...@apache.org>
AuthorDate: Tue Jul 21 01:27:41 2020 +0900

    LUCENE-9312: evaluate 'javadocCmdPath' property in task definition
---
 gradle/documentation/render-javadoc.gradle | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle
index e84370c..bdc43b5 100644
--- a/gradle/documentation/render-javadoc.gradle
+++ b/gradle/documentation/render-javadoc.gradle
@@ -42,11 +42,6 @@ allprojects {
       srcDirSet = sourceSets.main.java;
 
       outputDir = project.javadoc.destinationDir;
-
-      // set javadoc command path when it passed via ext property
-      if (project.hasProperty("javadocCmdPath")) {
-        javadocCmdPath = project.javadocCmdPath
-      }
     }
 
     task renderSiteJavadoc(type: RenderJavadocTask) {
@@ -62,10 +57,6 @@ allprojects {
       // Place the documentation under Lucene or Solr's documentation directory.
       // docroot is defined in 'documentation.gradle'
       outputDir = project.docroot.toPath().resolve(project.relativeDocPath).toFile()
-
-      if (project.hasProperty("javadocCmdPath")) {
-        javadocCmdPath = project.javadocCmdPath
-      }
     }
   }
 }
@@ -161,7 +152,7 @@ class RenderJavadocTask extends DefaultTask {
   def solrDocUrl = "${->project.solrDocUrl}"
 
   @Input
-  def javadocCmdPath = org.gradle.internal.jvm.Jvm.current().getJavadocExecutable().toString()
+  def javadocCmdPath = "${-> project.hasProperty("javadocCmdPath") ? project.javadocCmdPath : org.gradle.internal.jvm.Jvm.current().getJavadocExecutable().toString()}"
   
   /** Utility method to recursively collect all tasks with same name like this one that we depend on */
   private Set findRenderTasksInDependencies() {