From a375f53c4633745cb462e771d7f63faef77d4394 Mon Sep 17 00:00:00 2001
From: Vincenzo De Naro Papa <vincenzo.denaropapa@gmail.com>
Date: Fri, 13 Sep 2019 11:45:28 +0200
Subject: [PATCH] Updated config to support search_api_solr 8.x-3.x

---
 .../solr-drupal/solr7.5/conf/accents_en.txt   | 164 +++++++++++
 .../solr-drupal/solr7.5/conf/accents_und.txt  | 148 ++++++++++
 .../solr7.5/conf/mapping-ISOLatin1Accent.txt  |  14 -
 images/solr-drupal/solr7.5/conf/protwords.txt |   7 -
 .../solr-drupal/solr7.5/conf/protwords_en.txt |   1 +
 .../solr7.5/conf/protwords_und.txt            |   1 +
 images/solr-drupal/solr7.5/conf/schema.xml    | 266 ++---------------
 .../solr7.5/conf/schema_extra_fields.xml      | 102 ++++++-
 .../solr7.5/conf/schema_extra_types.xml       | 271 ++++++++++++++----
 .../solr7.5/conf/schema_legacy_fields.xml     |  61 ----
 .../solr7.5/conf/schema_legacy_types.xml      |  14 -
 .../solr-drupal/solr7.5/conf/solrconfig.xml   |  53 +---
 .../solr7.5/conf/solrconfig_extra.xml         |  64 ++++-
 .../solr7.5/conf/solrconfig_spellcheck.xml    |  89 ------
 .../solr7.5/conf/solrcore.properties          |  13 +-
 images/solr-drupal/solr7.5/conf/stopwords.txt |   4 -
 .../solr-drupal/solr7.5/conf/stopwords_en.txt |  35 +++
 .../solr7.5/conf/stopwords_und.txt            |   1 +
 images/solr-drupal/solr7.5/conf/synonyms.txt  |   3 -
 .../solr-drupal/solr7.5/conf/synonyms_en.txt  |   1 +
 .../solr-drupal/solr7.5/conf/synonyms_und.txt |   1 +
 21 files changed, 751 insertions(+), 562 deletions(-)
 create mode 100644 images/solr-drupal/solr7.5/conf/accents_en.txt
 create mode 100644 images/solr-drupal/solr7.5/conf/accents_und.txt
 delete mode 100644 images/solr-drupal/solr7.5/conf/mapping-ISOLatin1Accent.txt
 delete mode 100644 images/solr-drupal/solr7.5/conf/protwords.txt
 create mode 100644 images/solr-drupal/solr7.5/conf/protwords_en.txt
 create mode 100644 images/solr-drupal/solr7.5/conf/protwords_und.txt
 delete mode 100644 images/solr-drupal/solr7.5/conf/schema_legacy_fields.xml
 delete mode 100644 images/solr-drupal/solr7.5/conf/schema_legacy_types.xml
 delete mode 100644 images/solr-drupal/solr7.5/conf/solrconfig_spellcheck.xml
 delete mode 100644 images/solr-drupal/solr7.5/conf/stopwords.txt
 create mode 100644 images/solr-drupal/solr7.5/conf/stopwords_en.txt
 create mode 100644 images/solr-drupal/solr7.5/conf/stopwords_und.txt
 delete mode 100644 images/solr-drupal/solr7.5/conf/synonyms.txt
 create mode 100644 images/solr-drupal/solr7.5/conf/synonyms_en.txt
 create mode 100644 images/solr-drupal/solr7.5/conf/synonyms_und.txt

