From c9cd623a62c56d8f5f9ac88d341395d9cb2cb3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 21 Apr 2020 15:10:13 +0200 Subject: [PATCH] SOLR-14421: Fix non-working examples in solr.in.cmd --- solr/CHANGES.txt | 2 ++ solr/bin/solr.in.cmd | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 9f3bdc8ff85..faa37e3a8de 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -133,6 +133,8 @@ Bug Fixes * SOLR-14371: Zk StatusHandler now parse dynamic zk server config if supported, fixing Admin UI Zookeeper Status screen in case dynamic reconfig host list differs from static zkHost string (janhoy) +* SOLR-14421: New examples in solr.in.cmd in Solr 8.5 don't work as provided (Colvin Cowie via janhoy) + Other Changes --------------------- * SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd index 9100db494f0..45622d86c4a 100755 --- a/solr/bin/solr.in.cmd +++ b/solr/bin/solr.in.cmd @@ -167,13 +167,13 @@ REM * javax.net.ssl.keyStorePassword REM * javax.net.ssl.trustStorePassword REM More info: https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/CredentialProviderAPI.html REM set SOLR_HADOOP_CREDENTIAL_PROVIDER_PATH=localjceks://file/home/solr/hadoop-credential-provider.jceks -REM set SOLR_OPTS=" -Dsolr.ssl.credential.provider.chain=hadoop" +REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.ssl.credential.provider.chain=hadoop REM Settings for authentication REM Please configure only one of SOLR_AUTHENTICATION_CLIENT_BUILDER or SOLR_AUTH_TYPE parameters REM set SOLR_AUTHENTICATION_CLIENT_BUILDER=org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory REM set SOLR_AUTH_TYPE=basic -REM set SOLR_AUTHENTICATION_OPTS="-Dbasicauth=solr:SolrRocks" +REM set SOLR_AUTHENTICATION_OPTS=-Dbasicauth=solr:SolrRocks REM Settings for ZK ACL REM set SOLR_ZK_CREDS_AND_ACLS=-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider ^ @@ -186,17 +186,17 @@ REM When running Solr in non-cloud mode and if planning to do distributed search REM list of hosts needs to be whitelisted or Solr will forbid the request. The whitelist can be configured in solr.xml, REM or if you are using the OOTB solr.xml, can be specified using the system property "solr.shardsWhitelist". Alternatively REM host checking can be disabled by using the system property "solr.disable.shardsWhitelist" -REM set SOLR_OPTS="%SOLR_OPTS% -Dsolr.shardsWhitelist=http://localhost:8983,http://localhost:8984" +REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.shardsWhitelist=http://localhost:8983,http://localhost:8984 REM For a visual indication in the Admin UI of what type of environment this cluster is, configure REM a -Dsolr.environment property below. Valid values are prod, stage, test, dev, with an optional REM label or color, e.g. -Dsolr.environment=test,label=Functional+test,color=brown -REM SOLR_OPTS="%SOLR_OPTS% -Dsolr.environment=prod" +REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.environment=prod REM Specifies the path to a common library directory that will be shared across all cores. REM Any JAR files in this directory will be added to the search path for Solr plugins. REM If the specified path is not absolute, it will be relative to `%SOLR_HOME%`. -REM SOLR_OPTS="%SOLR_OPTS% -Dsolr.sharedLib=/path/to/lib" +REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.sharedLib=/path/to/lib REM Runs solr in a java security manager sandbox. This can protect against some attacks. REM Runtime properties are passed to the security policy file (server\etc\security.policy)