[solr] branch jira/solr-15556-antora updated: Correctly pass attributes

[mdrob]

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

mdrob 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 4fe41bd  Correctly pass attributes
4fe41bd is described below

commit 4fe41bd3fff51bd0a76ba7409c1f36f89b2e0ce6
Author: Mike Drob <md...@apache.org>
AuthorDate: Tue Jan 25 18:31:16 2022 -0600

    Correctly pass attributes
---
 solr/solr-ref-guide/build.gradle | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index 990a318..b1dd823 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -313,8 +313,17 @@ antora {
     // TODO document these properties in help
   playbookFile = file(propertyOrEnvOrDefault("refguide.playbook", 
"REFGUIDE_PLAYBOOK", "playbook.yml"));
   antoraVersion = "3.0.1"
-    // TODO this isn't getting the result of the prepare sources tasks, so 
missing dynamic dependency versions
-  arguments = htmlSiteDetails.props.collect { k,v -> ['--attribute', 
"$k=$v"]}.flatten() + '--fetch'
-
-  // dependsOn tasks.prepareHtmlSiteDetailsSources
+    // TODO this is duplicated but I think the other instance of this is going 
away because it's specific to jekyll?
+    // Set these dependency versions as lazy gstrings so that they're resolved 
after evaluation.
+    arguments = [
+            ["ivyCommonsCodec", "commons-codec", "commons-codec"],
+            ["ivyDropwizardMetrics", "io.dropwizard.metrics", "metrics-core"],
+            ["ivyHadoop", "org.apache.hadoop", "hadoop-auth"],
+            ["ivyLog4j", "org.apache.logging.log4j", "log4j-core"],
+            ["ivyOpennlpTools", "org.apache.opennlp", "opennlp-tools"],
+            ["ivyTika", "org.apache.tika", "tika-core"],
+            ["ivyZookeeper", "org.apache.zookeeper", "zookeeper"],
+    ].collectEntries {
+        propKey, depGroup, depId -> [propKey, "${ -> 
project.getVersion(depGroup, depId) }"]
+    }.collect { k,v -> ['--attribute', "$k=$v"]}.flatten() + '--fetch'
 }