diff --git a/images/solr-drupal/solr7.5/conf/accents_en.txt b/images/solr-drupal/solr7.5/conf/accents_en.txt
new file mode 100644
index 0000000000..bed051477b
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/accents_en.txt
@@ -0,0 +1,164 @@
+# À => A
+"\u00C0" => "A"
+# Á => A
+"\u00C1" => "A"
+# Â => A
+"\u00C2" => "A"
+# Ã => A
+"\u00C3" => "A"
+# Ä => A
+"\u00C4" => "A"
+# Å => A
+"\u00C5" => "A"
+# Ą => A
+"\u0104" => "A"
+# Æ => AE
+"\u00C6" => "AE"
+# Ç => C
+"\u00C7" => "C"
+# Ć => C
+"\U0106" => "C"
+# È => E
+"\u00C8" => "E"
+# É => E
+"\u00C9" => "E"
+# Ê => E
+"\u00CA" => "E"
+# Ë => E
+"\u00CB" => "E"
+# Ę => E
+"\u0118" => "E"
+# Ì => I
+"\u00CC" => "I"
+# Í => I
+"\u00CD" => "I"
+# Î => I
+"\u00CE" => "I"
+# Ï => I
+"\u00CF" => "I"
+# IJ => IJ
+"\u0132" => "IJ"
+# Ð => D
+"\u00D0" => "D"
+# Ł => L
+"\u0141" => "L"
+# Ñ => N
+"\u00D1" => "N"
+# Ń => N
+"\u0143" => "N"
+# Ò => O
+"\u00D2" => "O"
+# Ó => O
+"\u00D3" => "O"
+# Ô => O
+"\u00D4" => "O"
+# Õ => O
+"\u00D5" => "O"
+# Ö => O
+"\u00D6" => "O"
+# Ø => O
+"\u00D8" => "O"
+# Π=> OE
+"\u0152" => "OE"
+# Þ
+"\u00DE" => "TH"
+# Ù => U
+"\u00D9" => "U"
+# Ú => U
+"\u00DA" => "U"
+# Û => U
+"\u00DB" => "U"
+# Ü => U
+"\u00DC" => "U"
+# Ý => Y
+"\u00DD" => "Y"
+# Ÿ => Y
+"\u0178" => "Y"
+# à => a
+"\u00E0" => "a"
+# á => a
+"\u00E1" => "a"
+# â => a
+"\u00E2" => "a"
+# ã => a
+"\u00E3" => "a"
+# ä => a
+"\u00E4" => "a"
+# å => a
+"\u00E5" => "a"
+# æ => ae
+"\u00E6" => "ae"
+# ç => c
+"\u00E7" => "c"
+# è => e
+"\u00E8" => "e"
+# é => e
+"\u00E9" => "e"
+# ê => e
+"\u00EA" => "e"
+# ë => e
+"\u00EB" => "e"
+# ì => i
+"\u00EC" => "i"
+# í => i
+"\u00ED" => "i"
+# î => i
+"\u00EE" => "i"
+# ï => i
+"\u00EF" => "i"
+# ij => ij
+"\u0133" => "ij"
+# ð => d
+"\u00F0" => "d"
+# ñ => n
+"\u00F1" => "n"
+# ò => o
+"\u00F2" => "o"
+# ó => o
+"\u00F3" => "o"
+# ô => o
+"\u00F4" => "o"
+# õ => o
+"\u00F5" => "o"
+# ö => o
+"\u00F6" => "o"
+# ø => o
+"\u00F8" => "o"
+# œ => oe
+"\u0153" => "oe"
+# ß => ss
+"\u00DF" => "ss"
+# Ś => S
+"\u015a" => "S"
+# þ => th
+"\u00FE" => "th"
+# ù => u
+"\u00F9" => "u"
+# ú => u
+"\u00FA" => "u"
+# û => u
+"\u00FB" => "u"
+# ü => u
+"\u00FC" => "u"
+# ý => y
+"\u00FD" => "y"
+# ÿ => y
+"\u00FF" => "y"
+# Ź => Z
+"\u0179" => "Z"
+# Ż => Z
+"\u017b" => "Z"
+# ff => ff
+"\uFB00" => "ff"
+# fi => fi
+"\uFB01" => "fi"
+# fl => fl
+"\uFB02" => "fl"
+# ffi => ffi
+"\uFB03" => "ffi"
+# ffl => ffl
+"\uFB04" => "ffl"
+# ſt => st
+"\uFB05" => "st"
+# st => st
+"\uFB06" => "st"
diff --git a/images/solr-drupal/solr7.5/conf/accents_und.txt b/images/solr-drupal/solr7.5/conf/accents_und.txt
new file mode 100644
index 0000000000..7c883f87a3
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/accents_und.txt
@@ -0,0 +1,148 @@
+# À => A
+"\u00C0" => "A"
+# Á => A
+"\u00C1" => "A"
+# Â => A
+"\u00C2" => "A"
+# Ã => A
+"\u00C3" => "A"
+# Ä => A
+"\u00C4" => "A"
+# Å => A
+"\u00C5" => "A"
+# Æ => AE
+"\u00C6" => "AE"
+# Ç => C
+"\u00C7" => "C"
+# È => E
+"\u00C8" => "E"
+# É => E
+"\u00C9" => "E"
+# Ê => E
+"\u00CA" => "E"
+# Ë => E
+"\u00CB" => "E"
+# Ì => I
+"\u00CC" => "I"
+# Í => I
+"\u00CD" => "I"
+# Î => I
+"\u00CE" => "I"
+# Ï => I
+"\u00CF" => "I"
+# IJ => IJ
+"\u0132" => "IJ"
+# Ð => D
+"\u00D0" => "D"
+# Ñ => N
+"\u00D1" => "N"
+# Ò => O
+"\u00D2" => "O"
+# Ó => O
+"\u00D3" => "O"
+# Ô => O
+"\u00D4" => "O"
+# Õ => O
+"\u00D5" => "O"
+# Ö => O
+"\u00D6" => "O"
+# Ø => O
+"\u00D8" => "O"
+# Π=> OE
+"\u0152" => "OE"
+# Þ
+"\u00DE" => "TH"
+# Ù => U
+"\u00D9" => "U"
+# Ú => U
+"\u00DA" => "U"
+# Û => U
+"\u00DB" => "U"
+# Ü => U
+"\u00DC" => "U"
+# Ý => Y
+"\u00DD" => "Y"
+# Ÿ => Y
+"\u0178" => "Y"
+# à => a
+"\u00E0" => "a"
+# á => a
+"\u00E1" => "a"
+# â => a
+"\u00E2" => "a"
+# ã => a
+"\u00E3" => "a"
+# ä => a
+"\u00E4" => "a"
+# å => a
+"\u00E5" => "a"
+# æ => ae
+"\u00E6" => "ae"
+# ç => c
+"\u00E7" => "c"
+# è => e
+"\u00E8" => "e"
+# é => e
+"\u00E9" => "e"
+# ê => e
+"\u00EA" => "e"
+# ë => e
+"\u00EB" => "e"
+# ì => i
+"\u00EC" => "i"
+# í => i
+"\u00ED" => "i"
+# î => i
+"\u00EE" => "i"
+# ï => i
+"\u00EF" => "i"
+# ij => ij
+"\u0133" => "ij"
+# ð => d
+"\u00F0" => "d"
+# ñ => n
+"\u00F1" => "n"
+# ò => o
+"\u00F2" => "o"
+# ó => o
+"\u00F3" => "o"
+# ô => o
+"\u00F4" => "o"
+# õ => o
+"\u00F5" => "o"
+# ö => o
+"\u00F6" => "o"
+# ø => o
+"\u00F8" => "o"
+# œ => oe
+"\u0153" => "oe"
+# ß => ss
+"\u00DF" => "ss"
+# þ => th
+"\u00FE" => "th"
+# ù => u
+"\u00F9" => "u"
+# ú => u
+"\u00FA" => "u"
+# û => u
+"\u00FB" => "u"
+# ü => u
+"\u00FC" => "u"
+# ý => y
+"\u00FD" => "y"
+# ÿ => y
+"\u00FF" => "y"
+# ff => ff
+"\uFB00" => "ff"
+# fi => fi
+"\uFB01" => "fi"
+# fl => fl
+"\uFB02" => "fl"
+# ffi => ffi
+"\uFB03" => "ffi"
+# ffl => ffl
+"\uFB04" => "ffl"
+# ſt => st
+"\uFB05" => "st"
+# st => st
+"\uFB06" => "st"
diff --git a/images/solr-drupal/solr7.5/conf/mapping-ISOLatin1Accent.txt b/images/solr-drupal/solr7.5/conf/mapping-ISOLatin1Accent.txt
deleted file mode 100644
index b92d03c550..0000000000
--- a/images/solr-drupal/solr7.5/conf/mapping-ISOLatin1Accent.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file contains character mappings for the default fulltext field type.
-# The source characters (on the left) will be replaced by the respective target
-# characters before any other processing takes place.
-# Lines starting with a pound character # are ignored.
-#
-# For sensible defaults, use the mapping-ISOLatin1Accent.txt file distributed
-# with the example application of your Solr version.
-#
-# Examples:
-#   "À" => "A"
-#   "\u00c4" => "A"
-#   "\u00c4" => "\u0041"
-#   "æ" => "ae"
-#   "\n" => " "
diff --git a/images/solr-drupal/solr7.5/conf/protwords.txt b/images/solr-drupal/solr7.5/conf/protwords.txt
deleted file mode 100644
index cda8581497..0000000000
--- a/images/solr-drupal/solr7.5/conf/protwords.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#-----------------------------------------------------------------------
-# This file blocks words from being operated on by the stemmer and word delimiter.
-&amp;
-&lt;
-&gt;
-&#039;
-&quot;
diff --git a/images/solr-drupal/solr7.5/conf/protwords_en.txt b/images/solr-drupal/solr7.5/conf/protwords_en.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/protwords_en.txt
@@ -0,0 +1 @@
+
diff --git a/images/solr-drupal/solr7.5/conf/protwords_und.txt b/images/solr-drupal/solr7.5/conf/protwords_und.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/protwords_und.txt
@@ -0,0 +1 @@
+
diff --git a/images/solr-drupal/solr7.5/conf/schema.xml b/images/solr-drupal/solr7.5/conf/schema.xml
index fcc662aec5..5c416bc0db 100644
--- a/images/solr-drupal/solr7.5/conf/schema.xml
+++ b/images/solr-drupal/solr7.5/conf/schema.xml
@@ -49,7 +49,7 @@
     that avoids logging every request
 -->
 
-<schema name="drupal-6.5-solr-7.x" version="1.6">
+<schema name="drupal-8.3.4-solr-7.x" version="1.6">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        version="x.y" is Solr's version number for the schema syntax and
        semantics.  It should not normally be changed by applications.
@@ -148,17 +148,11 @@
        when each document was indexed.-->
   <field name="timestamp" type="pdate" indexed="true" stored="false" default="NOW" multiValued="false" docValues="true"/>
 
-  <!-- This field is used to build the spellchecker index -->
-  <field name="spell" type="textSpell" indexed="true" stored="true" multiValued="true"/>
-
   <field name="site" type="string" indexed="true" stored="false" multiValued="false" docValues="true"/>
   <field name="hash" type="string" indexed="true" stored="false" multiValued="false" docValues="true"/>
 
