You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2023/04/14 14:53:31 UTC

[solr] branch branch_9x updated: SOLR-16747: Fix source-release gradle build (#1562)

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

houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 835babdb4e1 SOLR-16747: Fix source-release gradle build (#1562)
835babdb4e1 is described below

commit 835babdb4e106d26481c39d7ab03a42d9c77e838
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Apr 14 10:50:51 2023 -0400

    SOLR-16747: Fix source-release gradle build (#1562)
    
    (cherry picked from commit 797ec312b5b1450b2c7073eb29253f092f6ae438)
---
 solr/CHANGES.txt                 | 3 +++
 solr/solr-ref-guide/build.gradle | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f8fc1f3ae0c..909d3146bff 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -82,6 +82,9 @@ Bug Fixes
 
 * SOLR-16741: CLUSTERSTATUS API returns wrong value for state ,leader for PRS collections (noble)
 
+* SOLR-16747: The Solr source release can now be built/checked using gradle.
+  The solr-ref-guide tasks will not be included by default if the root directory is not a github repository. (Houston Putman)
+
 Dependency Upgrades
 ---------------------
 * PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)
diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index bf42b66c4a9..0c42b97029b 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -40,7 +40,8 @@ def escapeYamlSingleQuotesString(props) {
 
 // Attach building the ref guide to standard convention tasks. This
 // can be optionally turned off (see SOLR-15670).
-if (propertyOrEnvOrDefault('refguide.include', 'SOLR_REF_GUIDE_INCLUDE', "true").toBoolean()) {
+var defaultRefGuideInclude = file('${rootDir}/.git').exists()
+if (propertyOrEnvOrDefault('refguide.include', 'SOLR_REF_GUIDE_INCLUDE', "${defaultRefGuideInclude}").toBoolean()) {
     check.dependsOn 'checkSiteLinks'
     assemble.dependsOn 'buildLocalSite'
 }