[lucene-solr] branch master updated: Use -D or -P to set solrGuideVersion.

[dw...@apache.org]

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

dweiss 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 01e97db  Use -D or -P to set solrGuideVersion.
01e97db is described below

commit 01e97dbd16235d590b817e59b094a6c853e73106
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Sep 2 12:57:38 2020 +0200

    Use -D or -P to set solrGuideVersion.
---
 solr/solr-ref-guide/build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index ac48516..3567d88 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -125,9 +125,7 @@ ext {
     solrDocsVersion = "${version}".replaceAll(/^(\d+\.\d+)(|\..*)$/, "\$1")
     solrDocsVersionPath = "${solrDocsVersion}".replaceAll(/^(\d+)\.(\d+)$/, "\$1_\$2_0")
 
-    if (!project.hasProperty("solrGuideVersion")) {
-        solrGuideVersion = "${solrDocsVersion}-DRAFT"
-    }
+    solrGuideVersion = propertyOrDefault("solrGuideVersion", "${solrDocsVersion}-DRAFT")
 
     solrRootPath = '../../../../solr/'
     solrGuideDraftStatus = solrGuideVersion.matches(/^\d+\.\d+(|\.\d+)$/) ? "" : "DRAFT"