-  <!-- copyField commands copy one field to another at the time a document
-       is added to the index.  It's used either to index the same field differently,
-       or to add multiple fields to the same field for easier/faster searching.  -->
-  <copyField source="ts_*" dest="spell"/>
-  <copyField source="tm_*" dest="spell"/>
+  <field name="boost_document" type="pfloat" indexed="true" stored="false" multiValued="false" docValues="true"/>
+  <field name="boost_term" type="boost_term_payload" indexed="true" stored="false" multiValued="true"/>
 
   <!-- Dynamic field definitions.  If a field name is not found, dynamicFields
        will be used if the name matches any of the patterns.
@@ -172,8 +166,8 @@
        the last letter is 's' for single valued, 'm' for multi-valued -->
 
   <!-- We use plong for integer since 64 bit ints are now common in PHP. -->
-  <dynamicField name="is_*"  type="plong"    indexed="true"  stored="false" multiValued="false" docValues="true"/>
-  <dynamicField name="im_*"  type="plong"    indexed="true"  stored="false" multiValued="true" docValues="true"/>
+  <dynamicField name="is_*"  type="plong"    indexed="true"  stored="false" multiValued="false" docValues="true" termVectors="true"/>
+  <dynamicField name="im_*"  type="plong"    indexed="true"  stored="false" multiValued="true" docValues="true" termVectors="true"/>
   <!-- List of floats can be saved in a regular float field -->
   <dynamicField name="fs_*"  type="pfloat"   indexed="true"  stored="false" multiValued="false" docValues="true"/>
   <dynamicField name="fm_*"  type="pfloat"   indexed="true"  stored="false" multiValued="true" docValues="true"/>
@@ -181,28 +175,15 @@
   <dynamicField name="ps_*"  type="pdouble"   indexed="true"  stored="false" multiValued="false" docValues="true"/>
   <dynamicField name="pm_*"  type="pdouble"   indexed="true"  stored="false" multiValued="true" docValues="true"/>
   <!-- List of booleans can be saved in a regular boolean field -->
-  <dynamicField name="bm_*"  type="boolean" indexed="true"  stored="false" multiValued="true" docValues="true"/>
-  <dynamicField name="bs_*"  type="boolean" indexed="true"  stored="false" multiValued="false" docValues="true"/>
+  <dynamicField name="bm_*"  type="boolean" indexed="true"  stored="false" multiValued="true" docValues="true" termVectors="true"/>
+  <dynamicField name="bs_*"  type="boolean" indexed="true"  stored="false" multiValued="false" docValues="true" termVectors="true"/>
   <!-- Regular text (without processing) can be stored in a string field-->
-  <dynamicField name="ss_*"  type="string"  indexed="true"  stored="false" multiValued="false" docValues="true"/>
-  <!-- For field types using SORTED_SET, multiple identical entries are collapsed into a single value. Thus if I insert values 4, 5, 2, 4, 1, my return will be 1, 2, 4, 5 when enabling docValues. Therefore the multiValued string field doesn't use docValues. -->
-  <dynamicField name="sm_*"  type="string"  indexed="true"  stored="true" multiValued="true" docValues="false"/>
-  <dynamicField name="ses_*" type="edge_n2_kw_string"  indexed="true"  stored="true" multiValued="false"/>
-  <dynamicField name="sem_*" type="edge_n2_kw_string"  indexed="true"  stored="true" multiValued="true"/>
-  <dynamicField name="sds_*" type="string"  indexed="true"  stored="false" multiValued="false" docValues="true"/>
-  <dynamicField name="sdm_*" type="string"  indexed="true"  stored="false" multiValued="true" docValues="true"/>
-  <!-- Normal text fields are for full text - the relevance of a match depends on the length of the text -->
-  <dynamicField name="ts_*"  type="text"    indexed="true"  stored="true" multiValued="false" termVectors="true"/>
-  <dynamicField name="tm_*"  type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true"/>
-  <!-- Unstemmed text fields for full text - the relevance of a match depends on the length of the text -->
-  <dynamicField name="tus_*" type="text_und" indexed="true"  stored="true" multiValued="false" termVectors="true"/>
-  <dynamicField name="tum_*" type="text_und" indexed="true"  stored="true" multiValued="true" termVectors="true"/>
-  <!-- These text fields omit norms - useful for extracted text like taxonomy_names -->
-  <dynamicField name="tos_*" type="text"    indexed="true"  stored="true" multiValued="false" termVectors="true" omitNorms="true"/>
-  <dynamicField name="tom_*" type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true" omitNorms="true"/>
+  <dynamicField name="ss_*"  type="string"  indexed="true"  stored="false" multiValued="false" docValues="true" termVectors="true"/>
+  <!-- For field types using SORTED_SET, multiple identical entries are collapsed into a single value.
+       Thus if I insert values 4, 5, 2, 4, 1, my return will be 1, 2, 4, 5 when enabling docValues.
+       If you need to preserve the order and duplicate entries, consider to store the values as zm_* (twice). -->
+  <dynamicField name="sm_*"  type="string"  indexed="true"  stored="false" multiValued="true" docValues="true" termVectors="true"/>
   <!-- Special-purpose text fields -->
-  <dynamicField name="tes_*" type="edge_n2_kw_text" indexed="true" stored="true" multiValued="false"/>
-  <dynamicField name="tem_*" type="edge_n2_kw_text" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="tws_*" type="text_ws" indexed="true" stored="true" multiValued="false"/>
   <dynamicField name="twm_*" type="text_ws" indexed="true" stored="true" multiValued="true"/>
 
@@ -212,8 +193,8 @@
   <!-- This field is used to store date ranges -->
   <dynamicField name="drs_*" type="date_range" indexed="true" stored="true" multiValued="false"/>
   <dynamicField name="drm_*" type="date_range" indexed="true" stored="true" multiValued="true"/>
-  <dynamicField name="its_*" type="plong"   indexed="true"  stored="false" multiValued="false" docValues="true"/>
-  <dynamicField name="itm_*" type="plong"   indexed="true"  stored="false" multiValued="true" docValues="true"/>
+  <dynamicField name="its_*" type="plong"   indexed="true"  stored="false" multiValued="false" docValues="true" termVectors="true"/>
+  <dynamicField name="itm_*" type="plong"   indexed="true"  stored="false" multiValued="true" docValues="true" termVectors="true"/>
   <dynamicField name="fts_*" type="pfloat"  indexed="true"  stored="false" multiValued="false" docValues="true"/>
   <dynamicField name="ftm_*" type="pfloat"  indexed="true"  stored="false" multiValued="true" docValues="true"/>
   <dynamicField name="pts_*" type="pdouble" indexed="true"  stored="false" multiValued="false" docValues="true"/>
@@ -250,16 +231,9 @@
   <dynamicField name="rpts_*" type="location_rpt" indexed="true" stored="true" multiValued="false" />
   <dynamicField name="rptm_*" type="location_rpt" indexed="true" stored="true" multiValued="true" />
 
-  <!-- Special fields for Solr 5 functionality. -->
-  <dynamicField name="phons_*" type="phonetic" indexed="true" stored="true" multiValued="false" />
-  <dynamicField name="phonm_*" type="phonetic" indexed="true" stored="true" multiValued="true" />
-
   <!-- External file fields -->
   <dynamicField name="eff_*" type="file"/>
 
