diff --git a/changes/1514.feature b/changes/1514.feature
new file mode 100644
index 000000000..6c1a8439c
--- /dev/null
+++ b/changes/1514.feature
@@ -0,0 +1 @@
+Updated CKAN and Drupal ATI Search Solr configs and schemas to Solr 9 and CKAN 2.10 compatible versions.
diff --git a/conf/solr/ati/managed-schema.xml b/conf/solr/ati/managed-schema.xml
new file mode 100644
index 000000000..83a27caad
--- /dev/null
+++ b/conf/solr/ati/managed-schema.xml
@@ -0,0 +1,110 @@
+
+
+
+ id
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/solr/ati/schema.xml b/conf/solr/ati/schema.xml
index e1b00afbc..510cd7a5e 100644
--- a/conf/solr/ati/schema.xml
+++ b/conf/solr/ati/schema.xml
@@ -16,93 +16,105 @@
limitations under the License.
-->
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
+
-
+
+
+
-
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
-
+
+
+
-
-
+
+
+
+
+
-
+
-
-
-
+
-
-
-
+
@@ -111,24 +123,27 @@
+
-
-
+
+
id
+
text
+
+
-
+
diff --git a/conf/solr/ati/solrconfig.xml b/conf/solr/ati/solrconfig.xml
index 364285a4c..e04a4cb9a 100644
--- a/conf/solr/ati/solrconfig.xml
+++ b/conf/solr/ati/solrconfig.xml
@@ -18,7 +18,7 @@
- 8.4.1
+ 9.10
-
+
@@ -202,7 +202,7 @@
'simple' is the default
More details on the nuances of each LockFactory...
- http://wiki.apache.org/lucene-java/AvailableLockFactories
+ https://cwiki.apache.org/confluence/display/lucene/AvailableLockFactories
-->
${solr.lock.type:native}
@@ -247,25 +247,6 @@
-
-
-
-
-
-
-
-
@@ -293,7 +274,7 @@
Instead of enabling autoCommit, consider using "commitWithin"
when adding documents.
- http://wiki.apache.org/solr/UpdateXmlMessages
+ https://solr.apache.org/guide/solr/latest/indexing-guide/indexing-with-update-handlers.html
maxDocs - Maximum number of documents to add since the last
commit before automatically triggering a new commit.
@@ -320,7 +301,7 @@
-->
- ${solr.autoSoftCommit.maxTime:-1}
+ ${solr.autoSoftCommit.maxTime:3000}
${solr.max.booleanClauses:1024}
-
@@ -422,12 +393,11 @@
Caches results of searches - ordered lists of document ids
(DocList) based on a query, a sort, and the range of documents requested.
- Additional supported parameter by LRUCache:
+ Additional supported parameter by CaffeineCache:
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy
-->
-
@@ -437,14 +407,13 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
-
@@ -673,91 +632,26 @@
-
+
+
-
explicit
10
- AND
-
-
-
-
-
-
-
-
-
@@ -766,65 +660,22 @@
explicit
json
true
- AND
+
_text_
-
-
@@ -881,7 +732,7 @@
IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
- See http://wiki.apache.org/solr/SpellCheckComponent for details
+ See https://solr.apache.org/guide/solr/latest/query-guide/spell-checking.html for details
on the request parameters.
-->
@@ -906,31 +757,13 @@
-
-
-
-
-
-
- true
- false
-
-
- terms
-
-
-
+
@@ -1032,31 +865,28 @@
-
-
-
@@ -1109,7 +939,7 @@
-
@@ -1118,7 +948,7 @@
-
-
- text/plain; charset=UTF-8
-
+
+
-
diff --git a/conf/solr/schema.xml b/conf/solr/schema.xml
index 48ce82d89..244327d19 100644
--- a/conf/solr/schema.xml
+++ b/conf/solr/schema.xml
@@ -16,35 +16,52 @@
limitations under the License.
-->
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
+
@@ -53,19 +70,32 @@
-
+
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -74,39 +104,37 @@
+
+
-
-
-
-
-
+
+
+
+
-
-
+
-
+
-
-
+
+
-
-
@@ -133,7 +161,6 @@
-
@@ -146,8 +173,9 @@
-
-
+
+
+
@@ -155,14 +183,22 @@
+
+
+
+
+
index_id
-
+
text
+
+
+
@@ -172,12 +208,12 @@
-
+
diff --git a/conf/solr/solrconfig.xml b/conf/solr/solrconfig.xml
index 026ef7d85..e04a4cb9a 100644
--- a/conf/solr/solrconfig.xml
+++ b/conf/solr/solrconfig.xml
@@ -1,1228 +1,1058 @@
-
-
-
-
-
-
-
-
- 8.4.1
-
-
-
-
-
-
-
-
-
-
- ${solr.data.dir:}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.lock.type:native}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.ulog.dir:}
- ${solr.ulog.numVersionBuckets:65536}
-
-
-
-
- ${solr.autoCommit.maxTime:15000}
- false
-
-
-
-
-
- ${solr.autoSoftCommit.maxTime:-1}
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${solr.max.booleanClauses:1024}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
- 20
-
-
- 200
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- explicit
- 10
- AND
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- explicit
- json
- true
- AND
-
-
-
-
-
- _text_
-
-
-
-
-
-
-
-
- textgen
-
-
-
-
-
- default
- _text_
- solr.DirectSolrSpellChecker
-
- internal
-
- 0.5
-
- 2
-
- 1
-
- 5
-
- 4
-
- 0.01
-
-
-
-
-
-
-
-
-
-
-
- default
- on
- true
- 10
- 5
- 5
- true
- true
- 10
- 5
-
-
- spellcheck
-
-
-
-
-
-
-
-
-
- true
- false
-
-
- terms
-
-
-
-
-
-
-
-
-
-
- 100
-
-
-
-
-
-
-
- 70
-
- 0.5
-
- [-\w ,/\n\"']{20,200}
-
-
-
-
-
-
- ]]>
- ]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ,,
- ,,
- ,,
- ,,
- ,]]>
- ]]>
-
-
-
-
-
- 10
- .,!?
-
-
-
-
-
-
- WORD
-
-
- en
- US
-
-
-
-
-
-
-
-
-
-
-
-
-
- [^\w-\.]
- _
-
-
-
-
-
-
- yyyy-MM-dd['T'[HH:mm[:ss[.SSS]][z
- yyyy-MM-dd['T'[HH:mm[:ss[,SSS]][z
- yyyy-MM-dd HH:mm[:ss[.SSS]][z
- yyyy-MM-dd HH:mm[:ss[,SSS]][z
- [EEE, ]dd MMM yyyy HH:mm[:ss] z
- EEEE, dd-MMM-yy HH:mm:ss z
- EEE MMM ppd HH:mm:ss [z ]yyyy
-
-
-
-
- java.lang.String
- textgen
-
- *_str
- 256
-
-
- true
-
-
- java.lang.Boolean
- boolean
-
-
- java.util.Date
- date
-
-
- java.lang.Long
- java.lang.Integer
- long
-
-
- java.lang.Number
- double
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain; charset=UTF-8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 9.10
+
+
+
+
+
+
+
+
+
+
+ ${solr.data.dir:}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${solr.lock.type:native}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${solr.ulog.dir:}
+ ${solr.ulog.numVersionBuckets:65536}
+
+
+
+
+ ${solr.autoCommit.maxTime:15000}
+ false
+
+
+
+
+
+ ${solr.autoSoftCommit.maxTime:3000}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${solr.max.booleanClauses:1024}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 20
+
+
+ 200
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ explicit
+ 10
+
+
+
+
+
+
+ explicit
+ json
+ true
+
+
+
+
+
+
+ _text_
+
+
+
+
+
+
+ text_general
+
+
+
+
+
+ default
+ _text_
+ solr.DirectSolrSpellChecker
+
+ internal
+
+ 0.5
+
+ 2
+
+ 1
+
+ 5
+
+ 4
+
+ 0.01
+
+
+
+
+
+
+
+
+
+
+
+ default
+ on
+ true
+ 10
+ 5
+ 5
+ true
+ true
+ 10
+ 5
+
+
+ spellcheck
+
+
+
+
+
+
+
+
+
+
+
+ 100
+
+
+
+
+
+
+
+ 70
+
+ 0.5
+
+ [-\w ,/\n\"']{20,200}
+
+
+
+
+
+
+ ]]>
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ,,
+ ,,
+ ,,
+ ,,
+ ,]]>
+ ]]>
+
+
+
+
+
+ 10
+ .,!?
+
+
+
+
+
+
+ WORD
+
+
+ en
+ US
+
+
+
+
+
+
+
+
+
+
+
+ [^\w-\.]
+ _
+
+
+
+
+
+
+ yyyy-MM-dd['T'[HH:mm[:ss[.SSS]][z
+ yyyy-MM-dd['T'[HH:mm[:ss[,SSS]][z
+ yyyy-MM-dd HH:mm[:ss[.SSS]][z
+ yyyy-MM-dd HH:mm[:ss[,SSS]][z
+ [EEE, ]dd MMM yyyy HH:mm[:ss] z
+ EEEE, dd-MMM-yy HH:mm:ss z
+ EEE MMM ppd HH:mm:ss [z ]yyyy
+
+
+
+
+ java.lang.String
+ text_general
+
+ *_str
+ 256
+
+
+ true
+
+
+ java.lang.Boolean
+ booleans
+
+
+ java.util.Date
+ pdates
+
+
+ java.lang.Long
+ java.lang.Integer
+ plongs
+
+
+ java.lang.Number
+ pdoubles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+