From 795ac1b641e8c006d59c355c9a59631959dc7acb Mon Sep 17 00:00:00 2001 From: Joerg Lenhard Date: Wed, 29 Jul 2015 14:37:11 +0200 Subject: [PATCH 1/4] Bump pdfbox dependency versions --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3264b956c1f..f5ffbfb9a92 100644 --- a/build.gradle +++ b/build.gradle @@ -76,9 +76,9 @@ dependencies { compile 'org.swinglabs:swingx:1.6.1' - compile 'org.apache.pdfbox:pdfbox:1.8.9' - compile 'org.apache.pdfbox:fontbox:1.8.9' - compile 'org.apache.pdfbox:jempbox:1.8.9' + compile 'org.apache.pdfbox:pdfbox:1.8.+' + compile 'org.apache.pdfbox:fontbox:1.8.+' + compile 'org.apache.pdfbox:jempbox:1.8.+' compile 'commons-cli:commons-cli:1.3.1' From c03e4fa4a556467330ada3c0329ab694112ce65e Mon Sep 17 00:00:00 2001 From: Joerg Lenhard Date: Wed, 29 Jul 2015 14:45:05 +0200 Subject: [PATCH 2/4] Move FUTURE_YEAR to TextAnalyzer, as it is only used there --- src/main/java/net/sf/jabref/Globals.java | 8 ++------ src/main/java/net/sf/jabref/imports/TextAnalyzer.java | 11 +++++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/sf/jabref/Globals.java b/src/main/java/net/sf/jabref/Globals.java index 55175168d0a..278e198982d 100644 --- a/src/main/java/net/sf/jabref/Globals.java +++ b/src/main/java/net/sf/jabref/Globals.java @@ -104,13 +104,9 @@ public ResourceBundle newBundle(String baseName, Locale locale, private static int SHORTCUT_MASK = -1; - public static final int - FUTURE_YEAR = 2050; // Needs to give a year definitely in the future. - // Used for guessing the - // year field when parsing textual data. :-) - public static int STANDARD_EXPORT_COUNT = 5; // The number of standard export formats. - public static final int METADATA_LINE_LENGTH = 70; // The line length used to wrap metadata. + public static int STANDARD_EXPORT_COUNT = 5; // The number of standard export formats. + public static final int METADATA_LINE_LENGTH = 70; // The line length used to wrap metadata. // used at highlighting in preview area. // Color chosen similar to JTextComponent.getSelectionColor(), which is diff --git a/src/main/java/net/sf/jabref/imports/TextAnalyzer.java b/src/main/java/net/sf/jabref/imports/TextAnalyzer.java index fe2ddf482a4..b80845670d2 100644 --- a/src/main/java/net/sf/jabref/imports/TextAnalyzer.java +++ b/src/main/java/net/sf/jabref/imports/TextAnalyzer.java @@ -22,14 +22,17 @@ import org.apache.commons.logging.LogFactory; import net.sf.jabref.BibtexEntry; -import net.sf.jabref.Globals; class TextAnalyzer { private final BibtexEntry be = null; private static final Log LOGGER = LogFactory.getLog(TextAnalyzer.class); - + + // Needs to give a year definitely in the future. + // Used for guessing the + // year field when parsing textual data. :-) + private static final int FUTURE_YEAR = 2050; public TextAnalyzer(String text) { guessBibtexFields(text); @@ -72,10 +75,10 @@ private void guessBibtexFields(String text) { yearFound = number; } else { // More than one found. Be a bit more specific. - if ((yearFound < Globals.FUTURE_YEAR) && (number < Globals.FUTURE_YEAR)) { + if ((yearFound < FUTURE_YEAR) && (number < FUTURE_YEAR)) { good = -1; break; // Give up, both seem good enough. - } else if ((yearFound >= Globals.FUTURE_YEAR) && (number < Globals.FUTURE_YEAR)) { + } else if ((yearFound >= FUTURE_YEAR) && (number < FUTURE_YEAR)) { good = i; yearFound = number; } From 6d0ef72a019708ce2ea809f2d973a6519dd8f7bc Mon Sep 17 00:00:00 2001 From: Joerg Lenhard Date: Wed, 29 Jul 2015 14:49:54 +0200 Subject: [PATCH 3/4] Document logging changes in CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index fb7415a14b5..d0ad0ecda54 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ [master] + - Streamline logging API: Replace usages of java.util.logging with commons.logging - "ISBN to BibTeX" fetcher now uses eBook.de's API (fixes bug #1241) - Update dependencies: jersey, commons.logging, pdfbox, jgoodies, lazedlists, JDBC connectors - Refactored preferences From 4c3e0d5d02ce60780e6a83abcef03d42b769588f Mon Sep 17 00:00:00 2001 From: Joerg Lenhard Date: Wed, 29 Jul 2015 14:50:11 +0200 Subject: [PATCH 4/4] Use absolute version numbers for pdfbox dependencies --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f5ffbfb9a92..9da4180655c 100644 --- a/build.gradle +++ b/build.gradle @@ -76,9 +76,9 @@ dependencies { compile 'org.swinglabs:swingx:1.6.1' - compile 'org.apache.pdfbox:pdfbox:1.8.+' - compile 'org.apache.pdfbox:fontbox:1.8.+' - compile 'org.apache.pdfbox:jempbox:1.8.+' + compile 'org.apache.pdfbox:pdfbox:1.8.10' + compile 'org.apache.pdfbox:fontbox:1.8.10' + compile 'org.apache.pdfbox:jempbox:1.8.10' compile 'commons-cli:commons-cli:1.3.1'