From e2ee5f424dc2bb1440504a028c8be735b82c334b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 25 Feb 2019 08:35:21 +0100 Subject: [PATCH 1/5] Bump checkstyle from 8.17 to 8.18 (#4700) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.17 to 8.18. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.17...checkstyle-8.18) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 26d139a3c12..d8a23f7ccf2 100644 --- a/build.gradle +++ b/build.gradle @@ -178,7 +178,7 @@ dependencies { testCompile "org.testfx:testfx-core:4.0.+" testCompile "org.testfx:testfx-junit5:4.0.+" - checkstyle 'com.puppycrawl.tools:checkstyle:8.17' + checkstyle 'com.puppycrawl.tools:checkstyle:8.18' } jacoco { From 3cf609cd7f90f0ad8a011c02392a8633d2a8fcab Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 27 Feb 2019 08:27:19 +0100 Subject: [PATCH 2/5] Improve parser warnings (#4702) Based on http://discourse.jabref.org/t/warnings-by-jabref-start/1532, in which a user (rightfully) complained that the error message is not very helpful. --- .../jabref/logic/importer/fileformat/BibtexParser.java | 10 +++++----- src/main/resources/l10n/JabRef_en.properties | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java index 8296a534503..b9f8e6b2513 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java @@ -703,21 +703,21 @@ private String fixKey() throws IOException { } // Finished, now reverse newKey and remove whitespaces: - parserResult.addWarning( - Localization.lang("Line %0: Found corrupted BibTeX key.", String.valueOf(line))); key = newKey.reverse(); + parserResult.addWarning( + Localization.lang("Line %0: Found corrupted BibTeX key %1.", String.valueOf(line), key.toString())); } } break; case ',': - parserResult.addWarning(Localization.lang("Line %0: Found corrupted BibTeX key (contains whitespaces).", - String.valueOf(line))); + parserResult.addWarning( + Localization.lang("Line %0: Found corrupted BibTeX key %1 (contains whitespaces).", String.valueOf(line), key.toString())); break; case '\n': parserResult.addWarning( - Localization.lang("Line %0: Found corrupted BibTeX key (comma missing).", String.valueOf(line))); + Localization.lang("Line %0: Found corrupted BibTeX key %1 (comma missing).", String.valueOf(line), key.toString())); break; default: diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index 8d1927343d2..e38d7c151da 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -1160,10 +1160,9 @@ Use\ IEEE\ LaTeX\ abbreviations=Use IEEE LaTeX abbreviations When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=When opening file link, search for matching file if no link is defined Settings\ for\ %0=Settings for %0 - -Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Line %0: Found corrupted BibTeX key. -Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Line %0: Found corrupted BibTeX key (contains whitespaces). -Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Line %0: Found corrupted BibTeX key (comma missing). +Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1.=Line %0: Found corrupted BibTeX key %1. +Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (contains\ whitespaces).=Line %0: Found corrupted BibTeX key %1 (contains whitespaces). +Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (comma\ missing).=Line %0: Found corrupted BibTeX key %1 (comma missing). No\ full\ text\ document\ found=No full text document found Update\ to\ current\ column\ order=Update to current column order Download\ from\ URL=Download from URL From 42e42ffc2e2fc17e1489edf9841b3cafb421ed83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 1 Mar 2019 08:10:23 +0100 Subject: [PATCH 3/5] Bump xmpbox from 2.0.13 to 2.0.14 (#4704) Bumps xmpbox from 2.0.13 to 2.0.14. Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d8a23f7ccf2..b0f8743b4f3 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,7 @@ dependencies { compile 'org.apache.pdfbox:pdfbox:2.0.13' compile 'org.apache.pdfbox:fontbox:2.0.13' - compile 'org.apache.pdfbox:xmpbox:2.0.13' + compile 'org.apache.pdfbox:xmpbox:2.0.14' compile group: 'org.apache.tika', name: 'tika-core', version: '1.20' From ae49277f41aadddc166de1d8c4c1de39bce0da4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 1 Mar 2019 08:11:28 +0100 Subject: [PATCH 4/5] Bump pdfbox from 2.0.13 to 2.0.14 (#4706) Bumps pdfbox from 2.0.13 to 2.0.14. Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0f8743b4f3..8b7d8f6b140 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ dependencies { compile 'com.jgoodies:jgoodies-common:1.8.1' compile 'com.jgoodies:jgoodies-forms:1.9.0' - compile 'org.apache.pdfbox:pdfbox:2.0.13' + compile 'org.apache.pdfbox:pdfbox:2.0.14' compile 'org.apache.pdfbox:fontbox:2.0.13' compile 'org.apache.pdfbox:xmpbox:2.0.14' From b041d98feb235745d74bc07634c41e783e5b509e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 1 Mar 2019 08:40:07 +0100 Subject: [PATCH 5/5] Bump fontbox from 2.0.13 to 2.0.14 (#4705) Bumps fontbox from 2.0.13 to 2.0.14. Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8b7d8f6b140..a5c470c8f20 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ dependencies { compile 'com.jgoodies:jgoodies-forms:1.9.0' compile 'org.apache.pdfbox:pdfbox:2.0.14' - compile 'org.apache.pdfbox:fontbox:2.0.13' + compile 'org.apache.pdfbox:fontbox:2.0.14' compile 'org.apache.pdfbox:xmpbox:2.0.14' compile group: 'org.apache.tika', name: 'tika-core', version: '1.20'