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 332ac1816eb SOLR-17746: Provide long form --jettyconfig option to go
with -j (#3332)
332ac1816eb is described below
commit 332ac1816ebba1c72977dfd8bee3a356f0b58b83
Author: Eric Pugh <[email protected]>
AuthorDate: Wed Jun 25 14:49:34 2025 -0400
SOLR-17746: Provide long form --jettyconfig option to go with -j (#3332)
(cherry picked from commit 47e74382d3189c98085ce122700f8ca1295cb00d)
---
solr/CHANGES.txt | 2 ++
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
solr/packaging/test/test_start_solr.bats | 2 +-
.../modules/deployment-guide/pages/solr-control-script-reference.adoc | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5a3e421cf61..4cba2dc4920 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -69,6 +69,8 @@ Improvements
* SOLR-17776: The HttpJdkSolrClient wasn't setting the connection timeout as
per the builder configuration. (David Smiley)
+* SOLR-17746: Provide long form --jettyconfig option to go with -j in bin/solr
scripts. (Eric Pugh, Rahul Goswami)
+
Optimizations
---------------------
* SOLR-17578: Remove ZkController internal core supplier, for slightly faster
reconnection after Zookeeper session loss. (Pierre Salagnac)
diff --git a/solr/bin/solr b/solr/bin/solr
index 4dc5de351ca..da03e93dbee 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -438,7 +438,7 @@ function print_usage() {
echo " you could pass: --jvm-opts
\"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=18983\""
echo " In most cases, you should wrap the
additional parameters in double quotes."
echo ""
- echo " -j <jettyParams> Additional parameters to pass to Jetty when
starting Solr."
+ echo " -j/--jettyconfig <jettyParams> Additional parameters to pass to
Jetty when starting Solr."
echo " For example, to add configuration folder
that jetty should read"
echo " you could pass: -j
\"--include-jetty-dir=/etc/jetty/custom/server/\""
echo " In most cases, you should wrap the
additional parameters in double quotes."
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 239044d0622..35c98db4922 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -392,7 +392,7 @@ goto done
@echo you could pass: --jvm-opts
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=18983"
@echo In most cases, you should wrap the additional parameters
in double quotes.
@echo.
-@echo -j opts Additional parameters to pass to Jetty when starting
Solr.
+@echo -j/--jettyconfig opts Additional parameters to pass to Jetty when
starting Solr.
@echo For example, to add configuration folder that jetty
should read
@echo you could pass: -j
"--include-jetty-dir=/etc/jetty/custom/server/"
@echo In most cases, you should wrap the additional parameters
in double quotes.
diff --git a/solr/packaging/test/test_start_solr.bats
b/solr/packaging/test/test_start_solr.bats
index b028e0fe059..acbfb67d8b1 100644
--- a/solr/packaging/test/test_start_solr.bats
+++ b/solr/packaging/test/test_start_solr.bats
@@ -103,6 +103,6 @@ teardown() {
export ENABLE_REMOTE_JMX_OPTS=true
export RMI_PORT=65535 # need to make sure we don't exceed port range so hard
code it
- solr start -j "--module=server"
+ solr start --jettyconfig "--module=server"
solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
}
diff --git
a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
index efe5c791b8d..65e7516a37d 100644
---
a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
+++
b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
@@ -69,7 +69,7 @@ If you are passing JVM parameters that begin with `-D`, you
can omit the `--jvm-
[source,bash]
bin/solr start --jvm-opts "-Xdebug -Xrunjdwp:transport=dt_socket,
server=y,suspend=n,address=1044"
-`-j "<jettyParams>"`::
+`-j <jettyParams>` or `--jettyconfig <jettyParams>`::
+
[%autowidth,frame=none]
|===
