[solr] branch main updated: SOLR-16406: Take SOLR_MODULES into account (#1007)

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 1e6dd0e4be4 SOLR-16406: Take SOLR_MODULES into account (#1007)
1e6dd0e4be4 is described below

commit 1e6dd0e4be4244a892b3c9fac5a7771ec2ed9593
Author: Thomas Wöckinger <th...@users.noreply.github.com>
AuthorDate: Sat Sep 17 21:05:26 2022 +0200

    SOLR-16406: Take SOLR_MODULES into account (#1007)
---
 solr/CHANGES.txt  | 2 ++
 solr/bin/solr     | 5 +++++
 solr/bin/solr.cmd | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2ed45819bcd..3ced0052012 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -149,6 +149,8 @@ Bug Fixes
 
 * SOLR-7883: MoreLikeThisHandler to support facets (Mikhail Khludnev)
 
+* SOLR-16406: Take SOLR_MODULES, configured by solr.in.sh, into account. (Thomas Wöckinger via janhoy)
+
 Other Changes
 ---------------------
 * SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)
diff --git a/solr/bin/solr b/solr/bin/solr
index 396ef7c94b6..83b41e9b58d 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1799,6 +1799,11 @@ if [[ -n ${SOLR_LOG_LEVEL:-} ]] ; then
   SOLR_LOG_LEVEL_OPT="-Dsolr.log.level=$SOLR_LOG_LEVEL"
 fi
 
+# Solr modules option
+if [[ -n "${SOLR_MODULES:-}" ]] ; then
+  SOLR_OPTS+=("-Dsolr.modules=$SOLR_MODULES")
+fi
+
 : ${SOLR_SERVER_DIR:=$DEFAULT_SERVER_DIR}
 
 if [ ! -e "$SOLR_SERVER_DIR" ]; then
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index d9dc9298294..e2f2d4824de 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -982,6 +982,11 @@ IF NOT "%SOLR_HOST%"=="" (
   set SOLR_HOST_ARG=
 )
 
+REM Solr modules option
+IF DEFINED SOLR_MODULES (
+  set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.modules=%SOLR_MODULES%"
+)
+
 IF "%SOLR_SERVER_DIR%"=="" set "SOLR_SERVER_DIR=%DEFAULT_SERVER_DIR%"
 
 IF NOT EXIST "%SOLR_SERVER_DIR%" (