From 5f79711ca7838b2d12ddaaa973a46de3e85a3ff0 Mon Sep 17 00:00:00 2001
From: Julie Allinson <julie.allinson@london.ac.uk>
Date: Fri, 22 Sep 2017 15:25:31 +0100
Subject: [PATCH] Remove deprecated defaultOperator and defaultSearchField solr
 configurations

---
 .solr_wrapper          | 2 --
 solr/config/schema.xml | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/.solr_wrapper b/.solr_wrapper
index 38bbd40e40..a425df6d1d 100644
--- a/.solr_wrapper
+++ b/.solr_wrapper
@@ -1,7 +1,5 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
-# TODO: Relax this when we're Solr 7-compliant
-version: 6.6.1
 collection:
   persist: true
   dir: solr/config/
diff --git a/solr/config/schema.xml b/solr/config/schema.xml
index 2e9deac632..8eda5703de 100644
--- a/solr/config/schema.xml
+++ b/solr/config/schema.xml
@@ -334,12 +334,6 @@
    -->
  <uniqueKey>id</uniqueKey>
 
- <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <!--  <defaultSearchField>text</defaultSearchField> -->
-
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
-
   <!-- 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.  -->