-  <!-- Sortable version of the dynamic string field. We need to store it for streaming expressions. -->
-  <dynamicField name="sort_*" type="collated" indexed="false" stored="false" docValues="true"/>
-
   <!-- A random sort field -->
   <dynamicField name="random_*" type="random" indexed="true" stored="true"/>
 
@@ -398,220 +372,24 @@
       </analyzer>
     </fieldType>
 
-    <!-- A text field that uses WordDelimiterFilter to enable splitting and matching of
-        words on case-change, alpha numeric boundaries, and non-alphanumeric chars,
-        so that a query of "wifi" or "wi fi" could match a document containing "Wi-Fi".
-        Synonyms and stopwords are customized by external files, and stemming is enabled.
-        Duplicate tokens at the same position (which may result from Stemmed Synonyms or
-        WordDelim parts) are removed.
-        -->
-    <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <!-- We will only use synonyms at query time
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        <filter class="solr.FlattenGraphFilterFactory"/>
-        -->
-        <!-- Case insensitive stop word removal. -->
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                />
-        <filter class="solr.WordDelimiterGraphFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="1"
-                catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="0"
-                preserveOriginal="1"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                />
-        <filter class="solr.WordDelimiterGraphFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="0"
-                preserveOriginal="1"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-      <analyzer type="multiterm">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                />
-        <filter class="solr.WordDelimiterGraphFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="1"
-                preserveOriginal="1"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="edge_n2_kw_text" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
+    <fieldType name="boost_term_payload" stored="false" indexed="true" class="solr.TextField" >
+      <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <!-- Case insensitive stop word removal. -->
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-        />
-        <filter class="solr.WordDelimiterGraphFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="1"
-                catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="0"
-                preserveOriginal="1"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-        <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="25" />
-      </analyzer>
-      <analyzer type="query">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-        />
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-      <analyzer type="multiterm">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-        />
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Edge N gram type - for example for matching against queries with results
-        KeywordTokenizer leaves input string intact as a single term.
-        see: http://www.lucidimagination.com/blog/2009/09/08/auto-suggest-from-popular-queries-using-edgengrams/
-      -->
-    <fieldType name="edge_n2_kw_string" class="solr.TextField" omitNorms="true" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="25" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!--  Setup simple analysis for spell checking -->
-   <fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory" />
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.LengthFilterFactory" min="4" max="20" />
-        <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory" />
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="collated" class="solr.ICUCollationField"
-               locale="en"
-               strength="primary"
-               caseLevel="false" />
-
-    <fieldType name="phonetic" stored="false" indexed="true" class="solr.TextField" >
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="payloads" stored="false" indexed="true" class="solr.TextField" >
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <!--
         The DelimitedPayloadTokenFilter can put payloads on tokens... for example,
         a token of "foo|1.4"  would be indexed as "foo" with a payload of 1.4f
         Attributes of the DelimitedPayloadTokenFilterFactory :
          "delimiter" - a one character delimiter. Default is | (pipe)
-   "encoder" - how to encode the following value into a playload
-      float -> org.apache.lucene.analysis.payloads.FloatEncoder,
-      integer -> o.a.l.a.p.IntegerEncoder
-      identity -> o.a.l.a.p.IdentityEncoder
-            Fully Qualified class name implementing PayloadEncoder, Encoder must have a no arg constructor.
+         "encoder" - how to encode the following value into a playload
+           float -> org.apache.lucene.analysis.payloads.FloatEncoder,
+           integer -> o.a.l.a.p.IntegerEncoder
+           identity -> o.a.l.a.p.IdentityEncoder
+             Fully Qualified class name implementing PayloadEncoder, Encoder must have a no arg constructor.
          -->
         <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- lowercases the entire field value, keeping it as a single token.  -->
-    <fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory" />
-      </analyzer>
-    </fieldType>
-
-    <!--
-      Example of using PathHierarchyTokenizerFactory at index time, so
-      queries for paths match documents at that path, or in descendent paths
-    -->
-    <fieldType name="descendent_path" class="solr.TextField">
-      <analyzer type="index">
-  <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
-      </analyzer>
-      <analyzer type="query">
-  <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-    </fieldType>
-    <!--
-      Example of using PathHierarchyTokenizerFactory at query time, so
-      queries for paths match documents at that path, or in ancestor paths
-    -->
-    <fieldType name="ancestor_path" class="solr.TextField">
-      <analyzer type="index">
-  <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-      <analyzer type="query">
-  <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
+        <filter class="solr.LengthFilterFactory" min="2" max="100"/>
       </analyzer>
     </fieldType>
 
diff --git a/images/solr-drupal/solr7.5/conf/schema_extra_fields.xml b/images/solr-drupal/solr7.5/conf/schema_extra_fields.xml
index 4cb53eaa68..f5d74188a5 100644
--- a/images/solr-drupal/solr7.5/conf/schema_extra_fields.xml
+++ b/images/solr-drupal/solr7.5/conf/schema_extra_fields.xml
@@ -1,13 +1,89 @@
-<!--
-  The config generator will add dynamic fields here automatically as required by
-  your individual drupal setup.
-
-  Since search_api_solr 8.x-2.0 it's required to use dynamically generated
-  config files instead copying them.
-
-  Having these fields in a separate file is better than modifying schema.xml.
--->
-Don't use the config XML templates directly. Use the config generator to get
-your individual config files. Use the "Get config.zip" button in the UI or
-drush solr-gsc my_solr_server
-See INSTALL.md for details.
+<dynamicField name="tcedgestrings_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcedgestrings_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcedgestringm_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcedgestringm_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tocedgestrings_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocedgestrings_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocedgestringm_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tocedgestringm_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tucedgestrings_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucedgestrings_*" type="text_edgenstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucedgestringm_X3b_und_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tucedgestringm_*" type="text_edgenstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcedges_X3b_und_*" type="text_edge" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcedges_*" type="text_edge" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcedgem_X3b_und_*" type="text_edge" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcedgem_*" type="text_edge" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tocedges_X3b_und_*" type="text_edge" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocedges_*" type="text_edge" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocedgem_X3b_und_*" type="text_edge" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tocedgem_*" type="text_edge" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tucedges_X3b_und_*" type="text_edge" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucedges_*" type="text_edge" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucedgem_X3b_und_*" type="text_edge" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tucedgem_*" type="text_edge" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="ts_X3b_en_*" type="text_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tm_X3b_en_*" type="text_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tos_X3b_en_*" type="text_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tom_X3b_en_*" type="text_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tus_X3b_en_*" type="text_unstemmed_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tum_X3b_en_*" type="text_unstemmed_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="sort_X3b_en_*" type="collated_en" stored="false" indexed="false" docValues="true" />
+<dynamicField name="tcphonetics_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcphonetics_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcphoneticm_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcphoneticm_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tocphonetics_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocphonetics_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocphoneticm_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tocphoneticm_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tucphonetics_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucphonetics_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucphoneticm_X3b_und_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tucphoneticm_*" type="text_phonetic_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcphonetics_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcphoneticm_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tocphonetics_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocphoneticm_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tucphonetics_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucphoneticm_X3b_en_*" type="text_phonetic_en" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="ts_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="ts_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tm_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tm_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tos_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tos_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tom_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tom_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tus_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tus_*" type="text_und" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tum_X3b_und_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tum_*" type="text_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="spellcheck_und*" type="text_spell_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="spellcheck_*" type="text_spell_und" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="sort_X3b_und_*" type="collated_und" stored="false" indexed="false" docValues="true" />
+<dynamicField name="sort_*" type="collated_und" stored="false" indexed="false" docValues="true" />
+<dynamicField name="tcngramstrings_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcngramstrings_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcngramstringm_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcngramstringm_*" type="text_ngramstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tocngramstrings_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocngramstrings_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocngramstringm_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tocngramstringm_*" type="text_ngramstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tucngramstrings_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucngramstrings_*" type="text_ngramstring" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucngramstringm_X3b_und_*" type="text_ngramstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tucngramstringm_*" type="text_ngramstring" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcngrams_X3b_und_*" type="text_ngram" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcngrams_*" type="text_ngram" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tcngramm_X3b_und_*" type="text_ngram" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tcngramm_*" type="text_ngram" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tocngrams_X3b_und_*" type="text_ngram" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocngrams_*" type="text_ngram" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="true" />
+<dynamicField name="tocngramm_X3b_und_*" type="text_ngram" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tocngramm_*" type="text_ngram" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="true" />
+<dynamicField name="tucngrams_X3b_und_*" type="text_ngram" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucngrams_*" type="text_ngram" stored="true" indexed="true" multiValued="false" termVectors="true" omitNorms="false" />
+<dynamicField name="tucngramm_X3b_und_*" type="text_ngram" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
+<dynamicField name="tucngramm_*" type="text_ngram" stored="true" indexed="true" multiValued="true" termVectors="true" omitNorms="false" />
diff --git a/images/solr-drupal/solr7.5/conf/schema_extra_types.xml b/images/solr-drupal/solr7.5/conf/schema_extra_types.xml
index 38b90dcb64..8b5e82f035 100644
--- a/images/solr-drupal/solr7.5/conf/schema_extra_types.xml
+++ b/images/solr-drupal/solr7.5/conf/schema_extra_types.xml
@@ -1,59 +1,228 @@
 <!--
