fix issue #29 - upgrade to solr 7.3

Makefile

@@ -70,8 +70,8 @@ init: theme-dl
 #	@test -f specieslist/specieslist-webapp.war || \
 #		wget -q --show-progress -O specieslist/specieslist-webapp.war $(URL_SPECIESLIST)
 
-	@test -f solr6/lib/jts-core-1.15.0.jar || \
-		wget -q --show-progress -O solr6/lib/jts-core-1.15.0.jar $(URL_JTS)
+	@test -f solr7/lib/jts-core-1.15.0.jar || \
+		wget -q --show-progress -O solr7/lib/jts-core-1.15.0.jar $(URL_JTS)
 
 theme-dl:
 	@echo "Downloading bioatlas wordpress theme..."
@@ -152,8 +152,8 @@ pull2:
 	@docker pull mysql:5.7
 	@docker pull cassandra:3.11.2
 	@docker pull postgres:9.6.8-alpine
-	@docker pull solr:6.6.3-alpine
-	@docker pull wordpress:latest
+	@docker pull solr:7.3-alpine
+	@docker pull wordpress:4.9.5-apache
 	@docker pull nginx:alpine
 	@docker pull andyshinn/dnsmasq:2.76
 	@docker pull jwilder/nginx-proxy

docker-compose.yml

@@ -18,12 +18,12 @@ services:
     image: jwilder/nginx-proxy
     container_name: nginx-proxy
     ports:
-      - "80:80"
-      - "443:443"
+      - 80:80
+      - 443:443
     volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /var/run/docker.sock:/tmp/docker.sock
       #- ./nginx-proxy-certs:/etc/nginx/certs:ro
-      - ./nginx-proxy/nginx-proxy.conf:/etc/nginx/conf.d/nginx-proxy.conf:ro
+      - ./nginx-proxy/nginx-proxy.conf:/etc/nginx/conf.d/nginx-proxy.conf
 
   webserver:
     image: nginx:alpine
@@ -126,16 +126,16 @@ services:
       - ./config/biocache-config.properties:/data/biocache/config/biocache-config.properties:ro
 
   solr:
-    image: solr:6.6.3-alpine
+    image: solr:7.3-alpine
     container_name: solr
     environment:
       SOLR_HEAP: 4g
     volumes:
-      - ./solr6/mycores:/opt/solr/server/solr/mycores
-      - ./solr6/solr.xml:/opt/solr/server/solr/solr.xml
-      - ./solr6/zoo.cfg:/opt/solr/server/solr/zoo.cfg
-      - ./solr6/lib/jts-1.13.jar:/opt/solr/server/lib/ext/jts-1.13.jar
-      - ./solr6/solr.in.sh:/etc/default/solr.in.sh:ro
+      - ./solr7/mycores:/opt/solr/server/solr/mycores
+      - ./solr7/solr.xml:/opt/solr/server/solr/solr.xml
+      - ./solr7/zoo.cfg:/opt/solr/server/solr/zoo.cfg
+      - ./solr7/lib/jts-core-1.15.0.jar:/opt/solr/server/solr-webapp/webapp/WEB-INF/lib/jts-core-1.15.0.jar
+      - ./solr7/solr.in.sh:/etc/default/solr.in.sh:ro
       - data_solr:/opt/solr
     entrypoint:
       - docker-entrypoint.sh
@@ -232,7 +232,7 @@ services:
       - db_data_wordpress:/var/lib/mysql
 
   wordpress:
-    image: wordpress:latest
+    image: wordpress:4.9.5-apache
     container_name: wordpress
     ports:
       - 8080:80

solr6/mycores/bie-offline/conf/schema.xml → solr7/mycores/bie-offline/conf/schema.xml

@@ -475,10 +475,10 @@
  <uniqueKey>id</uniqueKey>
 
  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>text</defaultSearchField>
+ <!-- solr7 doesn't allow this <defaultSearchField>text</defaultSearchField> -->
 
  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
+ <!-- solr7 not allow <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,
@@ -539,4 +539,4 @@
    <copyField source="commonName" dest="commonName_suggest_ngram" />
    <!-- <copyField source="commonName" dest="commonName_s" /> -->
 
-</schema>
+</schema>

solr6/mycores/bie/conf/solrconfig.xml → solr7/mycores/bie-offline/conf/solrconfig.xml

@@ -771,6 +771,7 @@
             <str name="echoParams">explicit</str>
             <int name="rows">10</int>
             <str name="df">text</str>
+            <str name="q.op">OR</str>
         </lst>
         <!-- In addition to defaults, "appends" params can be specified
              to identify values which should be appended to the list of

solr6/mycores/bie/conf/schema.xml → solr7/mycores/bie/conf/schema.xml

@@ -475,10 +475,10 @@
  <uniqueKey>id</uniqueKey>
 
  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>text</defaultSearchField>
+ <!-- solr7 doesn't allow this <defaultSearchField>text</defaultSearchField> -->
 
  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
+ <!-- solr7 not allow this <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,
@@ -539,4 +539,4 @@
    <copyField source="commonName" dest="commonName_suggest_ngram" />
    <!-- <copyField source="commonName" dest="commonName_s" /> -->
 
-</schema>
+</schema>

solr6/mycores/bie-offline/conf/solrconfig.xml → solr7/mycores/bie/conf/solrconfig.xml

@@ -771,6 +771,7 @@
             <str name="echoParams">explicit</str>
             <int name="rows">10</int>
             <str name="df">text</str>
+            <str name="q.op">OR</str>
         </lst>
         <!-- In addition to defaults, "appends" params can be specified
              to identify values which should be appended to the list of

solr6/mycores/biocache/conf/schema.xml → solr7/mycores/biocache/conf/schema.xml

@@ -433,8 +433,7 @@
 
 
     <fieldType name="quad"      class="solr.SpatialTermQueryPrefixTreeFieldType" distanceUnits="degrees" />
-    <fieldType name="geohash"   class="solr.SpatialRecursivePrefixTreeFieldType" spatialContextFactory="com.spatial4j.core.context.jts.JtsSpatialContextFactory" distanceUnits="degrees" />
-
+    <fieldType name="geohash"   class="solr.SpatialRecursivePrefixTreeFieldType" spatialContextFactory="JTS" distanceUnits="degrees" />
   </types>
 
 
@@ -752,10 +751,10 @@
   <uniqueKey>id</uniqueKey>
 
   <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>text</defaultSearchField>
+  <!-- solr7 doesn't allow this <defaultSearchField>text</defaultSearchField> -->
 
   <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="AND"/>
+ <!-- not in solr7 <solrQueryParser defaultOperator="AND"/> -->
 
   <!-- 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,
@@ -860,4 +859,4 @@
   </similarity>
   -->
 
-</schema>
+</schema>

solr6/mycores/biocache/conf/solrconfig.xml → solr7/mycores/biocache/conf/solrconfig.xml

@@ -771,6 +771,7 @@
             <str name="echoParams">explicit</str>
             <int name="rows">10</int>
             <str name="df">text</str>
+            <str name="q.op">AND</str>
         </lst>
         <!-- In addition to defaults, "appends" params can be specified
              to identify values which should be appended to the list of