From 0dd091f31b86b02dd9e44b4ac86aa204d4dec9ef Mon Sep 17 00:00:00 2001 From: Marco Konersmann Date: Tue, 9 Apr 2019 15:36:38 +0200 Subject: [PATCH 1/3] Fix JabRef dying silently without enough inotify instances (#4875) * Logs exceptions in file monitor as errors An exception in the initialization of DefaultFileUpdateMonitor is now logged as error * Describes fix for issue #4874 --- CHANGELOG.md | 1 + src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a941e10ce1..3ec7d2b519a 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java index 28de7285f3f..bdf0b51e2a6 100644 --- a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java +++ b/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); } } From e1a01d2a6afd7498e3382f74b172d3b8c5e55293 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 11 Apr 2019 08:06:54 +0200 Subject: [PATCH 2/3] Bump java-string-similarity from 1.1.0 to 1.2.1 (#4878) Bumps [java-string-similarity](https://github.com/tdebatty/java-string-similarity) from 1.1.0 to 1.2.1. - [Release notes](https://github.com/tdebatty/java-string-similarity/releases) - [Commits](https://github.com/tdebatty/java-string-similarity/compare/v1.1.0...v1.2.1) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b20bd600e17..9b0ba62711c 100644 --- a/build.gradle +++ b/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' From 6e062d9484e31f917c877d9e6fd72e5f62bcb7ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 11 Apr 2019 08:07:28 +0200 Subject: [PATCH 3/3] Bump mockito-core from 2.26.0 to 2.27.0 (#4879) Bumps [mockito-core](https://github.com/mockito/mockito) from 2.26.0 to 2.27.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v2.26.0...v2.27.0) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9b0ba62711c..5154e337837 100644 --- a/build.gradle +++ b/build.gradle @@ -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'