-  The config generator will add more field types here automatically if
-  required by your drupal setup. Having these field types in a separate file is
-  better than modifying schema.xml.
+  Edge NGram String Field
+  6.0.0
+-->
+<fieldType name="text_edgenstring" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <tokenizer class="solr.KeywordTokenizerFactory"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+    <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="25"/>
+  </analyzer>
+  <analyzer type="query">
+    <tokenizer class="solr.KeywordTokenizerFactory"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  Edge NGram Text Field
+  7.0.0
+-->
+<fieldType name="text_edge" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_und.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="1" generateNumberParts="1" protected="protwords_und.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="1"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+    <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="25"/>
+  </analyzer>
+  <analyzer type="query">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  English Text Field
+  7.0.0
+-->
+<fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_en.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="1" generateNumberParts="1" protected="protwords_en.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="1"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords_en.txt"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+  <analyzer type="query">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_en.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms_en.txt" expand="true" ignoreCase="true"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="0" generateNumberParts="1" protected="protwords_en.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="0"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords_en.txt"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  English Text Field collated
+  7.0.0
+-->
+<fieldType name="collated_en" class="solr.ICUCollationField" locale="en" strength="primary" caseLevel="false"/>
+<!--
+  English Text Field unstemmed
+  7.0.0
+-->
+<fieldType name="text_unstemmed_en" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_en.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="1" generateNumberParts="1" protected="protwords_en.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="1"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+  <analyzer type="query">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_en.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms_en.txt" expand="true" ignoreCase="true"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="0" generateNumberParts="1" protected="protwords_en.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="0"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  Fulltext Phonetic
+  7.0.0
+-->
+<fieldType name="text_phonetic_und" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_und.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="1" generateNumberParts="1" protected="protwords_und.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="1"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.BeiderMorseFilterFactory" languageSet="auto" nameType="GENERIC" ruleType="APPROX" concat="true"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+  <analyzer type="query">
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_und.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="0" generateNumberParts="1" protected="protwords_und.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="0"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.BeiderMorseFilterFactory" languageSet="auto" nameType="GENERIC" ruleType="APPROX" concat="true"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  Fulltext Phonetic English
+  7.0.0
+-->
+<fieldType name="text_phonetic_en" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="1" generateNumberParts="1" protected="protwords_en.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="1"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.BeiderMorseFilterFactory" languageSet="english" nameType="GENERIC" ruleType="APPROX" concat="true"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+  <analyzer type="query">
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="0" generateNumberParts="1" protected="protwords_en.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="0"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.BeiderMorseFilterFactory" languageSet="english" nameType="GENERIC" ruleType="APPROX" concat="true"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  Language Undefined Text Field
+  7.0.0
 -->
-
-<!-- An unstemmed text field - good if one does not know the language of the field -->
 <fieldType name="text_und" class="solr.TextField" positionIncrementGap="100">
   <analyzer type="index">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_und.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="1" generateNumberParts="1" protected="protwords_und.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="1"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+  <analyzer type="query">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms_und.txt" expand="true" ignoreCase="true"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_und.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="0" generateNumberParts="1" protected="protwords_und.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="0"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  Language Undefined Text Field spellcheck
+  7.0.0
+-->
+<fieldType name="text_spell_und" class="solr.TextField" positionIncrementGap="100">
+  <analyzer>
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  Language Undefined Text Field collated
+  7.0.0
+-->
+<fieldType name="collated_und" class="solr.ICUCollationField" locale="en" strength="primary" caseLevel="false"/>
+<!--
+  NGram String Field
+  6.0.0
+-->
+<fieldType name="text_ngramstring" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <tokenizer class="solr.KeywordTokenizerFactory"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+    <filter class="solr.NGramFilterFactory" minGramSize="2" maxGramSize="25"/>
+  </analyzer>
+  <analyzer type="query">
+    <tokenizer class="solr.KeywordTokenizerFactory"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+  </analyzer>
+</fieldType>
+<!--
+  NGram Text Field
+  7.0.0
+-->
+<fieldType name="text_ngram" class="solr.TextField" positionIncrementGap="100">
+  <analyzer type="index">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
+    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_und.txt"/>
+    <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="1" generateNumberParts="1" protected="protwords_und.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="1"/>
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
+    <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+    <filter class="solr.NGramFilterFactory" minGramSize="2" maxGramSize="25"/>
+  </analyzer>
+  <analyzer type="query">
+    <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
     <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-    <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
-    <filter class="solr.WordDelimiterGraphFilterFactory"
-            protected="protwords.txt"
-            generateWordParts="1"
-            generateNumberParts="1"
-            catenateWords="1"
-            catenateNumbers="1"
-            catenateAll="0"
-            splitOnCaseChange="0"/>
-    <filter class="solr.LengthFilterFactory" min="2" max="100" />
-    <filter class="solr.LowerCaseFilterFactory"/>
-  </analyzer>
-  <analyzer type="query">
-    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-    <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-    <filter class="solr.StopFilterFactory"
-            ignoreCase="true"
-            words="stopwords.txt"
-    />
-    <filter class="solr.WordDelimiterGraphFilterFactory"
-            protected="protwords.txt"
-            generateWordParts="1"
-            generateNumberParts="1"
-            catenateWords="0"
-            catenateNumbers="0"
-            catenateAll="0"
-            splitOnCaseChange="0"/>
-    <filter class="solr.LengthFilterFactory" min="2" max="100" />
-    <filter class="solr.LowerCaseFilterFactory"/>
-  </analyzer>
-  <analyzer type="multiterm">
-    <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-    <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-    <filter class="solr.StopFilterFactory"
-            ignoreCase="true"
-            words="stopwords.txt"
-    />
-    <filter class="solr.WordDelimiterGraphFilterFactory"
-            protected="protwords.txt"
-            generateWordParts="1"
-            generateNumberParts="1"
-            catenateWords="0"
-            catenateNumbers="0"
-            catenateAll="0"
-            splitOnCaseChange="0"/>
-    <filter class="solr.LengthFilterFactory" min="2" max="100" />
+    <filter class="solr.LengthFilterFactory" min="2" max="100"/>
     <filter class="solr.LowerCaseFilterFactory"/>
