Apache Solr open-source search software
SOLR-15897 Remove <jmx/> from test solrconfig.xml (#503)
Eric Pughde326da01782
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 2397322eef8..05a081a8086 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -26,7 +26,7 @@ Bug FixesOther Changes----------------------(No changes)+* SOLR-15897: Remove <jmx/> from all unit test solrconfig.xml files. (Eric Pugh)================== 9.0.0 ==================diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xmlindex 2dab548d102..e1238a8edb3 100644--- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml+++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml@@ -19,7 +19,6 @@<config><luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>- <jmx /><indexConfig><useCompoundFile>${useCompoundFile:false}</useCompoundFile></indexConfig>diff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xmlindex 01dbee9aaea..19581fb4322 100644--- a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml+++ b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml@@ -19,7 +19,6 @@<config>- <jmx /><indexConfig><useCompoundFile>${useCompoundFile:false}</useCompoundFile></indexConfig>@@ -59,7 +58,7 @@<lst name="defaults"><str name="update.chain">lang_id_tika</str></lst>- </requestHandler>+ </requestHandler><updateRequestProcessorChain name="lang_id_tika"><processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">@@ -77,7 +76,7 @@</processor><processor class="solr.RunUpdateProcessorFactory" /></updateRequestProcessorChain>-+<updateRequestProcessorChain name="lang_id_lang_detect"><processor class="org.apache.solr.update.processor.LangDetectLanguageIdentifierUpdateProcessorFactory"><!-- Can take defaults, invariants and appends just like req handlers-->diff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xmlindex 03dbe40df38..bbc9b68628b 100644--- a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml+++ b/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml@@ -31,8 +31,6 @@<lockType>${solr.lock.type:native}</lockType></indexConfig>- <jmx />-<updateHandler class="solr.DirectUpdateHandler2"><updateLog>diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xmlindex 6406171dab8..ba195778369 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml@@ -30,8 +30,6 @@<config>- <jmx />-<!-- Used to specify an alternate directory to hold all index data.It defaults to "index" if not present, and should probablynot be changed if replication is in use. -->diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xmlindex 20df49e6c57..d896666f185 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml@@ -30,8 +30,6 @@<config>- <jmx />-<!-- Used to specify an alternate directory to hold all index data.It defaults to "index" if not present, and should probablynot be changed if replication is in use. -->diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xmlindex e862feefeba..870596afe3b 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml@@ -19,8 +19,6 @@<config>- <jmx />-<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/><!-- Used to specify an alternate directory to hold all index data.diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xmlindex c9c351fe0a9..b23a7dc9ff6 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml@@ -18,10 +18,8 @@--><config>- <jmx />-<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>-+<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"><!-- used to keep RAM reqs down for HdfsDirectoryFactory --><bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>@@ -30,7 +28,7 @@<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str><str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:false}</str></directoryFactory>-+<dataDir>${solr.data.dir:}</dataDir><xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>@@ -50,8 +48,8 @@<str name="omitHeader">true</str></lst></requestHandler>-- <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />++ <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /><requestHandler name="/update" class="solr.UpdateRequestHandler" />@@ -60,7 +58,7 @@<str name="dir">${solr.ulog.dir:}</str></updateLog></updateHandler>-+<updateRequestProcessorChain name="tolerant-chain-max-errors-10"><processor class="solr.TolerantUpdateProcessorFactory"><!-- explicitly testing that parsing still works if a valid int is specified as a string -->@@ -75,7 +73,7 @@<processor class="solr.DistributedUpdateProcessorFactory" /><processor class="solr.RunUpdateProcessorFactory" /></updateRequestProcessorChain>-+<updateRequestProcessorChain name="not-tolerant"><processor class="solr.DistributedUpdateProcessorFactory" /><processor class="solr.RunUpdateProcessorFactory" />diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xmlindex 39bcd82d9e8..4f40711a839 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml@@ -19,7 +19,6 @@<config><luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>- <jmx /><!-- Used to specify an alternate directory to hold all index data.It defaults to "index" if not present, and should probablydiff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xmlindex 15a188a0aec..0e785ce0adc 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml@@ -18,10 +18,9 @@--><config>- <jmx /><luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>-+<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"><!-- used to keep RAM reqs down for HdfsDirectoryFactory --><bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>@@ -30,7 +29,7 @@<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str></directoryFactory><schemaFactory class="ClassicIndexSchemaFactory"/>-+<dataDir>${solr.data.dir:}</dataDir><xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>@@ -151,7 +150,7 @@<processor class="solr.RunUpdateProcessorFactory" /></updateRequestProcessorChain>-+<updateRequestProcessorChain name="tombstone-config"><!-- process the external version constraint, ignoring any updates thatdon't satisfy the constraint -->diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xmlindex 3feef5752bc..b9a72c5634a 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml@@ -31,7 +31,6 @@<xi:include href="./solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>- <jmx/><updateHandler class="solr.DirectUpdateHandler2"><!--updateLog><str name="dir">${solr.ulog.dir:}</str>diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xmlindex e17f655091a..fd90b8d8917 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml@@ -30,8 +30,6 @@<config>- <jmx />-<!-- Used to specify an alternate directory to hold all index data.It defaults to "index" if not present, and should probablynot be changed if replication is in use. -->diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xmlindex 1d515f6649c..a9544b2ad88 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml@@ -30,8 +30,6 @@<config>- <jmx />-<!-- Used to specify an alternate directory to hold all index data.It defaults to "index" if not present, and should probablynot be changed if replication is in use. -->diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xmlindex c760d9d19c2..6d5ed8474d6 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml@@ -18,10 +18,9 @@--><config>- <jmx /><luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>-+<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"><!-- used to keep RAM reqs down for HdfsDirectoryFactory --><bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>@@ -34,7 +33,7 @@<requestDispatcher><requestParsers enableStreamBody="true" /></requestDispatcher>-+<dataDir>${solr.data.dir:}</dataDir><xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>@@ -48,7 +47,7 @@</updateRequestProcessorChain><requestHandler name="/select" class="solr.SearchHandler" />-+<updateHandler class="solr.DirectUpdateHandler2"><!-- autocommit pending docs if certain criteria are met --><autoCommit>@@ -60,14 +59,14 @@<str name="numRecordsToKeep">${solr.ulog.numRecordsToKeep:100}</str><int name="tlogDfsReplication">${solr.ulog.tlogDfsReplication:2}</int></updateLog>--- <autoCommit>+++ <autoCommit><maxTime>${solr.autoCommit.maxTime:-1}</maxTime>- <openSearcher>false</openSearcher>+ <openSearcher>false</openSearcher></autoCommit>- <autoSoftCommit>+ <autoSoftCommit><maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime></autoSoftCommit></updateHandler>@@ -86,7 +85,7 @@<str name="replacement">x_x</str></processor><processor class="solr.RunUpdateProcessorFactory" />- </updateRequestProcessorChain>+ </updateRequestProcessorChain><updateRequestProcessorChain name="distrib-dup-test-chain-implicit"><!-- implicit test w/o distrib declared-->diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xmlindex 9890103e000..02d79645eba 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml@@ -30,8 +30,6 @@<config>- <jmx />-<!-- Used to specify an alternate directory to hold all index data.It defaults to "index" if not present, and should probablynot be changed if replication is in use. -->diff --git a/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/solrconfig.xmlindex 648e92ea538..3e54f30a902 100644--- a/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/solrconfig.xml+++ b/solr/core/src/test-files/solr/configsets/cloud-hdfs/conf/solrconfig.xml@@ -38,8 +38,6 @@<updateLog></updateLog></updateHandler>- <jmx/>-<requestHandler name="/select" class="solr.SearchHandler"><lst name="defaults"><str name="echoParams">explicit</str>@@ -49,4 +47,3 @@</requestHandler></config>-diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-jmx/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-jmx/conf/schema.xmldeleted file mode 100644index 52a63f41944..00000000000--- a/solr/core/src/test-files/solr/configsets/cloud-minimal-jmx/conf/schema.xml+++ /dev/null@@ -1,28 +0,0 @@-<?xml version="1.0" encoding="UTF-8" ?>-<!--- Licensed to the Apache Software Foundation (ASF) under one or more- contributor license agreements. See the NOTICE file distributed with- this work for additional information regarding copyright ownership.- The ASF licenses this file to You under the Apache License, Version 2.0- (the "License"); you may not use this file except in compliance with- the License. You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<schema name="minimal" version="1.1">- <fieldType name="string" class="solr.StrField"/>- <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>- <dynamicField name="*" type="string" indexed="true" stored="true"/>- <!-- for versioning -->- <field name="_version_" type="long" indexed="true" stored="true"/>- <field name="_root_" type="string" indexed="true" stored="true" multiValued="false" required="false"/>- <field name="id" type="string" indexed="true" stored="true"/>- <uniqueKey>id</uniqueKey>-</schema>diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-jmx/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-jmx/conf/solrconfig.xmldeleted file mode 100644index 7f27c911f04..00000000000--- a/solr/core/src/test-files/solr/configsets/cloud-minimal-jmx/conf/solrconfig.xml+++ /dev/null@@ -1,50 +0,0 @@-<?xml version="1.0" ?>--<!--- Licensed to the Apache Software Foundation (ASF) under one or more- contributor license agreements. See the NOTICE file distributed with- this work for additional information regarding copyright ownership.- The ASF licenses this file to You under the Apache License, Version 2.0- (the "License"); you may not use this file except in compliance with- the License. You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->--<!-- Minimal solrconfig.xml with JMX enabled -->--<config>-- <jmx/>-- <dataDir>${solr.data.dir:}</dataDir>-- <directoryFactory name="DirectoryFactory"- class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>- <schemaFactory class="ClassicIndexSchemaFactory"/>-- <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>-- <updateHandler class="solr.DirectUpdateHandler2">- <commitWithin>- <softCommit>${solr.commitwithin.softcommit:true}</softCommit>- </commitWithin>- <updateLog></updateLog>- </updateHandler>-- <requestHandler name="/select" class="solr.SearchHandler">- <lst name="defaults">- <str name="echoParams">explicit</str>- <str name="indent">true</str>- <str name="df">text</str>- </lst>-- </requestHandler>-</config>-diff --git a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xmlindex 10c8fa76aa4..3521efd12a9 100644--- a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml+++ b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml@@ -18,7 +18,6 @@--><config>- <jmx /><metrics/><luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>@@ -33,9 +32,9 @@</directoryFactory><schemaFactory class="ClassicIndexSchemaFactory"/>- <indexReaderFactory name="IndexReaderFactory"+ <indexReaderFactory name="IndexReaderFactory"class="org.apache.solr.cloud.TrollingIndexReaderFactory"></indexReaderFactory >-+<dataDir>${solr.data.dir:}</dataDir><!-- an update processor the explicitly excludes distrib to test@@ -71,16 +70,16 @@<fieldValueCachesize="0"autowarmCount="0"- showItems="0" />+ showItems="0" /></query>-+<searchComponent name="delayingSearchComponent"class="org.apache.solr.search.DelayingSearchComponent"/><requestHandler name="/select" class="solr.SearchHandler"><arr name="first-components"><str>delayingSearchComponent</str>- </arr>+ </arr></requestHandler></config>