Merge remote-tracking branch 'upstream/master' into sortStrings

* upstream/master:
  Bump mockito-core from 2.26.0 to 2.27.0 (#4879)
  Bump java-string-similarity from 1.1.0 to 1.2.1 (#4878)
  Fix JabRef dying silently without enough inotify instances (#4875)

CHANGELOG.md

@@ -65,6 +65,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 
 ### Fixed
+- We fixed an issue where JabRef died silently for the user without enough inotify instances [#4874](https://github.com/JabRef/jabref/issues/4847)
 - We fixed an issue where corresponding groups are sometimes not highlighted when clicking on entries [#3112](https://github.com/JabRef/jabref/issues/3112)
 - We fixed an issue where custom exports could not be selected in the 'Export (selected) entries' dialog [#4013](https://github.com/JabRef/jabref/issues/4013)
 - Italic text is now rendered correctly. https://github.com/JabRef/jabref/issues/3356

build.gradle

@@ -112,7 +112,7 @@ dependencies {
     compile "org.libreoffice:unoil:6.2.2"
 
     compile 'io.github.java-diff-utils:java-diff-utils:4.0'
-    compile 'info.debatty:java-string-similarity:1.1.0'
+    compile 'info.debatty:java-string-similarity:1.2.1'
 
     antlr3 'org.antlr:antlr:3.5.2'
     compile 'org.antlr:antlr-runtime:3.5.2'
@@ -167,7 +167,7 @@ dependencies {
 
     testRuntime 'org.apache.logging.log4j:log4j-core:2.11.1'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.11.2'
-    testCompile 'org.mockito:mockito-core:2.26.0'
+    testCompile 'org.mockito:mockito-core:2.27.0'
     testCompile 'com.github.tomakehurst:wiremock:2.22.0'
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'

src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java

@@ -59,7 +59,7 @@ public void run() {
                 Thread.yield();
             }
         } catch (Throwable e) {
-            LOGGER.debug("FileUpdateMonitor has been interrupted. Terminating...", e);
+            LOGGER.error("FileUpdateMonitor has been interrupted.", e);
         }
     }