+    <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
   </analyzer>
 </fieldType>
diff --git a/images/solr-drupal/solr7.5/conf/schema_legacy_fields.xml b/images/solr-drupal/solr7.5/conf/schema_legacy_fields.xml
deleted file mode 100644
index 902bb28e75..0000000000
--- a/images/solr-drupal/solr7.5/conf/schema_legacy_fields.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- Search Api specific fields -->
-<!-- item_id contains the entity ID, e.g. a node's nid. -->
-<field name="item_id"  type="string" indexed="true" stored="true" />
-
-<!-- Apache Solr Search Integration specific fields -->
-<!-- entity_id is the numeric object ID, e.g. Node ID, File ID -->
-<field name="entity_id"  type="long" indexed="true" stored="true" />
-<!-- entity_type is 'node', 'file', 'user', or some other Drupal object type -->
-<field name="entity_type" type="string" indexed="true" stored="true" />
-<!-- bundle is a node type, or as appropriate for other entity types -->
-<field name="bundle" type="string" indexed="true" stored="true"/>
-<field name="bundle_name" type="string" indexed="true" stored="true"/>
-<field name="url" type="string" indexed="true" stored="true"/>
-<!-- label is the default field for a human-readable string for this entity (e.g. the title of a node) -->
-<field name="label" type="text" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
-
-<!-- content is the default field for full text search - dump crap here -->
-<field name="content" type="text" indexed="true" stored="true" termVectors="true"/>
-<field name="teaser" type="text" indexed="false" stored="true"/>
-<field name="path" type="string" indexed="true" stored="true"/>
-<field name="path_alias" type="text" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
-
-<!-- These are the fields that correspond to a Drupal node. The beauty of having
-  Lucene store title, body, type, etc., is that we retrieve them with the search
-  result set and don't need to go to the database with a node_load. -->
-<field name="tid"  type="long" indexed="true" stored="true" multiValued="true"/>
-<field name="taxonomy_names" type="text" indexed="true" stored="false" termVectors="true" multiValued="true" omitNorms="true"/>
-<!-- copyField commands copy one field to another at the time a document
-  is added to the index.  It's used either to index the same field differently,
-  or to add multiple fields to the same field for easier/faster searching.  -->
-<!-- Since sorting by ID is explicitly allowed, store item_id also in a sortable way. -->
-<copyField source="item_id" dest="sort_search_api_id" />
-
-<!-- The string version of the title is used for sorting -->
-<copyField source="label" dest="sort_label"/>
-
-<!-- Copy terms to a single field that contains all taxonomy term names -->
-<copyField source="tm_vid_*" dest="taxonomy_names"/>
-
-<copyField source="label" dest="spell"/>
-<copyField source="content" dest="spell"/>
-
-<copyField source="ss_*" dest="sort_*"/>
-
-<dynamicField name="hss_*" type="sint"   indexed="true"  stored="true" multiValued="false"/>
-<dynamicField name="hsm_*" type="sint"   indexed="true"  stored="true" multiValued="true"/>
-<!-- Sortable fields, good for sortMissingLast support &
-  We use long for integer since 64 bit ints are now common in PHP. -->
-<dynamicField name="iss_*" type="slong"   indexed="true"  stored="true" multiValued="false"/>
-<dynamicField name="ism_*" type="slong"   indexed="true"  stored="true" multiValued="true"/>
-<!-- In rare cases a sfloat rather than tfloat is needed for sortMissingLast -->
-<dynamicField name="fss_*" type="sfloat"  indexed="true"  stored="true" multiValued="false"/>
-<dynamicField name="fsm_*" type="sfloat"  indexed="true"  stored="true" multiValued="true"/>
-<dynamicField name="pss_*" type="sdouble" indexed="true"  stored="true" multiValued="false"/>
-<dynamicField name="psm_*" type="sdouble" indexed="true"  stored="true" multiValued="true"/>
-
-<!--
-  A set of fields to contain text extracted from HTML tag contents which we
-  can boost at query time.
--->
-<dynamicField name="tags_*" type="text"   indexed="true" stored="false" omitNorms="true"/>
diff --git a/images/solr-drupal/solr7.5/conf/schema_legacy_types.xml b/images/solr-drupal/solr7.5/conf/schema_legacy_types.xml
deleted file mode 100644
index b46da0485e..0000000000
--- a/images/solr-drupal/solr7.5/conf/schema_legacy_types.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-  Note:
-  These should only be used for compatibility with existing indexes (created with older Solr versions)
-  or if "sortMissingFirst" or "sortMissingLast" functionality is needed. Use Trie based fields instead.
-
-  Numeric field types that manipulate the value into
-  a string value that isn't human-readable in its internal form,
-  but with a lexicographic ordering the same as the numeric ordering,
-  so that range queries work correctly.
--->
-<fieldType name="sint" class="solr.TrieIntField" sortMissingLast="true"/>
-<fieldType name="sfloat" class="solr.TrieFloatField" sortMissingLast="true"/>
-<fieldType name="slong" class="solr.TrieLongField" sortMissingLast="true"/>
-<fieldType name="sdouble" class="solr.TrieDoubleField" sortMissingLast="true"/>
diff --git a/images/solr-drupal/solr7.5/conf/solrconfig.xml b/images/solr-drupal/solr7.5/conf/solrconfig.xml
index 8f668c5b76..8834f220d9 100644
--- a/images/solr-drupal/solr7.5/conf/solrconfig.xml
+++ b/images/solr-drupal/solr7.5/conf/solrconfig.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE config [
-  <!ENTITY spellcheck SYSTEM "solrconfig_spellcheck.xml">
   <!ENTITY extra SYSTEM "solrconfig_extra.xml">
   <!ENTITY index SYSTEM "solrconfig_index.xml">
 ]>
@@ -10,7 +9,7 @@
      For more details about configurations options that may appear in
      this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
-<config name="drupal-6.5-solr-7.x" >
+<config name="drupal-8.3.4-solr-7.x" >
   <!-- In all configuration below, a prefix of "solr." for class names
        is an alias that causes solr to search appropriate packages,
        including org.apache.solr.(search|update|request|core|analysis)
@@ -82,9 +81,6 @@
   <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
   <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
-
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" regex=".*\.jar" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" regex=".*\.jar" />
   <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-analysis-extras-\d.*\.jar" />
@@ -104,6 +100,7 @@
        replication is in use, this should match the replication
        configuration.
     -->
+  <!--<dataDir>${solr.data.dir:}</dataDir>-->
   <dataDir>/var/solr/${solr.core.name}</dataDir>
 
 
@@ -227,7 +224,7 @@
          More details on the nuances of each LockFactory...
          http://wiki.apache.org/lucene-java/AvailableLockFactories
     -->
-    <lockType>${solr.lock.type:none}</lockType>
+    <lockType>${solr.lock.type:native}</lockType>
 
     <!-- Commit Deletion Policy
          Custom deletion policies can be specified here. The class must
