This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 42c5be86f09bfe7a0322c024cc5f735f401a5390 Author: David Smiley <[email protected]> AuthorDate: Sat Nov 8 00:35:49 2025 -0500 minor fix solr-jetty-context.xml defaultsDescriptor I accidentally committed a commenting out of the defaultsDescriptor while merging something totally unrelated. This probably had no practical effect, as webdefault.xml is itself just the defaults. (cherry picked from commit 1f5fe210e88c05e6a02a3f49f9f722b26f79aafe) --- solr/server/contexts/solr-jetty-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xml index b6ac292c226..979377932b0 100644 --- a/solr/server/contexts/solr-jetty-context.xml +++ b/solr/server/contexts/solr-jetty-context.xml @@ -3,7 +3,7 @@ <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext"> <Set name="contextPath"><Property name="hostContext" default="/solr"/></Set> <Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set> -<!-- <Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set>--> + <Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set> <Set name="extractWAR">false</Set> <!--
