Apache Solr open-source search software
SOLR-16406: Take SOLR_MODULES into account (#1007)
Thomas Wöckinger1e6dd0e4be42
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 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/solrindex 396ef7c94b6..83b41e9b58d 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -1799,6 +1799,11 @@ if [[ -n ${SOLR_LOG_LEVEL:-} ]] ; thenSOLR_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" ]; thendiff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex 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%" (