@@ -730,14 +727,8 @@
       <bool name="omitHeader">true</bool>
       <!-- Don't abort searches for the /select request handler (set in solrcore.properties) -->
       <int name="timeAllowed">${solr.selectSearchHandler.timeAllowed:-1}</int>
-
       <!-- By default, don't spell check -->
       <str name="spellcheck">false</str>
-      <!-- Defaults for the spell checker when used -->
-      <str name="spellcheck.onlyMorePopular">true</str>
-      <str name="spellcheck.extendedResults">false</str>
-      <!--  The number of suggestions to return -->
-      <str name="spellcheck.count">1</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>
@@ -751,7 +742,7 @@
       <str name="echoParams">explicit</str>
       <str name="wt">json</str>
       <str name="indent">true</str>
-      <str name="df">text</str>
+      <str name="df">id</str>
     </lst>
   </requestHandler>
 
@@ -791,12 +782,8 @@
      when performing moreLikeThis requests.-->
   <requestHandler name="/mlt" class="solr.MoreLikeThisHandler">
     <lst name="defaults">
-      <str name="df">content</str>
       <str name="mlt.mintf">1</str>
       <str name="mlt.mindf">1</str>
-      <str name="mlt.minwl">3</str>
-      <str name="mlt.maxwl">15</str>
-      <str name="mlt.maxqt">20</str>
       <str name="mlt.match.include">false</str>
       <!-- Abort any searches longer than 2 seconds (set in solrcore.properties) -->
       <int name="timeAllowed">${solr.mlt.timeAllowed:2000}</int>
@@ -806,7 +793,7 @@
   <!-- A minimal query type for doing lucene queries -->
   <requestHandler name="standard" class="solr.SearchHandler">
      <lst name="defaults">
-       <str name="df">content</str>
+       <str name="df">id</str>
        <str name="echoParams">explicit</str>
        <bool name="omitHeader">true</bool>
      </lst>
@@ -814,7 +801,7 @@
 
   <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
     <lst name="defaults">
-      <str name="df">text</str>
+      <str name="df">id</str>
     </lst>
   </initParams>
 
@@ -919,7 +906,7 @@
       <str name="enable">${solr.replication.master:false}</str>
       <str name="replicateAfter">commit</str>
       <str name="replicateAfter">startup</str>
-      <str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
+      <str name="confFiles">${solr.replication.confFiles:schema.xml,elevate.xml}</str>
     </lst>
     <lst name="slave">
       <str name="enable">${solr.replication.slave:false}</str>
@@ -983,16 +970,8 @@
 
      -->
 
-  <!-- Spell Check
-
-      The spell check component can return a list of alternative spelling
-      suggestions. This component must be defined in
-      solrconfig_extra.xml if present, since it's used in the search handler.
-
-      http://wiki.apache.org/solr/SpellCheckComponent
-   -->
   <!-- Following is a dynamic way to include other components or any customized solrconfig.xml stuff, added by other contrib modules -->
-  &spellcheck;
+  &extra;
 
   <!-- A request handler for demonstrating the spellcheck component.
 
@@ -1009,13 +988,8 @@
     -->
   <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
-      <str name="df">spell</str>
-      <!-- Solr will use suggestions from both the 'default' spellchecker
-           and from the 'wordbreak' spellchecker and combine them.
-           collations (re-written queries) can include a combination of
-           corrections from both spellcheckers -->
-      <str name="spellcheck.dictionary">default</str>
-      <str name="spellcheck.dictionary">wordbreak</str>
+      <str name="df">id</str>
+      <str name="spellcheck.dictionary">und</str>
       <str name="spellcheck">on</str>
       <str name="spellcheck.onlyMorePopular">false</str>
       <str name="spellcheck.extendedResults">false</str>
@@ -1032,9 +1006,6 @@
     </arr>
   </requestHandler>
 
-  <!-- Following is a dynamic way to include other components or any customized solrconfig.xml stuff, added by other contrib modules -->
-  &extra;
-
   <requestHandler name="/suggest" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
       <str name="suggest">true</str>
@@ -1060,7 +1031,7 @@
     -->
   <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
-      <str name="df">text</str>
+      <str name="df">id</str>
       <bool name="tv">true</bool>
     </lst>
     <arr name="last-components">
@@ -1125,7 +1096,7 @@
   <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
       <str name="echoParams">explicit</str>
-      <str name="df">text</str>
+      <str name="df">id</str>
     </lst>
     <arr name="last-components">
       <str>elevator</str>
diff --git a/images/solr-drupal/solr7.5/conf/solrconfig_extra.xml b/images/solr-drupal/solr7.5/conf/solrconfig_extra.xml
index 0d4102664a..4c71569a02 100644
--- a/images/solr-drupal/solr7.5/conf/solrconfig_extra.xml
+++ b/images/solr-drupal/solr7.5/conf/solrconfig_extra.xml
@@ -1,12 +1,54 @@
+<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
+    <lst name="spellchecker">
+      <str name="name">en</str>
+      <str name="field">spellcheck_en</str>
+      <str name="classname">solr.DirectSolrSpellChecker</str>
+      <str name="distanceMeasure">internal</str>
+      <str name="accuracy">0.5</str>
+      <str name="maxEdits">2</str>
+      <str name="minPrefix">1</str>
+      <str name="maxInspections">5</str>
+      <str name="minQueryLength">4</str>
+      <str name="maxQueryFrequency">0.01</str>
+      <str name="thresholdTokenFrequency">.01</str>
+      <str name="onlyMorePopular">true</str>
+    </lst>
+  
+    <lst name="spellchecker">
+      <str name="name">und</str>
+      <str name="field">spellcheck_und</str>
+      <str name="classname">solr.DirectSolrSpellChecker</str>
+      <str name="distanceMeasure">internal</str>
+      <str name="accuracy">0.5</str>
+      <str name="maxEdits">2</str>
+      <str name="minPrefix">1</str>
+      <str name="maxInspections">5</str>
+      <str name="minQueryLength">4</str>
+      <str name="maxQueryFrequency">0.01</str>
+      <str name="thresholdTokenFrequency">.01</str>
+      <str name="onlyMorePopular">true</str>
+    </lst>
+  </searchComponent>
 <searchComponent name="suggest" class="solr.SuggestComponent">
