[lucene-solr] branch master updated: LUCENE-9333: Use DirectoryProperty instead of directly having Provider; move script file to input field.

[to...@apache.org]

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

tomoko 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 51c15b8  LUCENE-9333: Use DirectoryProperty instead of directly having Provider; move script file to input field.
     new 3b09d30  Merge branch 'master' of github.com:apache/lucene-solr
51c15b8 is described below

commit 51c15b8660b9d6a3e5979bf1e53a98262db413e9
Author: Tomoko Uchida <to...@apache.org>
AuthorDate: Tue May 19 21:26:38 2020 +0900

    LUCENE-9333: Use DirectoryProperty instead of directly having Provider; move script file to input field.
---
 gradle/documentation/changes-to-html.gradle | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gradle/documentation/changes-to-html.gradle b/gradle/documentation/changes-to-html.gradle
index 16e9d21..8d8c02e 100644
--- a/gradle/documentation/changes-to-html.gradle
+++ b/gradle/documentation/changes-to-html.gradle
@@ -32,11 +32,15 @@ class ChangesToHtmlTask extends DefaultTask {
   File siteDir = project.rootProject.file("lucene/site/changes")
 
   @OutputDirectory
-  Provider<File> targetDir = project.providers.provider { project.file("${project.docroot}/changes") }
+  final DirectoryProperty targetDir = project.objects.directoryProperty()
+    .fileProvider(project.providers.provider { project.file("${project.docroot}/changes") })
 
   @Input
   def luceneDocUrl = "${->project.luceneDocUrl}"
 
+  @InputFile
+  def script = project.rootProject.file("${siteDir}/changes2html.pl")
+
   def loadVersions(File outfile) {
     // load version properties from DOAP RDF
     def prefix = "doap.${project.name}".toString()
@@ -52,13 +56,13 @@ class ChangesToHtmlTask extends DefaultTask {
     def result = project.exec {
       executable "perl"
       standardInput changesFile.newInputStream()
-      standardOutput project.file("${targetDir.get()}/Changes.html").newOutputStream()
+      standardOutput project.file("${targetDir.get().getAsFile()}/Changes.html").newOutputStream()
       errorOutput = output
       ignoreExitValue = true
 
       args += [
         "-CSD",
-        project.rootProject.file("${siteDir}/changes2html.pl").toString(),
+        script,
         "${project.name}",
         versionsFile.toString(),
         luceneDocUrl.concat('/')   // slash required at end by perl script