[solr] branch jira/solr-15556-antora updated: Fix caching while building with local UI package

[houston]

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

houston pushed a commit to branch jira/solr-15556-antora
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/jira/solr-15556-antora by this 
push:
     new b107af9  Fix caching while building with local UI package
b107af9 is described below

commit b107af9c16e8d0bf0bd6d32cf673bbba39516903
Author: Houston Putman <hous...@apache.org>
AuthorDate: Thu Feb 3 17:17:00 2022 -0500

    Fix caching while building with local UI package
---
 solr/solr-ref-guide/build.gradle | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index fe74b0e..5389f76 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -183,7 +183,7 @@ task downloadAntoraCli(type: NpmTask) {
 
     inputs.property("Antora version", project.ext.antoraVersion)
     inputs.files("${project.ext.nodeProjectDir}/package.json")
-    outputs.dir("${project.ext.nodeProjectDir}/node_modules/")
+    outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/cli")
 }
 
 task downloadAntoraSiteGenerator(type: NpmTask) {
@@ -191,7 +191,7 @@ task downloadAntoraSiteGenerator(type: NpmTask) {
 
     inputs.property("Antora version", project.ext.antoraVersion)
     inputs.files("${project.ext.nodeProjectDir}/package.json")
-    outputs.dir("${project.ext.nodeProjectDir}/node_modules/")
+    
outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/site-generator-default")
 }
 
 task downloadAntora {
@@ -202,22 +202,17 @@ task downloadAntora {
 task downloadLinkValidator(type: NpmTask) {
     dependsOn tasks.downloadAntoraCli
 
-    args = ["install", "linkinator"]
+    args = ["install", "link-checker"]
 
     inputs.files("${project.ext.nodeProjectDir}/package.json")
-    outputs.dir("${project.ext.nodeProjectDir}/node_modules/")
+    outputs.dir("${project.ext.nodeProjectDir}/node_modules/link-checker")
 }
 
 task downloadUIDependencies(type: NpmTask) {
     args = ["install", "gitlab:antora/antora-ui-default", "--include=dev"]
 
-    /*execOverrides {
-        // The it variable contains the `ExecSpec`
-        it.workingDir = file("${projectDir}/ui")
-    }*/
-
     inputs.files("${project.ext.nodeProjectDir}/package.json")
-    outputs.dir("${project.ext.nodeProjectDir}/node_modules/")
+    
outputs.dir("${project.ext.nodeProjectDir}/node_modules/@antora/ui-default")
 }
 
 task startUIBuildDir(type: Copy) {
@@ -282,7 +277,9 @@ task buildUIBundle(type: NpxTask) {
         }
     }
 
-    inputs.files(fileTree("${buildDir}/ui"))
+    inputs.files(fileTree("${buildDir}/ui/src") {
+        exclude "node_modules"
+    })
     outputs.dir(project.ext.siteDir)
 }