-  <lst name="suggester">
-    <str name="name">und</str>
-    <str name="lookupImpl">AnalyzingInfixLookupFactory</str>
-    <str name="dictionaryImpl">DocumentDictionaryFactory</str>
-    <str name="field">twm_suggest</str>
-    <str name="suggestAnalyzerFieldType">text</str>
-    <str name="contextField">sm_context_tags</str>
-    <str name="buildOnCommit">true</str>
-    <str name="buildOnStartup">false</str>
-  </lst>
-</searchComponent>
+    <lst name="suggester">
+      <str name="name">en</str>
+      <str name="lookupImpl">AnalyzingInfixLookupFactory</str>
+      <str name="dictionaryImpl">DocumentDictionaryFactory</str>
+      <str name="field">twm_suggest</str>
+      <str name="suggestAnalyzerFieldType">text_en</str>
+      <str name="contextField">sm_context_tags</str>
+      <str name="buildOnCommit">true</str>
+      <str name="buildOnStartup">false</str>
+    </lst>
+  
+    <lst name="suggester">
+      <str name="name">und</str>
+      <str name="lookupImpl">AnalyzingInfixLookupFactory</str>
+      <str name="dictionaryImpl">DocumentDictionaryFactory</str>
+      <str name="field">twm_suggest</str>
+      <str name="suggestAnalyzerFieldType">text_und</str>
+      <str name="contextField">sm_context_tags</str>
+      <str name="buildOnCommit">true</str>
+      <str name="buildOnStartup">false</str>
+    </lst>
+  </searchComponent>
diff --git a/images/solr-drupal/solr7.5/conf/solrconfig_spellcheck.xml b/images/solr-drupal/solr7.5/conf/solrconfig_spellcheck.xml
deleted file mode 100644
index 5c9d7ad79e..0000000000
--- a/images/solr-drupal/solr7.5/conf/solrconfig_spellcheck.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- Spell Check
-
-    The spell check component can return a list of alternative spelling
-    suggestions. This component must be defined in
-    solrconfig_extra.xml if present, since it's used in the search handler.
-
-    http://wiki.apache.org/solr/SpellCheckComponent
- -->
-<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-  <str name="queryAnalyzerFieldType">textSpell</str>
-
-
-  <!-- Multiple "Spell Checkers" can be declared and used by this
-       component
-    -->
-
-  <!-- a spellchecker built from a field of the main index -->
-  <lst name="spellchecker">
-    <str name="name">default</str>
-    <str name="field">spell</str>
-    <str name="classname">solr.DirectSolrSpellChecker</str>
-    <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
-    <str name="distanceMeasure">internal</str>
-    <!-- minimum accuracy needed to be considered a valid spellcheck suggestion -->
-    <float name="accuracy">0.5</float>
-    <!-- the maximum #edits we consider when enumerating terms: can be 1 or 2 -->
-    <int name="maxEdits">2</int>
-    <!-- the minimum shared prefix when enumerating terms -->
-    <int name="minPrefix">1</int>
-    <!-- maximum number of inspections per result. -->
-    <int name="maxInspections">5</int>
-    <!-- minimum length of a query term to be considered for correction -->
-    <int name="minQueryLength">4</int>
-    <!-- maximum threshold of documents a query term can appear to be considered for correction -->
-    <float name="maxQueryFrequency">0.01</float>
-    <!-- uncomment this to require suggestions to occur in 1% of the documents
-      <float name="thresholdTokenFrequency">.01</float>
-    -->
-  </lst>
-
-  <!-- a spellchecker that can break or combine words.  See "/spell" handler below for usage -->
-  <lst name="spellchecker">
-    <str name="name">wordbreak</str>
-    <str name="classname">solr.WordBreakSolrSpellChecker</str>
-    <str name="field">name</str>
-    <str name="combineWords">true</str>
-    <str name="breakWords">true</str>
-    <int name="maxChanges">10</int>
-  </lst>
-
-  <!-- a spellchecker that uses a different distance measure -->
-  <!--
-     <lst name="spellchecker">
-       <str name="name">jarowinkler</str>
-       <str name="field">spell</str>
-       <str name="classname">solr.DirectSolrSpellChecker</str>
-       <str name="distanceMeasure">
-         org.apache.lucene.search.spell.JaroWinklerDistance
-       </str>
-     </lst>
-   -->
-
-  <!-- a spellchecker that use an alternate comparator
-
-       comparatorClass be one of:
-        1. score (default)
-        2. freq (Frequency first, then score)
-        3. A fully qualified class name
-    -->
-  <!--
-     <lst name="spellchecker">
-       <str name="name">freq</str>
-       <str name="field">lowerfilt</str>
-       <str name="classname">solr.DirectSolrSpellChecker</str>
-       <str name="comparatorClass">freq</str>
-    -->
-
-  <!-- A spellchecker that reads the list of words from a file -->
-  <!--
-     <lst name="spellchecker">
-       <str name="classname">solr.FileBasedSpellChecker</str>
-       <str name="name">file</str>
-       <str name="sourceLocation">spellings.txt</str>
-       <str name="characterEncoding">UTF-8</str>
-       <str name="spellcheckIndexDir">spellcheckerFile</str>
-     </lst>
-    -->
-</searchComponent>
diff --git a/images/solr-drupal/solr7.5/conf/solrcore.properties b/images/solr-drupal/solr7.5/conf/solrcore.properties
index bec6ba32db..a213961d54 100644
--- a/images/solr-drupal/solr7.5/conf/solrcore.properties
+++ b/images/solr-drupal/solr7.5/conf/solrcore.properties
@@ -1,20 +1,13 @@
-# Defines Solr properties for this specific core.
 solr.replication.master=false
 solr.replication.slave=false
 solr.replication.pollInterval=00:00:60
-solr.replication.masterUrl=http://localhost:8983/solr
-solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
+solr.replication.masterUrl=http://solr:8983/solr
+solr.replication.confFiles=schema.xml,elevate.xml,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt
 solr.mlt.timeAllowed=2000
-# You should not set your luceneMatchVersion to anything lower than your Solr
-# Version.
-solr.luceneMatchVersion=7.0
+solr.luceneMatchVersion=7.5
 solr.selectSearchHandler.timeAllowed=-1
-# don't autoCommit after x docs
 solr.autoCommit.MaxDocs=-1
-# autoCommit after 15 seconds
 solr.autoCommit.MaxTime=15000
-# don't autoSoftCommit after x docs
 solr.autoSoftCommit.MaxDocs=-1
-# don't autoSoftCommit after x seconds
 solr.autoSoftCommit.MaxTime=-1
 solr.install.dir=/opt/solr
diff --git a/images/solr-drupal/solr7.5/conf/stopwords.txt b/images/solr-drupal/solr7.5/conf/stopwords.txt
deleted file mode 100644
index d7f243e48a..0000000000
--- a/images/solr-drupal/solr7.5/conf/stopwords.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Contains words which shouldn't be indexed for fulltext fields, e.g., because
-# they're too common. For documentation of the format, see
-# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory
-# (Lines starting with a pound character # are ignored.)
diff --git a/images/solr-drupal/solr7.5/conf/stopwords_en.txt b/images/solr-drupal/solr7.5/conf/stopwords_en.txt
new file mode 100644
index 0000000000..6981050710
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/stopwords_en.txt
@@ -0,0 +1,35 @@
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+s
+such
+t
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
diff --git a/images/solr-drupal/solr7.5/conf/stopwords_und.txt b/images/solr-drupal/solr7.5/conf/stopwords_und.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/stopwords_und.txt
@@ -0,0 +1 @@
+
diff --git a/images/solr-drupal/solr7.5/conf/synonyms.txt b/images/solr-drupal/solr7.5/conf/synonyms.txt
deleted file mode 100644
index 7d22eea6d6..0000000000
--- a/images/solr-drupal/solr7.5/conf/synonyms.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Contains synonyms to use for your index. For the format used, see
-# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.SynonymFilterFactory
-# (Lines starting with a pound character # are ignored.)
diff --git a/images/solr-drupal/solr7.5/conf/synonyms_en.txt b/images/solr-drupal/solr7.5/conf/synonyms_en.txt
new file mode 100644
index 0000000000..91689ff92f
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/synonyms_en.txt
@@ -0,0 +1 @@
+drupal, durpal
diff --git a/images/solr-drupal/solr7.5/conf/synonyms_und.txt b/images/solr-drupal/solr7.5/conf/synonyms_und.txt
new file mode 100644
index 0000000000..91689ff92f
--- /dev/null
+++ b/images/solr-drupal/solr7.5/conf/synonyms_und.txt
@@ -0,0 +1 @@
+drupal, durpal