(solr) branch branch_9x updated: Fix SOLR-16876 backport of bin/solr scripts to work with 9x SolrCLI.java

[epugh]

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

epugh 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 acaed85f854 Fix SOLR-16876 backport of bin/solr scripts to work with 
9x SolrCLI.java
acaed85f854 is described below

commit acaed85f8544b66b127175df02c798e74dd90ff2
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Wed Jan 17 14:33:31 2024 -0500

    Fix SOLR-16876 backport of bin/solr scripts to work with 9x SolrCLI.java
---
 solr/bin/solr     | 2 +-
 solr/bin/solr.cmd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index 664c0ce86da..278c6177924 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1657,7 +1657,7 @@ if [[ "$SCRIPT_CMD" == "auth" ]]; then
         fi
       done
   fi
-  run_tool auth "${AUTH_PARAMS[@]}" -solrUrl 
"$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:${AUTH_PORT:-8983}" -authConfDir 
"$SOLR_HOME" $VERBOSE
+  run_tool auth "${AUTH_PARAMS[@]}" -solrUrl 
"$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:${AUTH_PORT:-8983}/solr" -authConfDir 
"$SOLR_HOME" $VERBOSE
   exit $?
 fi
 
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 1b043888b83..3856862137a 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -2070,7 +2070,7 @@ if "!AUTH_PORT!"=="" (
     
-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml"
 ^
     -classpath 
"%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*"
 ^
     org.apache.solr.cli.SolrCLI auth %AUTH_PARAMS% -solrIncludeFile 
"%SOLR_INCLUDE%" -authConfDir "%SOLR_HOME%" ^
-    -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!AUTH_PORT!
+    -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!AUTH_PORT!/solr
 goto done