Bumped version to 2.4.0 and updated various other settings

EHRI · Feb 8, 2021 · 508365e · 508365e
1 parent fe64b3f
commit 508365e
Show file tree

Hide file tree

Showing 7 changed files with 946 additions and 141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@ node_modules/
 vendor
 pkg
 .DS_Store
+.idea
+*.iml
+.bundle
 
 tests/phpunit/solr.ini
-solr-core/collection1/data
+solr-core/omeka/data
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -102,7 +102,12 @@ module.exports = function(grunt) {
           '!tests/**',
 
           // Editor settings
-          '!*.vim'
+          '!*.vim',
+          '!.idea',
+          '!*.iml',
+
+          // Docker
+          '!docker-compose.yml'
 
         ]
       }

diff --git a/SolrSearchPlugin.php b/SolrSearchPlugin.php
@@ -371,7 +371,7 @@ protected function _installGenericFacet($slug, $label)
     protected function _setOptions()
     {
         set_option('solr_search_host',          'localhost');
-        set_option('solr_search_port',          '8080');
+        set_option('solr_search_port',          '8983');
         set_option('solr_search_core',          '/solr/omeka/');
         set_option('solr_search_facet_limit',   '25');
         set_option('solr_search_facet_sort',    'count');

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
   "require-dev": {
-    "phpunit/phpunit": "3.7.*"
+    "phpunit/phpunit": "^4.8"
   }
 }