diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index a4f3e8da7dd..c70a2ad4ab5 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -136,6 +136,8 @@ Bug Fixes * SOLR-14099: Fixed @LogLevel annotation in test-framework to correctly 'unset' Loggers after test (hossman) +* SOLR-14017: Ensure bin/solr's -q and -v options work with examples (Andy Vuong via Jason Gerlowski) + * SOLR-14106: Cleanup Jetty SslContextFactory usage (Ryan Rockenbaugh, Jan Hoydahl, Kevin Risden) Other Changes diff --git a/solr/bin/solr b/solr/bin/solr index 9a5a4a21187..8a3a3ac61b3 100755 --- a/solr/bin/solr +++ b/solr/bin/solr @@ -1737,10 +1737,12 @@ if [ $# -gt 0 ]; then ;; -v) SOLR_LOG_LEVEL=DEBUG + PASS_TO_RUN_EXAMPLE+=" -Dsolr.log.level=$SOLR_LOG_LEVEL" shift ;; -q) SOLR_LOG_LEVEL=WARN + PASS_TO_RUN_EXAMPLE+=" -Dsolr.log.level=$SOLR_LOG_LEVEL" shift ;; -all) diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd index b48c537209b..974d7e1272a 100755 --- a/solr/bin/solr.cmd +++ b/solr/bin/solr.cmd @@ -718,11 +718,13 @@ goto parse_args :set_debug set SOLR_LOG_LEVEL=DEBUG +set "PASS_TO_RUN_EXAMPLE=!PASS_TO_RUN_EXAMPLE! -Dsolr.log.level=%SOLR_LOG_LEVEL%" SHIFT goto parse_args :set_warn set SOLR_LOG_LEVEL=WARN +set "PASS_TO_RUN_EXAMPLE=!PASS_TO_RUN_EXAMPLE! -Dsolr.log.level=%SOLR_LOG_LEVEL%" SHIFT goto parse_args