This is an automated email from the ASF dual-hosted git repository.
malliaridis 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 025c7a7dc5b SOLR-17352: Backport removal of deprecated options for
auth command (#2858) (#2889)
025c7a7dc5b is described below
commit 025c7a7dc5bef1743a38c41b2345376a01e70416
Author: Christos Malliaridis <malliari...@apache.org>
AuthorDate: Sun Dec 1 05:58:34 2024 +0200
SOLR-17352: Backport removal of deprecated options for auth command (#2858)
(#2889)
* Remove unsupported / deprecated options for auth command (#2858)
Co-authored-by: Eric Pugh <ep...@opensourceconnections.com>
(cherry picked from commit eb9864721fed029a78c8a66c51637ab1a7aaa859)
* Update outdated option --solr.home
---
solr/bin/solr.cmd | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 7e878bbaa37..6581d14ed4e 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -370,7 +370,7 @@ goto done
@echo -m memory Sets the min (-Xms) and max (-Xmx) heap size for the
JVM, such as: -m 4g
@echo results in: -Xms4g -Xmx4g; by default, this script
sets the heap size to 512m
@echo.
-@echo --solr.home dir Sets the solr.solr.home system property; Solr will
create core directories under
+@echo --solr-home dir Sets the solr.solr.home system property; Solr will
create core directories under
@echo this directory. This allows you to run multiple Solr
instances on the same host
@echo while reusing the same server directory set using the
--server-dir parameter. If set, the
@echo specified directory should contain a solr.xml file,
unless solr.xml exists in Zookeeper.
@@ -1565,11 +1565,9 @@ for %%a in (%*) do (
if "!arg:~0,1!" equ "-" set "option=!arg!"
) else (
set "option!option!=%%a"
- if "!option!" equ "-s" set "SOLR_HOME=%%a"
- if "!option!" equ "--solr-home" set "SOLR_HOME=%%a"
- if "!option!" equ "-d" set "SOLR_SERVER_DIR=%%a"
- if "!option!" equ "--server-dir" set "SOLR_SERVER_DIR=%%a"
- if not "!option!" equ "-s" if not "!option!" equ "--solr-home" if not
"!option!" equ "-d" if not "!option!" equ "--server-dir" (
+ if "!option!" equ "--solr-home" set "SOLR_HOME=%%a"
+ if "!option!" equ "--server-dir" set "SOLR_SERVER_DIR=%%a"
+ if not "!option!" equ "--solr-home" if not "!option!" equ "--server-dir"
(
set "AUTH_PARAMS=!AUTH_PARAMS! !option! %%a"
)
set "option="
