diff --git a/build.gradle b/build.gradle
index 9fa1c4d9b34b..562102a705a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,18 +122,20 @@ dependencies {
     compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
     compile 'org.fxmisc.richtext:richtextfx:0.7-M5'
 
-
+    // Logging
     compile 'commons-logging:commons-logging:1.2'
+    compile 'org.apache.logging.log4j:log4j-jcl:2.8.2'
+    compile 'org.apache.logging.log4j:log4j-api:2.8.2'
+    compile 'org.apache.logging.log4j:log4j-core:2.8.2'
+    compile 'com.jcabi:jcabi-log:0.17.2'
 
+    // TODO: This should be replaced with Google Guava
     compile 'org.apache.commons:commons-lang3:3.6'
 
     compile 'org.jsoup:jsoup:1.10.3'
     compile 'com.mashape.unirest:unirest-java:1.4.9'
     compile 'info.debatty:java-string-similarity:0.24'
 
-    compile 'org.apache.logging.log4j:log4j-jcl:2.8.2'
-    compile 'org.apache.logging.log4j:log4j-api:2.8.2'
-    compile 'org.apache.logging.log4j:log4j-core:2.8.2'
     compile 'org.xmlunit:xmlunit-core:2.3.0'
     compile 'org.xmlunit:xmlunit-matchers:2.3.0'
 
diff --git a/src/main/java/org/jabref/JabRefException.java b/src/main/java/org/jabref/JabRefException.java
index 42eacc77c72e..9aab1ee1fd15 100644
--- a/src/main/java/org/jabref/JabRefException.java
+++ b/src/main/java/org/jabref/JabRefException.java
@@ -1,11 +1,9 @@
 package org.jabref;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class JabRefException extends Exception {
 
-    private static final Log LOGGER = LogFactory.getLog(JabRefException.class);
     private String localizedMessage;
 
     public JabRefException(String message) {
@@ -33,7 +31,7 @@ public JabRefException(Throwable cause) {
     @Override
     public String getLocalizedMessage() {
         if (localizedMessage == null) {
-            LOGGER.debug("No localized message exception message defined. Falling back to getMessage().");
+            Logger.debug(this, "No localized message exception message defined. Falling back to getMessage().");
             return getMessage();
         } else {
             return localizedMessage;
diff --git a/src/main/java/org/jabref/JabRefExecutorService.java b/src/main/java/org/jabref/JabRefExecutorService.java
index 3c587eaebe57..77d261581111 100644
--- a/src/main/java/org/jabref/JabRefExecutorService.java
+++ b/src/main/java/org/jabref/JabRefExecutorService.java
@@ -9,9 +9,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import com.jcabi.log.Logger;
 
 /**
  * Responsible for managing of all threads (except Swing threads) in JabRef
@@ -19,7 +17,6 @@
 public class JabRefExecutorService implements Executor {
 
     public static final JabRefExecutorService INSTANCE = new JabRefExecutorService();
-    private static final Log LOGGER = LogFactory.getLog(JabRefExecutorService.class);
     private final ExecutorService executorService = Executors.newCachedThreadPool(r -> {
         Thread thread = new Thread(r);
         thread.setName("JabRef CachedThreadPool");
@@ -41,7 +38,7 @@ private JabRefExecutorService() { }
     @Override
     public void execute(Runnable command) {
         if (command == null) {
-            LOGGER.debug("Received null as command for execution");
+            Logger.debug(this, "Received null as command for execution");
             return;
         }
 
@@ -50,7 +47,7 @@ public void execute(Runnable command) {
 
     public void executeAndWait(Runnable command) {
         if (command == null) {
-            LOGGER.debug("Received null as command for execution");
+            Logger.debug(this, "Received null as command for execution");
             return;
         }
 
@@ -62,14 +59,14 @@ public void executeAndWait(Runnable command) {
             } catch (InterruptedException ignored) {
                 // Ignored
             } catch (ExecutionException e) {
-                LOGGER.error("Problem executing command", e);
+                Logger.error(this, "Problem executing command", e);
             }
         }
     }
 
     public boolean executeAndWait(Callable command) {
         if (command == null) {
-            LOGGER.debug("Received null as command for execution");
+            Logger.debug(this, "Received null as command for execution");
             return false;
         }
 
@@ -81,7 +78,7 @@ public boolean executeAndWait(Callable command) {
             } catch (InterruptedException ignored) {
                 // Ignored
             } catch (ExecutionException e) {
-                LOGGER.error("Problem executing command", e);
+                Logger.error(this, "Problem executing command", e);
                 return false;
             }
         }
@@ -97,7 +94,7 @@ public void executeInterruptableTask(final Runnable runnable, String taskName) {
 
     public void executeInterruptableTaskAndWait(Runnable runnable) {
         if (runnable == null) {
-            LOGGER.debug("Received null as command for execution");
+            Logger.debug(this, "Received null as command for execution");
             return;
         }
 
@@ -109,7 +106,7 @@ public void executeInterruptableTaskAndWait(Runnable runnable) {
             } catch (InterruptedException ignored) {
                 // Ignored
             } catch (ExecutionException e) {
-                LOGGER.error("Problem executing command", e);
+                Logger.error(this, "Problem executing command", e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index b5674c29c646..97cf53cb8542 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -35,13 +35,11 @@
 import org.jabref.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.shared.exception.NotASharedDatabaseException;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
 import com.jgoodies.looks.plastic.theme.SkyBluer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class JabRefGUI {
-    private static final Log LOGGER = LogFactory.getLog(JabRefGUI.class);
 
     private static JabRefFrame mainFrame;
 
@@ -96,7 +94,7 @@ private void openWindow() {
 
         GUIGlobals.init();
 
-        LOGGER.debug("Initializing frame");
+        Logger.debug(this, "Initializing frame");
         JabRefGUI.mainFrame = new JabRefFrame();
 
         // Add all bibDatabases databases to the frame:
@@ -120,7 +118,7 @@ private void openWindow() {
                         pr.getDatabaseContext().clearDatabaseFile(); // do not open the original file
                         pr.getDatabase().clearSharedDatabaseID();
 
-                        LOGGER.error("Connection error", e);
+                        Logger.error(this, "Connection error", e);
                         JOptionPane.showMessageDialog(mainFrame,
                                 e.getMessage() + "\n\n" + Localization.lang("A local copy will be opened."),
                                 Localization.lang("Connection error"), JOptionPane.WARNING_MESSAGE);
@@ -182,7 +180,7 @@ private void openWindow() {
             OpenDatabaseAction.performPostOpenActions(panel, pr);
         }
 
-        LOGGER.debug("Finished adding panels");
+        Logger.debug(this, "Finished adding panels");
 
         if (!bibDatabases.isEmpty()) {
             JabRefGUI.getMainFrame().getCurrentBasePanel().getMainTable().requestFocus();
@@ -211,7 +209,7 @@ private void openLastEditedDatabases() {
                     Globals.prefs.getImportFormatPreferences());
 
             if (parsedDatabase.isEmpty()) {
-                LOGGER.error(Localization.lang("Error opening file") + " '" + dbFile.getPath() + "'");
+                Logger.error(this, Localization.lang("Error opening file") + " '" + dbFile.getPath() + "'");
             } else {
                 bibDatabases.add(parsedDatabase);
             }
@@ -238,7 +236,7 @@ private void setLookAndFeel() {
                 if (System.getProperty("java.runtime.name").contains("OpenJDK")) {
                     // Metal L&F
                     lookFeel = UIManager.getCrossPlatformLookAndFeelClassName();
-                    LOGGER.warn(
+                    Logger.warn(this,
                             "There seem to be problems with OpenJDK and the default GTK Look&Feel. Using Metal L&F instead. Change to another L&F with caution.");
                 } else {
                     lookFeel = systemLookFeel;
@@ -269,11 +267,11 @@ private void setLookAndFeel() {
                             Localization
                                     .lang("Unable to find the requested look and feel and thus the default one is used."),
                             Localization.lang("Warning"), JOptionPane.WARNING_MESSAGE);
-                    LOGGER.warn("Unable to find requested look and feel", e);
+                    Logger.warn(this, "Unable to find requested look and feel", e);
                 }
             }
         } catch (Exception e) {
-            LOGGER.warn("Look and feel could not be set", e);
+            Logger.warn(this, "Look and feel could not be set", e);
         }
 
         // In JabRef v2.8, we did it only on NON-Mac. Now, we try on all platforms
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 1d11dcc723f6..2ca3c6985837 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -51,13 +51,11 @@
 import org.jabref.preferences.SearchPreferences;
 import org.jabref.shared.prefs.SharedDatabasePreferences;
 
+import com.jcabi.log.Logger;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class ArgumentProcessor {
 
-    private static final Log LOGGER = LogFactory.getLog(ArgumentProcessor.class);
     private final JabRefCLI cli;
     private final List<ParserResult> parserResults;
     private final Mode startupMode;
@@ -210,13 +208,13 @@ private List<ParserResult> processArguments() {
             }
         }
 
-        LOGGER.debug("Finished export");
+        Logger.debug(this, "Finished export");
 
         if (cli.isPreferencesExport()) {
             try {
                 Globals.prefs.exportPreferences(cli.getPreferencesExport());
             } catch (JabRefException ex) {
-                LOGGER.error("Cannot export preferences", ex);
+                Logger.error(this, "Cannot export preferences", ex);
             }
         }
 
@@ -470,7 +468,7 @@ private void importPreferences() {
             SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(Globals.prefs);
             ExportFormats.initAllExports(customFormats, layoutPreferences, savePreferences);
         } catch (JabRefException ex) {
-            LOGGER.error("Cannot import preferences", ex);
+            Logger.error(this, "Cannot import preferences", ex);
         }
     }
 
@@ -482,7 +480,7 @@ private void resetPreferences(String value) {
                 new SharedDatabasePreferences().clear();
             } catch (BackingStoreException e) {
                 System.err.println(Localization.lang("Unable to clear preferences."));
-                LOGGER.error("Unable to clear preferences", e);
+                Logger.error(this, "Unable to clear preferences", e);
             }
         } else {
             String[] keys = value.split(",");
@@ -500,7 +498,7 @@ private void resetPreferences(String value) {
     private void automaticallySetFileLinks(List<ParserResult> loaded) {
         for (ParserResult parserResult : loaded) {
             BibDatabase database = parserResult.getDatabase();
-            LOGGER.info(Localization.lang("Automatically setting file links"));
+            Logger.info(this, Localization.lang("Automatically setting file links"));
             AutoSetLinks.autoSetLinks(database.getEntries(), parserResult.getDatabaseContext());
         }
     }
@@ -511,7 +509,7 @@ private void regenerateBibtexKeys(List<ParserResult> loaded) {
 
             MetaData metaData = parserResult.getMetaData();
             if (metaData != null) {
-                LOGGER.info(Localization.lang("Regenerating BibTeX keys according to metadata"));
+                Logger.info(this, Localization.lang("Regenerating BibTeX keys according to metadata"));
                 for (BibEntry entry : database.getEntries()) {
                     // try to make a new label
                     BibtexKeyPatternUtil.makeAndSetLabel(
@@ -519,7 +517,7 @@ private void regenerateBibtexKeys(List<ParserResult> loaded) {
                             database, entry, Globals.prefs.getBibtexKeyPatternPreferences());
                 }
             } else {
-                LOGGER.info(Localization.lang("No meta data present in BIB_file. Cannot regenerate BibTeX keys"));
+                Logger.info(this, Localization.lang("No meta data present in BIB_file. Cannot regenerate BibTeX keys"));
             }
         }
     }
diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/src/main/java/org/jabref/cli/JabRefCLI.java
index 0aa5be8d7a0c..7c2b2d789e5d 100644
--- a/src/main/java/org/jabref/cli/JabRefCLI.java
+++ b/src/main/java/org/jabref/cli/JabRefCLI.java
@@ -7,18 +7,16 @@
 import org.jabref.logic.exporter.ExportFormats;
 import org.jabref.logic.l10n.Localization;
 
+import com.jcabi.log.Logger;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class JabRefCLI {
 
-    private static final Log LOGGER = LogFactory.getLog(JabRefCLI.class);
 
     private List<String> leftOver;
     private final CommandLine cl;
@@ -32,7 +30,7 @@ public JabRefCLI(String[] args) {
             this.cl = new DefaultParser().parse(options, args);
             this.leftOver = Arrays.asList(cl.getArgs());
         } catch (ParseException e) {
-            LOGGER.warn("Problem parsing arguments", e);
+            Logger.warn(this, "Problem parsing arguments", e);
 
             this.printUsage();
             throw new RuntimeException();
diff --git a/src/main/java/org/jabref/collab/ChangeScanner.java b/src/main/java/org/jabref/collab/ChangeScanner.java
index c413b583d677..f31c082dde3a 100644
--- a/src/main/java/org/jabref/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/collab/ChangeScanner.java
@@ -39,11 +39,9 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.MetaData;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ChangeScanner implements Runnable {
-    private static final Log LOGGER = LogFactory.getLog(ChangeScanner.class);
 
     private static final String[] SORT_BY = new String[] {FieldName.YEAR, FieldName.AUTHOR, FieldName.TITLE};
 
@@ -115,7 +113,7 @@ public void run() {
             scanGroups(metadataInTemp, metadataOnDisk);
 
         } catch (IOException ex) {
-            LOGGER.warn("Problem running", ex);
+            Logger.warn(this, "Problem running", ex);
         }
     }
 
@@ -155,7 +153,7 @@ private void storeTempDatabase() {
                 SaveSession ss = databaseWriter.saveDatabase(new BibDatabaseContext(databaseInTemp, metadataInTemp, defaults), prefs);
                 ss.commit(Globals.getFileUpdateMonitor().getTempFile(panel.fileMonitorHandle()));
             } catch (SaveException ex) {
-                LOGGER.warn("Problem updating tmp file after accepting external changes", ex);
+                Logger.warn(this, "Problem updating tmp file after accepting external changes", ex);
             }
         });
     }
diff --git a/src/main/java/org/jabref/collab/EntryChange.java b/src/main/java/org/jabref/collab/EntryChange.java
index 7efd5b411265..d3424458c144 100644
--- a/src/main/java/org/jabref/collab/EntryChange.java
+++ b/src/main/java/org/jabref/collab/EntryChange.java
@@ -18,12 +18,10 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class EntryChange extends Change {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryChange.class);
 
     public EntryChange(BibEntry memEntry, BibEntry tmpEntry, BibEntry diskEntry) {
         super();
@@ -42,7 +40,7 @@ public EntryChange(BibEntry memEntry, BibEntry tmpEntry, BibEntry diskEntry) {
         // in the same way. Check for this, too.
         boolean modificationsAgree = (DuplicateCheck.compareEntriesStrictly(memEntry, diskEntry) > 1);
 
-        LOGGER.debug("Modified entry: " + memEntry.getCiteKeyOptional().orElse("<no BibTeX key set>")
+        Logger.debug(this, "Modified entry: " + memEntry.getCiteKeyOptional().orElse("<no BibTeX key set>")
                 + "\n Modified locally: " + isModifiedLocally + " Modifications agree: " + modificationsAgree);
 
         Set<String> allFields = new TreeSet<>();
diff --git a/src/main/java/org/jabref/collab/EntryDeleteChange.java b/src/main/java/org/jabref/collab/EntryDeleteChange.java
index 758363e113f5..d7ffeff1569a 100644
--- a/src/main/java/org/jabref/collab/EntryDeleteChange.java
+++ b/src/main/java/org/jabref/collab/EntryDeleteChange.java
@@ -12,12 +12,10 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class EntryDeleteChange extends Change {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryDeleteChange.class);
     private final BibEntry memEntry;
     private final BibEntry tmpEntry;
 
@@ -36,7 +34,7 @@ public EntryDeleteChange(BibEntry memEntry, BibEntry tmpEntry) {
         // Check if it has been modified locally, since last tempfile was saved.
         boolean isModifiedLocally = (matchWithTmp <= 1);
 
-        LOGGER.debug("Modified entry: " + memEntry.getCiteKeyOptional().orElse("<no BibTeX key set>")
+        Logger.debug(this, "Modified entry: " + memEntry.getCiteKeyOptional().orElse("<no BibTeX key set>")
                 + "\n Modified locally: " + isModifiedLocally);
 
         PreviewPanel pp = new PreviewPanel(null, memEntry, null);
diff --git a/src/main/java/org/jabref/collab/FileUpdateMonitor.java b/src/main/java/org/jabref/collab/FileUpdateMonitor.java
index 9d009f19848e..05dadf721f40 100644
--- a/src/main/java/org/jabref/collab/FileUpdateMonitor.java
+++ b/src/main/java/org/jabref/collab/FileUpdateMonitor.java
@@ -8,8 +8,9 @@
 import java.util.Map;
 
 import org.jabref.logic.util.io.FileUtil;
+import org.jabref.logic.xmp.XMPUtil;
 
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 
 /**
@@ -17,7 +18,6 @@
  * in the file's last modification time stamp. The
  */
 public class FileUpdateMonitor implements Runnable {
-    private static final Log LOGGER = LogFactory.getLog(FileUpdateMonitor.class);
 
     private static final int WAIT = 4000;
     private final Map<String, Entry> entries = new HashMap<>();
@@ -29,7 +29,7 @@ private static synchronized Path getTempFile() {
             temporaryFile = Files.createTempFile("jabref", null);
             temporaryFile.toFile().deleteOnExit();
         } catch (IOException ex) {
-            LOGGER.warn("Could not create temporary file.", ex);
+            LogFactory.getLog(FileUpdateMonitor.class).warn("Could not create temporary file.", ex);
         }
         return temporaryFile;
     }
@@ -52,7 +52,7 @@ public void run() {
             try {
                 Thread.sleep(WAIT);
             } catch (InterruptedException ex) {
-                LOGGER.debug("FileUpdateMonitor has been interrupted. Terminating...", ex);
+                Logger.debug(this, "FileUpdateMonitor has been interrupted. Terminating...", ex);
                 return;
             }
         }
@@ -119,7 +119,7 @@ public void updateTimeStamp(String key) {
             try {
                 entry.updateTimeStamp();
             } catch (IOException e) {
-                LOGGER.error("Couldn't update timestamp", e);
+                Logger.error(this, "Couldn't update timestamp", e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/collab/StringAddChange.java b/src/main/java/org/jabref/collab/StringAddChange.java
index b2829830ca1a..686d780c5743 100644
--- a/src/main/java/org/jabref/collab/StringAddChange.java
+++ b/src/main/java/org/jabref/collab/StringAddChange.java
@@ -11,12 +11,10 @@
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibtexString;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class StringAddChange extends Change {
 
-    private static final Log LOGGER = LogFactory.getLog(StringAddChange.class);
 
     private final BibtexString string;
     private final InfoPane tp = new InfoPane();
@@ -37,7 +35,7 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
 
         if (panel.getDatabase().hasStringLabel(string.getName())) {
             // The name to change to is already in the database, so we can't comply.
-            LOGGER.info("Cannot add string '" + string.getName() + "' because the name "
+            Logger.info(this, "Cannot add string '" + string.getName() + "' because the name "
                     + "is already in use.");
         }
 
@@ -45,12 +43,12 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
             panel.getDatabase().addString(string);
             undoEdit.addEdit(new UndoableInsertString(panel, panel.getDatabase(), string));
         } catch (KeyCollisionException ex) {
-            LOGGER.info("Error: could not add string '" + string.getName() + "': " + ex.getMessage(), ex);
+            Logger.info(this, "Error: could not add string '" + string.getName() + "': " + ex.getMessage(), ex);
         }
         try {
             secondary.addString(new BibtexString(string.getName(), string.getContent()));
         } catch (KeyCollisionException ex) {
-            LOGGER.info("Error: could not add string '" + string.getName() + "' to tmp database: " + ex.getMessage(), ex);
+            Logger.info(this, "Error: could not add string '" + string.getName() + "' to tmp database: " + ex.getMessage(), ex);
         }
         return true;
     }
diff --git a/src/main/java/org/jabref/collab/StringChange.java b/src/main/java/org/jabref/collab/StringChange.java
index c93847d716f9..bf120cae8533 100644
--- a/src/main/java/org/jabref/collab/StringChange.java
+++ b/src/main/java/org/jabref/collab/StringChange.java
@@ -12,12 +12,10 @@
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibtexString;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class StringChange extends Change {
 
-    private static final Log LOGGER = LogFactory.getLog(StringChange.class);
     private final BibtexString string;
     private final String mem;
     private final String disk;
@@ -63,7 +61,7 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
                 panel.getDatabase().addString(bs);
                 undoEdit.addEdit(new UndoableInsertString(panel, panel.getDatabase(), bs));
             } catch (KeyCollisionException ex) {
-                LOGGER.info("Error: could not add string '" + bs.getName() + "': " + ex.getMessage(), ex);
+                Logger.info(this, "Error: could not add string '" + bs.getName() + "': " + ex.getMessage(), ex);
             }
         } else {
             string.setContent(disk);
diff --git a/src/main/java/org/jabref/collab/StringNameChange.java b/src/main/java/org/jabref/collab/StringNameChange.java
index b53e7e630989..18b15f292c79 100644
--- a/src/main/java/org/jabref/collab/StringNameChange.java
+++ b/src/main/java/org/jabref/collab/StringNameChange.java
@@ -12,12 +12,10 @@
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibtexString;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class StringNameChange extends Change {
 
-    private static final Log LOGGER = LogFactory.getLog(StringNameChange.class);
     private final BibtexString string;
     private final String mem;
     private final String disk;
@@ -42,7 +40,7 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
 
         if (panel.getDatabase().hasStringLabel(disk)) {
             // The name to change to is already in the database, so we can't comply.
-            LOGGER.info("Cannot rename string '" + mem + "' to '" + disk + "' because the name "
+            Logger.info(this, "Cannot rename string '" + mem + "' to '" + disk + "' because the name "
                     + "is already in use.");
         }
 
@@ -53,7 +51,7 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
                 panel.getDatabase().addString(bs);
                 undoEdit.addEdit(new UndoableInsertString(panel, panel.getDatabase(), bs));
             } catch (KeyCollisionException ex) {
-                LOGGER.info("Error: could not add string '" + bs.getName() + "': " + ex.getMessage(), ex);
+                Logger.info(this, "Error: could not add string '" + bs.getName() + "': " + ex.getMessage(), ex);
             }
         } else {
             string.setName(disk);
diff --git a/src/main/java/org/jabref/collab/StringRemoveChange.java b/src/main/java/org/jabref/collab/StringRemoveChange.java
index 455704722eac..edb235ffe91f 100644
--- a/src/main/java/org/jabref/collab/StringRemoveChange.java
+++ b/src/main/java/org/jabref/collab/StringRemoveChange.java
@@ -10,11 +10,9 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibtexString;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class StringRemoveChange extends Change {
-    private static final Log LOGGER = LogFactory.getLog(StringRemoveChange.class);
     private final BibtexString string;
 
     private final BibtexString inMem;
@@ -42,7 +40,7 @@ public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound
             panel.getDatabase().removeString(inMem.getId());
             undoEdit.addEdit(new UndoableRemoveString(panel, panel.getDatabase(), string));
         } catch (Exception ex) {
-            LOGGER.info("Error: could not add string '" + string.getName() + "': " + ex.getMessage(), ex);
+            Logger.info(this, "Error: could not add string '" + string.getName() + "': " + ex.getMessage(), ex);
         }
 
         // Update tmp database:
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index fa37f93badf1..4fabffefe483 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -142,14 +142,12 @@
 import org.jabref.shared.DBMSSynchronizer;
 
 import com.google.common.eventbus.Subscribe;
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListener {
 
-    private static final Log LOGGER = LogFactory.getLog(BasePanel.class);
 
     // Divider size for BaseFrame split pane. 0 means non-resizable.
     private static final int SPLIT_PANE_DIVIDER_SIZE = 4;
@@ -230,7 +228,7 @@ public BasePanel(JabRefFrame frame, BibDatabaseContext bibDatabaseContext) {
             try {
                 fileMonitorHandle = Globals.getFileUpdateMonitor().addUpdateListener(this, file.get());
             } catch (IOException ex) {
-                LOGGER.warn("Could not register FileUpdateMonitor", ex);
+                Logger.warn(this, "Could not register FileUpdateMonitor", ex);
             }
         } else {
             if (bibDatabaseContext.getDatabase().hasEntries()) {
@@ -541,7 +539,7 @@ public void update() {
                 try {
                     JabRefDesktop.openFolderAndSelectFile(f.toAbsolutePath());
                 } catch (IOException e) {
-                    LOGGER.info("Could not open folder", e);
+                    Logger.info(this, "Could not open folder", e);
                 }
             }
         }));
@@ -635,7 +633,7 @@ public void update() {
                 }
                 output(outputStr);
             } catch (Throwable ex) {
-                LOGGER.warn("Could not unmark", ex);
+                Logger.warn(this, "Could not unmark", ex);
             }
         });
 
@@ -946,7 +944,7 @@ private void copyKeyAndTitle() {
                         Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader))
                         .getLayoutFromText();
             } catch (IOException e) {
-                LOGGER.info("Could not get layout", e);
+                Logger.info(this, "Could not get layout", e);
                 return;
             }
 
@@ -1015,7 +1013,7 @@ private void openExternalFile() {
      */
     public void runCommand(final String _command) {
         if (!actions.containsKey(_command)) {
-            LOGGER.info("No action defined for '" + _command + '\'');
+            Logger.info(this, "No action defined for '" + _command + '\'');
             return;
         }
 
@@ -1031,7 +1029,7 @@ public void runCommand(final String _command) {
             // The call to unblock will simply hide the glasspane, so there is no harm in calling
             // it even if the frame hasn't been blocked.
             frame.unblock();
-            LOGGER.error("runCommand error: " + ex.getMessage(), ex);
+            Logger.error(this, "runCommand error: " + ex.getMessage(), ex);
         }
     }
 
@@ -1066,7 +1064,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset enc,
                 highlightEntry(ex.getEntry());
                 showEntry(ex.getEntry());
             } else {
-                LOGGER.warn("Could not save", ex);
+                Logger.warn(this, "Could not save", ex);
             }
 
             JOptionPane.showMessageDialog(frame, Localization.lang("Could not save file.") + "\n" + ex.getMessage(),
@@ -1176,7 +1174,7 @@ public BibEntry newEntry(EntryType type) {
 
                 return be;
             } catch (KeyCollisionException ex) {
-                LOGGER.info(ex.getMessage(), ex);
+                Logger.info(this, ex.getMessage(), ex);
             }
         }
         return null;
@@ -1205,7 +1203,7 @@ public void insertEntry(final BibEntry bibEntry) {
                 }
                 highlightEntry(bibEntry);
             } catch (KeyCollisionException ex) {
-                LOGGER.info("Collision for bibtex key" + bibEntry.getId(), ex);
+                Logger.info(this, "Collision for bibtex key" + bibEntry.getId(), ex);
             }
         }
     }
@@ -1264,7 +1262,7 @@ public void actionPerformed(ActionEvent e) {
                         entryEditorClosing(getCurrentEditor());
                         break;
                     default:
-                        LOGGER.warn("unknown BasePanelMode: '" + mode + "', doing nothing");
+                        Logger.warn(this, "unknown BasePanelMode: '" + mode + "', doing nothing");
                         break;
                 }
             }
@@ -1277,7 +1275,7 @@ public void actionPerformed(ActionEvent e) {
                 try {
                     runCommand(Actions.CUT);
                 } catch (Throwable ex) {
-                    LOGGER.warn("Could not cut", ex);
+                    Logger.warn(this, "Could not cut", ex);
                 }
             }
         });
@@ -1288,7 +1286,7 @@ public void actionPerformed(ActionEvent e) {
                 try {
                     runCommand(Actions.COPY);
                 } catch (Throwable ex) {
-                    LOGGER.warn("Could not copy", ex);
+                    Logger.warn(this, "Could not copy", ex);
                 }
             }
         });
@@ -1299,7 +1297,7 @@ public void actionPerformed(ActionEvent e) {
                 try {
                     runCommand(Actions.PASTE);
                 } catch (Throwable ex) {
-                    LOGGER.warn("Could not paste", ex);
+                    Logger.warn(this, "Could not paste", ex);
                 }
             }
         });
@@ -1328,7 +1326,7 @@ public void keyPressed(KeyEvent e) {
                     try {
                         runCommand(Actions.EDIT);
                     } catch (Throwable ex) {
-                        LOGGER.warn("Could not run action based on key press", ex);
+                        Logger.warn(this, "Could not run action based on key press", ex);
                     }
                 }
             }
@@ -1613,7 +1611,7 @@ public void markBaseChanged() {
             try {
                 SwingUtilities.invokeAndWait(() -> markBasedChangedInternal());
             } catch (InvocationTargetException | InterruptedException e) {
-                LOGGER.info("Problem marking database as changed", e);
+                Logger.info(this, "Problem marking database as changed", e);
             }
         }
     }
@@ -1670,7 +1668,7 @@ public void changeTypeOfSelectedEntries(String newType) {
 
     private void changeType(List<BibEntry> entries, String newType) {
         if ((entries == null) || (entries.isEmpty())) {
-            LOGGER.error("At least one entry must be selected to be able to change the type.");
+            Logger.error(this, "At least one entry must be selected to be able to change the type.");
             return;
         }
 
@@ -1808,7 +1806,7 @@ public void fileUpdated() {
         if ((getBibDatabaseContext().getDatabaseFile().isPresent())
                 && !FileBasedLock.waitForFileLock(getBibDatabaseContext().getDatabaseFile().get().toPath())) {
             // The file is locked even after the maximum wait. Do nothing.
-            LOGGER.error("File updated externally, but change scan failed because the file is locked.");
+            Logger.error(this, "File updated externally, but change scan failed because the file is locked.");
             // Perturb the stored timestamp so successive checks are made:
             Globals.getFileUpdateMonitor().perturbTimestamp(getFileMonitorHandle());
             return;
@@ -1842,7 +1840,7 @@ public void fileUpdated() {
 
     @Override
     public void fileRemoved() {
-        LOGGER.info("File '" + getBibDatabaseContext().getDatabaseFile().get().getPath() + "' has been deleted.");
+        Logger.info(this, "File '" + getBibDatabaseContext().getDatabaseFile().get().getPath() + "' has been deleted.");
     }
 
     /**
@@ -2151,7 +2149,7 @@ public void action() {
                 markBaseChanged();
                 frame.output(Localization.lang("Undo"));
             } catch (CannotUndoException ex) {
-                LOGGER.warn("Nothing to undo", ex);
+                Logger.warn(this, "Nothing to undo", ex);
                 frame.output(Localization.lang("Nothing to undo") + '.');
             }
 
@@ -2202,7 +2200,7 @@ public void action() {
                             output(Localization.lang("External viewer called") + '.');
                         } catch (IOException e) {
                             output(Localization.lang("Could not open link"));
-                            LOGGER.info("Could not open link", e);
+                            Logger.info(this, "Could not open link", e);
                         }
                     }
                 }
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index e202f51a7fa3..13cdff2623d1 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -21,11 +21,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.DOI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ClipBoardManager implements ClipboardOwner {
-    private static final Log LOGGER = LogFactory.getLog(ClipBoardManager.class);
 
     private static final Clipboard CLIPBOARD = Toolkit.getDefaultToolkit().getSystemClipboard();
 
@@ -59,7 +57,7 @@ public String getClipboardContents() {
                 result = (String) contents.getTransferData(DataFlavor.stringFlavor);
             } catch (UnsupportedFlavorException | IOException e) {
                 //highly unlikely since we are using a standard DataFlavor
-                LOGGER.info("problem with getting clipboard contents", e);
+                Logger.info(this, "problem with getting clipboard contents", e);
             }
         }
         return result;
@@ -86,33 +84,33 @@ public List<BibEntry> extractBibEntriesFromClipboard() {
                 List<BibEntry> contents = (List<BibEntry>) content.getTransferData(TransferableBibtexEntry.ENTRY_FLAVOR);
                 result = contents;
             } catch (UnsupportedFlavorException | ClassCastException ex) {
-                LOGGER.warn("Could not paste this type", ex);
+                Logger.warn(this, "Could not paste this type", ex);
             } catch (IOException ex) {
-                LOGGER.warn("Could not paste", ex);
+                Logger.warn(this, "Could not paste", ex);
             }
         } else if (content.isDataFlavorSupported(DataFlavor.stringFlavor)) {
             try {
                 String data = (String) content.getTransferData(DataFlavor.stringFlavor);
                 // fetch from doi
                 if (DOI.parse(data).isPresent()) {
-                    LOGGER.info("Found DOI in clipboard");
+                    Logger.info(this, "Found DOI in clipboard");
                     Optional<BibEntry> entry = new DoiFetcher(Globals.prefs.getImportFormatPreferences()).performSearchById(new DOI(data).getDOI());
                     entry.ifPresent(result::add);
                 } else {
                     // parse bibtex string
                     BibtexParser bp = new BibtexParser(Globals.prefs.getImportFormatPreferences());
                     BibDatabase db = bp.parse(new StringReader(data)).getDatabase();
-                    LOGGER.info("Parsed " + db.getEntryCount() + " entries from clipboard text");
+                    Logger.info(this, "Parsed " + db.getEntryCount() + " entries from clipboard text");
                     if (db.hasEntries()) {
                         result = db.getEntries();
                     }
                 }
             } catch (UnsupportedFlavorException ex) {
-                LOGGER.warn("Could not parse this type", ex);
+                Logger.warn(this, "Could not parse this type", ex);
             } catch (IOException ex) {
-                LOGGER.warn("Data is no longer available in the requested flavor", ex);
+                Logger.warn(this, "Data is no longer available in the requested flavor", ex);
             } catch (FetcherException ex) {
-                LOGGER.error("Error while fetching", ex);
+                Logger.error(this, "Error while fetching", ex);
             }
 
         }
diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index 93845ce5dcae..83bf484e9917 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -10,12 +10,11 @@
 
 import com.airhacks.afterburner.injection.Injector;
 import com.airhacks.afterburner.injection.PresenterFactory;
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 
 public class DefaultInjector implements PresenterFactory {
 
-    private static final Log LOGGER = LogFactory.getLog(DefaultInjector.class);
 
     /**
      * This method takes care of creating dependencies.
@@ -39,7 +38,7 @@ private static Object createDependency(Class<?> clazz) {
             try {
                 return clazz.newInstance();
             } catch (InstantiationException | IllegalAccessException ex) {
-                LOGGER.error("Cannot instantiate dependency: " + clazz, ex);
+                LogFactory.getLog(DefaultInjector.class).error("Cannot instantiate dependency: " + clazz, ex);
                 return null;
             }
         }
@@ -47,7 +46,7 @@ private static Object createDependency(Class<?> clazz) {
 
     @Override
     public <T> T instantiatePresenter(Class<T> clazz, Function<String, Object> injectionContext) {
-        LOGGER.debug("Instantiate " + clazz.getName());
+        Logger.debug(this, "Instantiate " + clazz.getName());
 
         // Use our own method to construct dependencies
         Injector.setInstanceSupplier(DefaultInjector::createDependency);
diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java
index 27c0e5f1d55b..dd16bf294193 100644
--- a/src/main/java/org/jabref/gui/EntryTypeDialog.java
+++ b/src/main/java/org/jabref/gui/EntryTypeDialog.java
@@ -41,9 +41,8 @@
 import org.jabref.model.entry.EntryType;
 import org.jabref.model.entry.IEEETranEntryTypes;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.jdesktop.swingx.VerticalLayout;
 
 /**
@@ -52,7 +51,6 @@
  */
 public class EntryTypeDialog extends JabRefDialog implements ActionListener {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryTypeDialog.class);
     private static final int COLUMN = 3;
     private final JabRefFrame frame;
     private final CancelAction cancelAction = new CancelAction();
@@ -291,7 +289,7 @@ protected Optional<BibEntry> doInBackground() throws Exception {
                 try {
                     bibEntry = fetcher.performSearchById(searchID);
                 } catch (FetcherException e) {
-                    LOGGER.error(e.getMessage(), e);
+                    Logger.error(this, e.getMessage(), e);
                     fetcherException = true;
                     fetcherExceptionMessage = e.getMessage();
                 }
@@ -327,7 +325,7 @@ protected void done() {
                     generateButton.setEnabled(true);
                 });
             } catch (ExecutionException | InterruptedException e) {
-                LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchID, fetcher.getName()), e);
+                Logger.error(this, String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchID, fetcher.getName()), e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java b/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
index 678fa5209426..3359396df246 100644
--- a/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
+++ b/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
@@ -82,9 +82,8 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * GUI Dialog for the feature "Find unlinked files".
@@ -99,7 +98,6 @@ public class FindUnlinkedFilesDialog extends JabRefDialog {
     public static final String ACTION_SHORT_DESCRIPTION = Localization
             .lang("Searches for unlinked PDF files on the file system");
 
-    private static final Log LOGGER = LogFactory.getLog(FindUnlinkedFilesDialog.class);
     private static final String GLOBAL_PREFS_WORKING_DIRECTORY_KEY = "findUnlinkedFilesWD";
 
     private static final String GLOBAL_PREFS_DIALOG_SIZE_KEY = "findUnlinkedFilesDialogSize";
@@ -212,7 +210,7 @@ private void restoreSizeOfDialog() {
                 String[] dim = store.split(";");
                 dimension = new Dimension(Integer.valueOf(dim[0]), Integer.valueOf(dim[1]));
             } catch (NumberFormatException ignoredEx) {
-                LOGGER.debug("RestoreSizeDialog Exception ", ignoredEx);
+                Logger.debug(this, "RestoreSizeDialog Exception ", ignoredEx);
             }
         }
         if (dimension != null) {
@@ -938,7 +936,7 @@ public void mousePressed(MouseEvent e) {
                                         JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext(),
                                         fnw.file.getAbsolutePath(), FieldName.PDF);
                             } catch (IOException e1) {
-                                LOGGER.info("Error opening file", e1);
+                                Logger.info(this, "Error opening file", e1);
                             }
                         }
                     } else {
diff --git a/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java b/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java
index 147df8f34f0e..049620cf98bb 100644
--- a/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java
+++ b/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java
@@ -11,15 +11,12 @@
 import javax.swing.text.Highlighter;
 import javax.swing.text.LayeredHighlighter.LayerPainter;
 
-import org.jabref.gui.fieldeditors.JTextAreaWithHighlighting;
 import org.jabref.logic.search.SearchQueryHighlightListener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class JEditorPaneWithHighlighting extends JEditorPane implements SearchQueryHighlightListener {
 
-    private static final Log LOGGER = LogFactory.getLog(JTextAreaWithHighlighting.class);
 
     public void highlightPattern(Optional<Pattern> highlightPattern) {
         Highlighter highlighter = getHighlighter();
@@ -38,7 +35,7 @@ public void highlightPattern(Optional<Pattern> highlightPattern) {
                 highlighter.addHighlight(matcher.start(), matcher.end(), painter);
             } catch (BadLocationException ble) {
                 // should not occur if matcher works right
-                LOGGER.warn("Highlighting not possible, bad location", ble);
+                Logger.warn(this, "Highlighting not possible, bad location", ble);
             }
         }
     }
@@ -49,7 +46,7 @@ private String getDocumentText() {
         try {
             text = doc.getText(0, doc.getLength());
         } catch (Exception e) {
-            LOGGER.error("Error while getting document text");
+            Logger.error(this, "Error while getting document text");
             text = "";
         }
         return text;
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 1b25660beb28..cadacb309736 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -143,17 +143,15 @@
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.eventbus.Subscribe;
+import com.jcabi.log.Logger;
 import com.jgoodies.looks.HeaderStyle;
 import com.jgoodies.looks.Options;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import osx.macadapter.MacAdapter;
 
 /**
  * The main window of the application.
  */
 public class JabRefFrame extends JFrame implements OutputPrinter {
-    private static final Log LOGGER = LogFactory.getLog(JabRefFrame.class);
 
     // Frame titles.
     private static final String FRAME_TITLE = "JabRef";
@@ -651,7 +649,7 @@ public void windowClosing(WindowEvent e) {
             try {
                 new MacAdapter().registerMacEvents(this);
             } catch (Exception e) {
-                LOGGER.fatal("Could not interface with Mac OS X methods.", e);
+                Logger.error(this, "Could not interface with Mac OS X methods.", e);
             }
         }
 
@@ -1517,7 +1515,7 @@ private List<String> collectDatabaseFilePaths() {
                     dbPaths.add("");
                 }
             } catch (IOException ex) {
-                LOGGER.error("Invalid database file path: " + ex.getMessage());
+                Logger.error(this, "Invalid database file path: " + ex.getMessage());
             }
         }
         return dbPaths;
@@ -1685,7 +1683,7 @@ private void changeBlocking(boolean blocked) {
             try {
                 SwingUtilities.invokeAndWait(() -> getGlassPane().setVisible(blocked));
             } catch (InvocationTargetException | InterruptedException e) {
-                LOGGER.error("Problem " + (blocked ? "" : "un") + "blocking UI", e);
+                Logger.error(this, "Problem " + (blocked ? "" : "un") + "blocking UI", e);
             }
         }
     }
@@ -2042,10 +2040,10 @@ public void actionPerformed(ActionEvent e) {
                 try {
                     ((BasePanel) tabbedPane.getSelectedComponent()).runCommand(command);
                 } catch (Throwable ex) {
-                    LOGGER.error("Problem with executing command: " + command, ex);
+                    Logger.error(this, "Problem with executing command: " + command, ex);
                 }
             } else {
-                LOGGER.info("Action '" + command + "' must be disabled when no database is open.");
+                Logger.info(this, "Action '" + command + "' must be disabled when no database is open.");
             }
         }
     }
@@ -2127,7 +2125,7 @@ public EditAction(String command, String menuTitle, String description, KeyStrok
 
         @Override public void actionPerformed(ActionEvent e) {
 
-            LOGGER.debug(Globals.getFocusListener().getFocused().toString());
+            Logger.debug(this, Globals.getFocusListener().getFocused().toString());
             JComponent source = Globals.getFocusListener().getFocused();
             Action action = source.getActionMap().get(command);
             if (action != null) {
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index 848c410e1d3c..b925d8ece3de 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -45,15 +45,13 @@
 import org.jabref.preferences.PreviewPreferences;
 
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Displays an BibEntry using the given layout format.
  */
 public class PreviewPanel extends JPanel implements SearchQueryHighlightListener, EntryContainer {
 
-    private static final Log LOGGER = LogFactory.getLog(PreviewPanel.class);
 
     /**
      * The bibtex entry currently shown
@@ -174,7 +172,7 @@ public Dimension getPreferredScrollableViewportSize() {
                     String address = hyperlinkEvent.getURL().toString();
                     JabRefDesktop.openExternalViewer(PreviewPanel.this.databaseContext.get(), address, FieldName.URL);
                 } catch (IOException e) {
-                    LOGGER.warn("Could not open external viewer", e);
+                    Logger.warn(this, "Could not open external viewer", e);
                 }
             }
         });
@@ -195,7 +193,7 @@ public void setBasePanel(BasePanel basePanel) {
 
     public void updateLayout() {
         if (fixedLayout) {
-            LOGGER.debug("cannot change the layout because the layout is fixed");
+            Logger.debug(this, "cannot change the layout because the layout is fixed");
             return;
         }
 
@@ -229,7 +227,7 @@ private void updatePreviewLayout(String layoutFile) {
                             .getLayoutFromText());
         } catch (IOException e) {
             layout = Optional.empty();
-            LOGGER.debug("no layout could be set", e);
+            Logger.debug(this, "no layout could be set", e);
         }
     }
 
@@ -329,7 +327,7 @@ public PreviewPanel setFixedLayout(Object parameter) {
                 basePanel.get().getCitationStyleCache().setCitationStyle((CitationStyle) parameter);
             }
         } else {
-            LOGGER.error("unknown style type");
+            Logger.error(this, "unknown style type");
         }
         update();
         return this;
@@ -357,7 +355,7 @@ public void actionPerformed(ActionEvent arg0) {
                     JOptionPane.showMessageDialog(PreviewPanel.this,
                             Localization.lang("Could not print preview") + ".\n" + e.getMessage(),
                             Localization.lang("Print entry preview"), JOptionPane.ERROR_MESSAGE);
-                    LOGGER.info("Could not print preview", e);
+                    Logger.info(this, "Could not print preview", e);
                 }
             });
         }
diff --git a/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java b/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java
index 9e1fb4f11269..e7cb6d284107 100644
--- a/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java
+++ b/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java
@@ -9,12 +9,10 @@
 import org.jabref.gui.worker.LookupIdentifiersWorker;
 import org.jabref.logic.importer.IdFetcher;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class LookupIdentifierAction extends MnemonicAwareAction {
 
-    private static final Log LOGGER = LogFactory.getLog(LookupIdentifierAction.class);
 
     private final JabRefFrame frame;
     private final IdFetcher fetcher;
@@ -32,7 +30,7 @@ public void actionPerformed(ActionEvent actionEvent) {
         try {
             BasePanel.runWorker(new LookupIdentifiersWorker(frame, fetcher));
         } catch (Exception e) {
-            LOGGER.error(e);
+            Logger.error(this, "worker error", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/actions/NewEntryAction.java b/src/main/java/org/jabref/gui/actions/NewEntryAction.java
index 63e009fa6659..10948240f2ef 100644
--- a/src/main/java/org/jabref/gui/actions/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/actions/NewEntryAction.java
@@ -13,11 +13,9 @@
 import org.jabref.model.entry.EntryType;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class NewEntryAction extends MnemonicAwareAction {
-    private static final Log LOGGER = LogFactory.getLog(NewEntryAction.class);
 
     private final JabRefFrame jabRefFrame;
     private String type; // The type of item to create.
@@ -65,7 +63,7 @@ public void actionPerformed(ActionEvent e) {
                     EntryTypes.getType(thisType, jabRefFrame.getCurrentBasePanel().getBibDatabaseContext().getMode())
                             .get());
         } else {
-            LOGGER.info("Action 'New entry' must be disabled when no database is open.");
+            Logger.info(this, "Action 'New entry' must be disabled when no database is open.");
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java
index 52efccbb5f05..806f77cf2e51 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java
@@ -5,8 +5,7 @@
 import org.jabref.model.database.event.AutosaveEvent;
 
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This class has an abstract UI role as it listens for an {@link AutosaveEvent}
@@ -14,7 +13,6 @@
  */
 public class AutosaveUIManager {
 
-    private static final Log LOGGER = LogFactory.getLog(AutosaveUIManager.class);
     private final BasePanel panel;
 
 
@@ -27,7 +25,7 @@ public void listen(@SuppressWarnings("unused") AutosaveEvent event) {
         try {
             new SaveDatabaseAction(panel).runCommand();
         } catch (Throwable e) {
-            LOGGER.error("Problem occured while saving.", e);
+            Logger.error(this, "Problem occured while saving.", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
index 2fb061ee6e96..5d6d0d92e8ab 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
@@ -40,15 +40,13 @@
 import org.jabref.model.metadata.ContentSelectors;
 import org.jabref.model.metadata.MetaData;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class ContentSelectorDialog extends JabRefDialog {
 
     private static final String WORD_FIRSTLINE_TEXT = Localization.lang("<select word>");
     private static final String FIELD_FIRST_LINE = Localization.lang("<field name>");
-    private static final Log LOGGER = LogFactory.getLog(ContentSelectorDialog.class);
     private final GridBagLayout gbl = new GridBagLayout();
     private final GridBagConstraints con = new GridBagConstraints();
     private final JPanel fieldPan = new JPanel();
@@ -196,7 +194,7 @@ private void setupActions() {
                 applyChanges();
                 dispose();
             } catch (Exception ex) {
-                LOGGER.info("Could not apply changes in \"Manage content selectors\"", ex);
+                Logger.info(this, "Could not apply changes in \"Manage content selectors\"", ex);
                 JOptionPane.showMessageDialog(frame, Localization.lang("Could not apply changes."));
             }
         });
@@ -209,7 +207,7 @@ private void setupActions() {
             try {
                 applyChanges();
             } catch (Exception ex) {
-                LOGGER.info("Could not apply changes in \"Manage content selectors\"", ex);
+                Logger.info(this, "Could not apply changes in \"Manage content selectors\"", ex);
                 JOptionPane.showMessageDialog(frame, Localization.lang("Could not apply changes."));
             }
         });
diff --git a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
index b4b993262512..9109a67522a1 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -6,11 +6,9 @@
 import java.nio.file.Path;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class DefaultDesktop implements NativeDesktop {
-    private static final Log LOGGER = LogFactory.getLog(NativeDesktop.class);
 
     @Override
     public void openFile(String filePath, String fileType) throws IOException {
@@ -30,7 +28,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
 
     @Override
     public void openConsole(String absolutePath) throws IOException {
-        LOGGER.error("This feature is not supported by your Operating System.");
+        Logger.error(this, "This feature is not supported by your Operating System.");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index fdccb95a3af8..3bf3562f7650 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -78,8 +78,7 @@
 import org.jabref.model.entry.EntryType;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.fxmisc.easybind.EasyBind;
 
 /**
@@ -94,7 +93,6 @@
  */
 public class EntryEditor extends JPanel implements EntryContainer {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryEditor.class);
 
     /**
      * A reference to the entry this object works on.
@@ -731,7 +729,7 @@ public void actionPerformed(ActionEvent event) {
                         if (!SwingUtilities.isEventDispatchThread()) {
                             JOptionPane.showMessageDialog(frame, Localization.lang("Error") + ": " + ex.getMessage(),
                                     Localization.lang("Error setting field"), JOptionPane.ERROR_MESSAGE);
-                            LOGGER.debug("Error setting field", ex);
+                            Logger.debug(this, "Error setting field", ex);
                             requestFocus();
                         }
                     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index c4e5b47cf5d5..a1db42149ccf 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -27,15 +27,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.InternalBibtexFields;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.CodeArea;
 
 public class SourceTab extends EntryEditorTab {
 
-    private static final Log LOGGER = LogFactory.getLog(SourceTab.class);
     private final BibDatabaseMode mode;
     private final BibEntry entry;
     private CodeArea codeArea;
@@ -74,7 +72,7 @@ private Node createSourceEditor(BibEntry entry, BibDatabaseMode mode) {
             codeArea.appendText(ex.getMessage() + "\n\n" +
                     Localization.lang("Correct the entry, and reopen editor to display/edit source."));
             codeArea.setEditable(false);
-            LOGGER.debug("Incorrect entry", ex);
+            Logger.debug(this, "Incorrect entry", ex);
         }
 
         return new VirtualizedScrollPane<>(codeArea);
@@ -180,7 +178,7 @@ private void storeSource() {
             // error message, and the choice to keep or revert the contents
             // of the source text field.
 
-            LOGGER.debug("Incorrect source", ex);
+            Logger.debug(this, "Incorrect source", ex);
             DialogService dialogService = new FXDialogService();
             boolean keepEditing = dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Problem with parsing entry"),
@@ -194,7 +192,7 @@ private void storeSource() {
                 try {
                     codeArea.replaceText(0, codeArea.getText().length(), getSourceString(entry, mode));
                 } catch (IOException e) {
-                    LOGGER.debug("Incorrect source", e);
+                    Logger.debug(this, "Incorrect source", e);
                 }
             }
         }
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
index 2cc348f9e760..44d2b102a8ef 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
@@ -22,14 +22,12 @@
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.OS;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.core.LogEvent;
 import org.fxmisc.easybind.EasyBind;
 
 public class ErrorConsoleViewModel extends AbstractViewModel {
-    private static final Log LOGGER = LogFactory.getLog(ErrorConsoleViewModel.class);
 
     private final DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
     private final Date date = new Date();
@@ -118,7 +116,7 @@ public void reportIssue() {
                     .setParameter("body", issueBody);
             JabRefDesktop.openBrowser(uriBuilder.build().toString());
         } catch (IOException | URISyntaxException e) {
-            LOGGER.error(e);
+            Logger.error(this, "URI issue", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
index e0b367f4606c..158bafe46614 100644
--- a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
+++ b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
@@ -31,16 +31,14 @@
 import org.jabref.logic.util.FileExtensions;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Dialog for creating or modifying custom exports.
  */
 class CustomExportDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(CustomExportDialog.class);
 
     private final JTextField name = new JTextField(60);
     private final JTextField layoutFile = new JTextField(60);
@@ -71,7 +69,7 @@ public CustomExportDialog(final JabRefFrame parent) {
             if (layoutFile.getText().isEmpty() || name.getText().isEmpty() || extension.getText().isEmpty()
                     || !layoutFile.getText().endsWith(".layout")) {
 
-                LOGGER.info("One field is empty!"); //TODO: Better error message
+                Logger.info(this, "One field is empty!"); //TODO: Better error message
                 return;
             }
 
diff --git a/src/main/java/org/jabref/gui/exporter/ExportAction.java b/src/main/java/org/jabref/gui/exporter/ExportAction.java
index 306aff7d6773..6f0d849ce207 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportAction.java
@@ -26,12 +26,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ExportAction {
 
-    private static final Log LOGGER = LogFactory.getLog(ExportAction.class);
 
     private ExportAction() {
     }
@@ -130,7 +128,7 @@ public void run() {
                                                 .orElse(Globals.prefs.getDefaultEncoding()),
                                         finEntries);
                             } catch (Exception ex) {
-                                LOGGER.warn("Problem exporting", ex);
+                                Logger.warn(this, "Problem exporting", ex);
                                 if (ex.getMessage() == null) {
                                     errorMessage = ex.toString();
                                 } else {
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index aecdddb5e0fc..fa4f0523019b 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -25,12 +25,10 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ExportToClipboardAction extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(ExportToClipboardAction.class);
 
     private final JabRefFrame frame;
 
@@ -117,12 +115,12 @@ public void run() {
             message = Localization.lang("Entries exported to clipboard") + ": " + entries.size();
 
         } catch (Exception e) {
-            LOGGER.error("Error exporting to clipboard", e); //To change body of catch statement use File | Settings | File Templates.
+            Logger.error(this, "Error exporting to clipboard", e); //To change body of catch statement use File | Settings | File Templates.
             message = Localization.lang("Error exporting to clipboard");
         } finally {
             // Clean up:
             if ((tmp != null) && !tmp.delete()) {
-                LOGGER.info("Cannot delete temporary clipboard file");
+                Logger.info(this, "Cannot delete temporary clipboard file");
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index f12e63492a30..c0d7e393ae33 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -42,10 +42,9 @@
 import org.jabref.shared.DBMSConnectionProperties;
 import org.jabref.shared.prefs.SharedDatabasePreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Action for the "Save" and "Save as" operations called from BasePanel. This class is also used for
@@ -56,7 +55,6 @@
  */
 public class SaveDatabaseAction extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(SaveDatabaseAction.class);
 
     private final BasePanel panel;
     private final JabRefFrame frame;
@@ -169,7 +167,7 @@ public void run() {
                 fileLockedError = true;
                 return;
             }
-            LOGGER.error("Problem saving file", ex);
+            Logger.error(this, "Problem saving file", ex);
         }
     }
 
@@ -208,7 +206,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, Charset encoding)
                 // Error occured during processing of an entry. Highlight it!
                 panel.highlightEntry(entry);
             } else {
-                LOGGER.error("A problem occured when trying to save the file", ex);
+                Logger.error(this, "A problem occured when trying to save the file", ex);
             }
 
             JOptionPane.showMessageDialog(frame, Localization.lang("Could not save file.") + ".\n" + ex.getMessage(),
@@ -340,7 +338,7 @@ public void saveAs(File file) throws Exception {
             panel.setFileMonitorHandle(Globals.getFileUpdateMonitor().addUpdateListener(panel,
                     context.getDatabaseFile().orElse(null)));
         } catch (IOException ex) {
-            LOGGER.error("Problem registering file change notifications", ex);
+            Logger.error(this, "Problem registering file change notifications", ex);
         }
 
         if (readyForAutosave(context)) {
@@ -416,7 +414,7 @@ private boolean checkExternalModification() {
                     if (!FileBasedLock
                             .waitForFileLock(panel.getBibDatabaseContext().getDatabaseFile().get().toPath())) {
                         // TODO: GUI handling of the situation when the externally modified file keeps being locked.
-                        LOGGER.error("File locked, this will be trouble.");
+                        Logger.error(this, "File locked, this will be trouble.");
                     }
 
                     ChangeScanner scanner = new ChangeScanner(panel.frame(), panel,
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java b/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
index 0e4cd29f1e01..aeb71cb7fd1f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
@@ -26,8 +26,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This class handles the download of an external file. Typically called when the user clicks
@@ -43,7 +42,6 @@
  */
 public class DownloadExternalFile {
 
-    private static final Log LOGGER = LogFactory.getLog(DownloadExternalFile.class);
 
     private final JabRefFrame frame;
     private final BibDatabaseContext databaseContext;
@@ -162,7 +160,7 @@ public void download(URL url, final DownloadCallback callback) throws IOExceptio
         } catch (IOException ex) {
             JOptionPane.showMessageDialog(frame, Localization.lang("Invalid URL") + ": " + ex.getMessage(),
                     Localization.lang("Download file"), JOptionPane.ERROR_MESSAGE);
-            LOGGER.info("Error while downloading " + "'" + res + "'", ex);
+            Logger.info(this, "Error while downloading " + "'" + res + "'", ex);
             return;
         }
         final URL urlF = url;
@@ -178,7 +176,7 @@ public void download(URL url, final DownloadCallback callback) throws IOExceptio
                 }
                 JOptionPane.showMessageDialog(frame, Localization.lang("Invalid URL") + ": " + e2.getMessage(),
                         Localization.lang("Download file"), JOptionPane.ERROR_MESSAGE);
-                LOGGER.info("Error while downloading " + "'" + urlF + "'", e2);
+                Logger.info(this, "Error while downloading " + "'" + urlF + "'", e2);
                 return;
             }
             // Download finished: call the method that stops the progress bar etc.:
@@ -187,7 +185,7 @@ public void download(URL url, final DownloadCallback callback) throws IOExceptio
 
         Optional<ExternalFileType> suggestedType = Optional.empty();
         if (mimeType != null) {
-            LOGGER.debug("MIME Type suggested: " + mimeType);
+            Logger.debug(this, "MIME Type suggested: " + mimeType);
             suggestedType = ExternalFileTypes.getInstance().getExternalFileTypeByMimeType(mimeType);
         }
         // Then, while the download is proceeding, let the user choose the details of the file:
@@ -255,7 +253,7 @@ public void download(URL url, final DownloadCallback callback) throws IOExceptio
             boolean success = FileUtil.copyFile(Paths.get(tmp.toURI()), Paths.get(toFile.toURI()), true);
             if (!success) {
                 // OOps, the file exists!
-                LOGGER.error("File already exists! DownloadExternalFile.download()");
+                Logger.error(this, "File already exists! DownloadExternalFile.download()");
             }
 
             // If the local file is in or below the main file directory, change the
@@ -268,12 +266,12 @@ public void download(URL url, final DownloadCallback callback) throws IOExceptio
             callback.downloadComplete(fileListEntry);
 
             if (!tmp.delete()) {
-                LOGGER.info("Cannot delete temporary file");
+                Logger.info(this, "Cannot delete temporary file");
             }
         } else {
             // Canceled. Just delete the temp file:
             if (downloadFinished && !tmp.delete()) {
-                LOGGER.info("Cannot delete temporary file");
+                Logger.info(this, "Cannot delete temporary file");
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
index c26f13f09bdb..ddaea195a38f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
@@ -43,10 +43,9 @@
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * This class holds the functionality of autolinking to a file that's dropped
@@ -62,7 +61,6 @@
  */
 public class DroppedFileHandler {
 
-    private static final Log LOGGER = LogFactory.getLog(DroppedFileHandler.class);
 
     private final JabRefFrame frame;
 
@@ -178,7 +176,7 @@ public void linkPdfToEntry(String fileName, BibEntry entry) {
         Optional<ExternalFileType> optFileType = ExternalFileTypes.getInstance().getExternalFileTypeByExt("pdf");
 
         if (!optFileType.isPresent()) {
-            LOGGER.warn("No file type with extension 'pdf' registered.");
+            Logger.warn(this, "No file type with extension 'pdf' registered.");
             return;
         }
 
@@ -230,7 +228,7 @@ private boolean tryXmpImport(String fileName, ExternalFileType fileType, NamedCo
         try {
             xmpEntriesInFile = XMPUtil.readXMP(fileName, Globals.prefs.getXMPPreferences());
         } catch (IOException e) {
-            LOGGER.warn("Problem reading XMP", e);
+            Logger.warn(this, "Problem reading XMP", e);
             return false;
         }
 
@@ -431,7 +429,7 @@ private void doLink(BibEntry entry, ExternalFileType fileType, String filename,
                 }
             }
 
-            LOGGER.debug("absFilename: " + absFilename);
+            Logger.debug(this, "absFilename: " + absFilename);
 
             for (int i = 0; i < tm.getRowCount(); i++) {
                 FileListEntry flEntry = tm.getEntry(i);
@@ -442,7 +440,7 @@ private void doLink(BibEntry entry, ExternalFileType fileType, String filename,
                         .map(Path::toString)
                         .orElse(null);
 
-                LOGGER.debug("absName: " + absName);
+                Logger.debug(this, "absName: " + absName);
                 // If the filenames are equal, we don't need to link, so we simply return:
                 if (absFilename.equals(absName)) {
                     return;
@@ -493,7 +491,7 @@ private boolean doMove(String fileName, String destFilename, NamedCompound edits
                     Files.createDirectories(destFile);
                 }
             } catch (IOException e) {
-                LOGGER.error("Problem creating target directories", e);
+                Logger.error(this, "Problem creating target directories", e);
             }
             if (FileUtil.renameFile(fromFile, destFile, true)) {
                 return true;
@@ -532,7 +530,7 @@ private boolean doCopy(String fileName, String toFile, NamedCompound edits) {
             // OOps, we don't know which directory to put it in, or the given
             // dir doesn't exist....
             // This should not happen!!
-            LOGGER.warn("Cannot determine destination directory or destination directory does not exist");
+            Logger.warn(this, "Cannot determine destination directory or destination directory does not exist");
             return false;
         }
 
@@ -557,7 +555,7 @@ private boolean doCopy(String fileName, String toFile, NamedCompound edits) {
             }
             FileUtil.copyFile(Paths.get(fileName), destFile, true);
         } catch (IOException e) {
-            LOGGER.error("Problem copying file", e);
+            Logger.error(this, "Problem copying file", e);
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
index 5bf278dcd9f4..c64d2aafd38a 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
@@ -21,15 +21,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Try to download fulltext PDF for selected entry(ies) by following URL or DOI link.
  */
 public class FindFullTextAction extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(FindFullTextAction.class);
 
     private static final int WARNING_LIMIT = 5; // The minimum number of selected entries to ask the user for confirmation
 
@@ -45,7 +43,7 @@ public void init() throws Exception {
         if (!basePanel.getSelectedEntries().isEmpty()) {
             basePanel.output(Localization.lang("Looking for full text document..."));
         } else {
-            LOGGER.debug("No entry selected for fulltext download.");
+            Logger.debug(this, "No entry selected for fulltext download.");
         }
     }
 
@@ -103,7 +101,7 @@ public void update() {
                         }
                     });
                 } catch (IOException e) {
-                    LOGGER.warn("Problem downloading file", e);
+                    Logger.warn(this, "Problem downloading file", e);
                 }
                 basePanel.output(Localization.lang("Finished downloading full text document for entry %0.",
                         entry.getCiteKeyOptional().orElse(Localization.lang("undefined"))));
diff --git a/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java b/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
index 89a329750702..2bdb18c7f2f1 100644
--- a/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
+++ b/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
@@ -1,5 +1,4 @@
 package org.jabref.gui.externalfiles;
-
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -13,15 +12,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  *
  */
 public class TransferableFileLinkSelection implements Transferable {
 
-    private static final Log LOGGER = LogFactory.getLog(TransferableFileLinkSelection.class);
 
     private final List<Path> fileList = new ArrayList<>();
 
@@ -43,7 +40,7 @@ public DataFlavor[] getTransferDataFlavors() {
 
     @Override
     public boolean isDataFlavorSupported(DataFlavor dataFlavor) {
-        LOGGER.debug("Query: " + dataFlavor.getHumanPresentableName() + " , "
+        Logger.debug(this, "Query: " + dataFlavor.getHumanPresentableName() + " , "
                 +
                 dataFlavor.getDefaultRepresentationClass() + " , " + dataFlavor.getMimeType());
         return dataFlavor.equals(DataFlavor.javaFileListFlavor)
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
index 0d5338391a69..528327bb3b25 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
@@ -16,8 +16,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * The menu item used in the popup menu for opening external resources associated
@@ -25,7 +24,6 @@
  * to process the request if the user clicks this menu item.
  */
 public class ExternalFileMenuItem extends JMenuItem implements ActionListener {
-    private static final Log LOGGER = LogFactory.getLog(ExternalFileMenuItem.class);
 
     private final BibEntry entry;
     private final String link;
@@ -99,7 +97,7 @@ private boolean openLink() {
                 return false;
             }
 
-            LOGGER.warn("Unable to open link", ex);
+            Logger.warn(this, "Unable to open link", ex);
         }
         return false;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java b/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
index 7f8e37668778..2be84c1232e5 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
@@ -22,12 +22,10 @@
 import org.jabref.gui.groups.EntryTableTransferHandler;
 import org.jabref.model.util.FileHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class FileListEditorTransferHandler extends TransferHandler {
 
-    private static final Log LOGGER = LogFactory.getLog(FileListEditorTransferHandler.class);
     private DataFlavor urlFlavor;
     private final DataFlavor stringFlavor;
     private final JabRefFrame frame;
@@ -52,7 +50,7 @@ public FileListEditorTransferHandler(JabRefFrame frame, EntryContainer entryCont
         try {
             urlFlavor = new DataFlavor("application/x-java-url; class=java.net.URL");
         } catch (ClassNotFoundException e) {
-            LOGGER.info("Unable to configure drag and drop for file link table", e);
+            Logger.info(this, "Unable to configure drag and drop for file link table", e);
         }
     }
 
@@ -89,7 +87,7 @@ public boolean importData(JComponent comp, Transferable t) {
 
             if (t.isDataFlavorSupported(urlFlavor)) {
                 URL dropLink = (URL) t.getTransferData(urlFlavor);
-                LOGGER.debug("URL: " + dropLink);
+                Logger.debug(this, "URL: " + dropLink);
             }
 
             // This is used when one or more files are pasted from the file manager
@@ -117,9 +115,9 @@ public boolean importData(JComponent comp, Transferable t) {
                 return true;
             }
         } catch (IOException ioe) {
-            LOGGER.warn("Failed to read dropped data. ", ioe);
+            Logger.warn(this, "Failed to read dropped data. ", ioe);
         } catch (UnsupportedFlavorException | ClassCastException ufe) {
-            LOGGER.warn("Drop type error. ", ufe);
+            Logger.warn(this, "Drop type error. ", ufe);
         }
 
         // all supported flavors failed
@@ -128,7 +126,7 @@ public boolean importData(JComponent comp, Transferable t) {
         for (DataFlavor inflav : inflavs) {
             logMessage.append(' ').append(inflav);
         }
-        LOGGER.warn(logMessage.toString());
+        Logger.warn(this, logMessage.toString());
 
         return false;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java b/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java
index f633b142e4be..d12c5a001f98 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java
@@ -22,12 +22,10 @@
 import org.jabref.logic.search.SearchQueryHighlightListener;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class JTextAreaWithHighlighting extends JTextAreaWithPlaceholder implements SearchQueryHighlightListener {
 
-    private static final Log LOGGER = LogFactory.getLog(JTextAreaWithHighlighting.class);
 
     private Optional<Pattern> highlightPattern = Optional.empty();
 
@@ -148,7 +146,7 @@ private void highLight() {
                     highlighter.addHighlight(matcher.start(), matcher.end(), DefaultHighlighter.DefaultPainter);
                 } catch (BadLocationException ble) {
                     // should not occur if matcher works right
-                    LOGGER.warn("Highlighting not possible, bad location", ble);
+                    Logger.warn(this, "Highlighting not possible, bad location", ble);
                 }
             }
         });
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index ddd3601f16ab..423c85539d76 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -30,14 +30,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
+import com.jcabi.log.Logger;
 import de.jensd.fx.glyphs.GlyphIcons;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class LinkedFileViewModel extends AbstractViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(LinkedFileViewModel.class);
 
     private final LinkedFile linkedFile;
     private final BibDatabaseContext databaseContext;
@@ -113,7 +111,7 @@ public void open() {
             Optional<ExternalFileType> type = ExternalFileTypes.getInstance().fromLinkedFile(linkedFile, true);
             JabRefDesktop.openExternalFileAnyFormat(databaseContext, linkedFile.getLink(), type);
         } catch (IOException e) {
-            LOGGER.warn("Cannot open selected file.", e);
+            Logger.warn(this, "Cannot open selected file.", e);
         }
     }
 
@@ -139,7 +137,7 @@ public void openFolder() {
                 dialogService.showErrorDialogAndWait(Localization.lang("File not found"));
             }
         } catch (IOException ex) {
-            LOGGER.debug("Cannot open folder", ex);
+            Logger.debug(this, "Cannot open folder", ex);
         }
     }
 
@@ -246,7 +244,7 @@ public boolean delete() {
                         dialogService.showErrorDialogAndWait(
                                 Localization.lang("Cannot delete file"),
                                 Localization.lang("File permission error"));
-                        LOGGER.warn("File permission error while deleting: " + linkedFile, ex);
+                        Logger.warn(this, "File permission error while deleting: " + linkedFile, ex);
                     }
                 }
             } else {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index 87a944f430bc..7b466d12c31a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -44,12 +44,10 @@
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(LinkedFilesEditorViewModel.class);
 
     private final ListProperty<LinkedFileViewModel> files = new SimpleListProperty<>(FXCollections.observableArrayList(LinkedFileViewModel::getObservables));
     private final BooleanProperty fulltextLookupInProgress = new SimpleBooleanProperty(false);
@@ -250,13 +248,13 @@ private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDown
             // TODO: what if this takes long time?
             String mimeType = urlDownload.getMimeType(); // Read MIME type
             if (mimeType != null) {
-                LOGGER.debug("MIME Type suggested: " + mimeType);
+                Logger.debug(this, "MIME Type suggested: " + mimeType);
                 return ExternalFileTypes.getInstance().getExternalFileTypeByMimeType(mimeType);
             } else {
                 return Optional.empty();
             }
         } catch (IOException ex) {
-            LOGGER.debug("Error while inferring MIME type for URL " + urlDownload.getSource(), ex);
+            Logger.debug(this, "Error while inferring MIME type for URL " + urlDownload.getSource(), ex);
             return Optional.empty();
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PreviewPanelTransferHandler.java b/src/main/java/org/jabref/gui/fieldeditors/PreviewPanelTransferHandler.java
index bd780626b857..20bfeff9809d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PreviewPanelTransferHandler.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PreviewPanelTransferHandler.java
@@ -15,12 +15,10 @@
 import org.jabref.gui.JabRefFrame;
 import org.jabref.logic.l10n.Localization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class PreviewPanelTransferHandler extends FileListEditorTransferHandler {
 
-    private static final Log LOGGER = LogFactory.getLog(PreviewPanelTransferHandler.class);
 
     public PreviewPanelTransferHandler(JabRefFrame frame, EntryContainer entryContainer, TransferHandler textTransferHandler) {
         super(frame, entryContainer, textTransferHandler);
@@ -50,7 +48,7 @@ protected Transferable createTransferable(JComponent component) {
             try {
                 editorPane.getEditorKit().write(stringWriter, editorPane.getDocument(), editorPane.getSelectionStart(), editorPane.getSelectionEnd());
             } catch (BadLocationException | IOException e) {
-                LOGGER.warn("Cannot write preview", e);
+                Logger.warn(this, "Cannot write preview", e);
             }
 
             // Second, return the HTML (and text as fallback)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextArea.java b/src/main/java/org/jabref/gui/fieldeditors/TextArea.java
index 600d08e7f374..2330ec885587 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TextArea.java
@@ -12,8 +12,7 @@
 import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.util.DefaultTaskExecutor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * An implementation of the FieldEditor backed by a {@link EditorTextArea}.
@@ -21,7 +20,6 @@
  */
 public class TextArea implements FieldEditor {
 
-    private static final Log LOGGER = LogFactory.getLog(TextArea.class);
 
     private final JFXPanel swingPanel;
 
@@ -113,7 +111,7 @@ private void setBackgroundColor(Color color) {
             try {
                 SwingUtilities.invokeAndWait(() -> setBackground(color));
             } catch (InvocationTargetException | InterruptedException e) {
-                LOGGER.info("Problem setting background color", e);
+                Logger.info(this, "Problem setting background color", e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextField.java b/src/main/java/org/jabref/gui/fieldeditors/TextField.java
index 6a240db224d2..e7876a0ee674 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TextField.java
@@ -1,5 +1,4 @@
 package org.jabref.gui.fieldeditors;
-
 import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.lang.reflect.InvocationTargetException;
@@ -17,8 +16,7 @@
 import org.jabref.gui.actions.Actions;
 import org.jabref.gui.util.component.JTextFieldWithPlaceholder;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * An implementation of the FieldEditor backed by a JTextField. Used for single-line input, only BibTex key at the
@@ -26,7 +24,6 @@
  */
 public class TextField extends JTextFieldWithPlaceholder implements FieldEditor {
 
-    private static final Log LOGGER = LogFactory.getLog(TextField.class);
 
     private final String fieldName;
     private UndoManager undo;
@@ -106,7 +103,7 @@ private void setBackgroundColor(Color color) {
             try {
                 SwingUtilities.invokeAndWait(() -> setBackground(color));
             } catch (InvocationTargetException | InterruptedException e) {
-                LOGGER.info("Problem setting background color", e);
+                Logger.info(this, "Problem setting background color", e);
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
index 4c8bc20c2ada..5b7e32ca975a 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -49,11 +49,10 @@
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * This class produces a dialog box for editing a single file link from a Bibtex entry.
@@ -68,7 +67,6 @@ public class FileListEntryEditor {
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
 
-    private static final Log LOGGER = LogFactory.getLog(FileListEntryEditor.class);
     private final JTextField link = new JTextField();
     private final JTextField description = new JTextField();
     private final JButton ok = new JButton(Localization.lang("OK"));
@@ -281,7 +279,7 @@ private void openFile() {
             try {
                 JabRefDesktop.openExternalFileAnyFormat(databaseContext, link.getText(), Optional.of(type));
             } catch (IOException e) {
-                LOGGER.error("File could not be opened", e);
+                Logger.error(this, "File could not be opened", e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java b/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
index 7b669fb0e902..975927ff20b3 100644
--- a/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
+++ b/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
@@ -34,18 +34,18 @@
 import org.jabref.gui.importer.ImportMenuItem;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.maintable.MainTable;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternUtil;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.util.FileHelper;
 import org.jabref.pdfimport.PdfImporter;
 import org.jabref.pdfimport.PdfImporter.ImportPdfFilesResult;
 
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 
 public class EntryTableTransferHandler extends TransferHandler {
 
     private static final boolean DROP_ALLOWED = true;
-    private static final Log LOGGER = LogFactory.getLog(EntryTableTransferHandler.class);
     private final MainTable entryTable;
     private final JabRefFrame frame;
     private final BasePanel panel;
@@ -70,7 +70,7 @@ public EntryTableTransferHandler(MainTable entryTable, JabRefFrame frame, BasePa
         try {
             urlFlavor = new DataFlavor("application/x-java-url; class=java.net.URL");
         } catch (ClassNotFoundException e) {
-            LOGGER.info("Unable to configure drag and drop for main table", e);
+            Logger.info(this, "Unable to configure drag and drop for main table", e);
         }
     }
 
@@ -127,20 +127,20 @@ public boolean importData(JComponent comp, Transferable t) {
                 return handleDropTransfer(dropLink);
             } else if (t.isDataFlavorSupported(stringFlavor)) {
                 String dropStr = (String) t.getTransferData(stringFlavor);
-                LOGGER.debug("Received stringFlavor: " + dropStr);
+                Logger.debug(this, "Received stringFlavor: " + dropStr);
                 return handleDropTransfer(dropStr, dropRow);
             }
         } catch (IOException ioe) {
-            LOGGER.error("Failed to read dropped data", ioe);
+            Logger.error(this, "Failed to read dropped data", ioe);
         } catch (UnsupportedFlavorException | ClassCastException ufe) {
-            LOGGER.error("Drop type error", ufe);
+            Logger.error(this, "Drop type error", ufe);
         }
 
         // all supported flavors failed
-        LOGGER.info("Can't transfer input: ");
+        Logger.info(this, "Can't transfer input: ");
         DataFlavor[] inflavs = t.getTransferDataFlavors();
         for (DataFlavor inflav : inflavs) {
-            LOGGER.info("  " + inflav);
+            Logger.info(this, "  " + inflav);
         }
 
         return false;
@@ -175,7 +175,7 @@ public void exportAsDrag(JComponent comp, InputEvent e, int action) {
             int columnIndex = entryTable.columnAtPoint(((MouseEvent) e).getPoint());
             int modelIndex = entryTable.getColumnModel().getColumn(columnIndex).getModelIndex();
             if (entryTable.isFileColumn(modelIndex)) {
-                LOGGER.info("Dragging file");
+                Logger.info(this, "Dragging file");
                 draggingFile = true;
             }
         }
@@ -247,7 +247,7 @@ public static List<Path> getFilesFromDraggedFilesString(String s) {
                 URL url = new URL(line);
                 fl = new File(url.toURI());
             } catch (MalformedURLException | URISyntaxException e) {
-                LOGGER.warn("Could not get file", e);
+                LogFactory.getLog(EntryTableTransferHandler.class).warn("Could not get file", e);
             }
 
             // Unless an exception was thrown, we should have the sanitized path:
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeController.java b/src/main/java/org/jabref/gui/groups/GroupTreeController.java
index 25f887d1858d..46f1f216018f 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeController.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeController.java
@@ -41,15 +41,13 @@
 import org.jabref.gui.util.ViewModelTreeTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
 import org.fxmisc.easybind.EasyBind;
 
 public class GroupTreeController extends AbstractController<GroupTreeViewModel> {
 
-    private static final Log LOGGER = LogFactory.getLog(GroupTreeController.class);
 
     @FXML private TreeTableView<GroupNodeViewModel> groupTree;
     @FXML private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> mainColumn;
@@ -340,7 +338,7 @@ private void setupClearButtonField(CustomTextField customTextField) {
             m.setAccessible(true);
             m.invoke(null, customTextField, customTextField.rightProperty());
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-            LOGGER.error("Failed to decorate text field with clear button", ex);
+            Logger.error(this, "Failed to decorate text field with clear button", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
index 9ba40973a42e..4e56147be90f 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
@@ -28,13 +28,11 @@
 import org.jabref.model.groups.KeywordGroup;
 import org.jabref.model.groups.SearchGroup;
 
-import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class GroupTreeNodeViewModel implements Transferable, TreeNode {
 
     public static final DataFlavor FLAVOR;
-    private static final Log LOGGER = LogFactory.getLog(GroupTreeNodeViewModel.class);
     private static final Icon GROUP_REFINING_ICON = IconTheme.JabRefIcon.GROUP_REFINING.getSmallIcon();
     private static final Icon GROUP_INCLUDING_ICON = IconTheme.JabRefIcon.GROUP_INCLUDING.getSmallIcon();
     private static final Icon GROUP_REGULAR_ICON = null;
@@ -46,7 +44,7 @@ public class GroupTreeNodeViewModel implements Transferable, TreeNode {
             df = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType
                     + ";class=" + GroupTreeNode.class.getCanonicalName());
         } catch (ClassNotFoundException e) {
-            LOGGER.error("Creating DataFlavor failed. This should not happen.", e);
+            LogFactory.getLog(GroupTreeNodeViewModel.class).error("Creating DataFlavor failed. This should not happen.", e);
         }
         FLAVOR = df;
         FLAVORS = new DataFlavor[] {GroupTreeNodeViewModel.FLAVOR};
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
index 7833491aecbd..a1f3202ddd1a 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -17,8 +17,7 @@
 import org.jabref.logic.util.BuildInfo;
 
 import com.google.common.collect.Lists;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class AboutDialogViewModel extends AbstractViewModel {
 
@@ -29,7 +28,6 @@ public class AboutDialogViewModel extends AbstractViewModel {
     private static final String LICENSE_URL = "https://github.com/JabRef/jabref/blob/master/LICENSE.md";
     private final String changelogUrl;
     private final String versionInfo;
-    private final Log logger = LogFactory.getLog(AboutDialogViewModel.class);
     private final ReadOnlyStringWrapper heading = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper authors = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper developers = new ReadOnlyStringWrapper();
@@ -143,7 +141,7 @@ private void openWebsite(String url) {
             JabRefDesktop.openBrowser(url);
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
-            logger.error("Could not open default browser.", e);
+            Logger.error(this, "Could not open default browser.", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
index 8d6658a85f58..806dc7dacc14 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
@@ -41,16 +41,14 @@
 import org.jabref.logic.util.FileExtensions;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Dialog to manage custom importers.
  */
 public class ImportCustomizationDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(ImportCustomizationDialog.class);
 
     // Column widths for import customization dialog table:
     private static final int COL_0_WIDTH = 200;
@@ -133,12 +131,12 @@ public ImportCustomizationDialog(final JabRefFrame frame) {
                     customImporterTable.revalidate();
                     customImporterTable.repaint(10);
                 } catch (IOException exc) {
-                    LOGGER.info("Could not open ZIP-archive.", exc);
+                    Logger.info(this, "Could not open ZIP-archive.", exc);
                     JOptionPane.showMessageDialog(frame,
                             Localization.lang("Could not open %0", jarZipFile.get().toString()) + "\n"
                                     + Localization.lang("Have you chosen the correct package path?"));
                 } catch (NoClassDefFoundError exc) {
-                    LOGGER.info("Could not instantiate ZIP-archive reader.", exc);
+                    Logger.info(this, "Could not instantiate ZIP-archive reader.", exc);
                     JOptionPane.showMessageDialog(frame,
                             Localization.lang("Could not instantiate %0", jarZipFile.get().toString()) + "\n"
                                     + Localization.lang("Have you chosen the correct package path?"));
diff --git a/src/main/java/org/jabref/gui/importer/ImportFormats.java b/src/main/java/org/jabref/gui/importer/ImportFormats.java
index dd6bce43acd9..10a211f64794 100644
--- a/src/main/java/org/jabref/gui/importer/ImportFormats.java
+++ b/src/main/java/org/jabref/gui/importer/ImportFormats.java
@@ -29,12 +29,10 @@
 import org.jabref.logic.util.FileExtensions;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ImportFormats {
 
-    private static final Log LOGGER = LogFactory.getLog(ImportFormats.class);
 
     private ImportFormats() {
     }
@@ -102,7 +100,7 @@ public void actionPerformed(ActionEvent e) {
                         // Set last working dir for import
                         Globals.prefs.put(JabRefPreferences.IMPORT_WORKING_DIRECTORY, file.getParent().toString());
                     } catch (Exception ex) {
-                        LOGGER.warn("Cannot import file", ex);
+                        Logger.warn(this, "Cannot import file", ex);
                     }
                 });
             }
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index f17cb19f4e2a..3713520839e4 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -113,10 +113,9 @@
 import ca.odell.glazedlists.swing.DefaultEventTableModel;
 import ca.odell.glazedlists.swing.GlazedListsSwing;
 import ca.odell.glazedlists.swing.TableComparatorChooser;
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.ButtonStackBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Dialog to allow the selection of entries as part of an Import.
@@ -142,7 +141,6 @@
 
 public class ImportInspectionDialog extends JabRefDialog implements ImportInspector, OutputPrinter {
 
-    private static final Log LOGGER = LogFactory.getLog(ImportInspectionDialog.class);
     private static final List<String> INSPECTION_FIELDS = Arrays.asList(FieldName.AUTHOR, FieldName.TITLE, FieldName.YEAR, BibEntry.KEY_FIELD);
     private static final int DUPL_COL = 1;
     private static final int FILE_COL = 2;
@@ -1069,7 +1067,7 @@ private void openExternalLink(String fieldName, MouseEvent e) {
                 try {
                     JabRefDesktop.openExternalViewer(panel.getBibDatabaseContext(), link, fieldName);
                 } catch (IOException ex) {
-                    LOGGER.warn("Could not open link", ex);
+                    Logger.warn(this, "Could not open link", ex);
                 }
             });
         }
@@ -1248,7 +1246,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             try {
                 def.download(this);
             } catch (IOException ex) {
-                LOGGER.warn("Could not download file", ex);
+                Logger.warn(this, "Could not download file", ex);
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/importer/ZipFileChooser.java b/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
index e4290ae87841..c7a179f13df7 100644
--- a/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
+++ b/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
@@ -30,15 +30,13 @@
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.l10n.Localization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Dialog to allow users to choose a file contained in a ZIP file.
  */
 class ZipFileChooser extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(ZipFileChooser.class);
 
 
     /**
@@ -85,7 +83,7 @@ public ZipFileChooser(ImportCustomizationDialog importCustomizationDialog, ZipFi
                     importCustomizationDialog.addOrReplaceImporter(importer);
                     dispose();
                 } catch (ClassNotFoundException exc) {
-                    LOGGER.warn("Could not instantiate importer: " + className, exc);
+                    Logger.warn(this, "Could not instantiate importer: " + className, exc);
                     JOptionPane.showMessageDialog(this, Localization.lang("Could not instantiate %0 %1",
                             className + ":\n", exc.getMessage()));
                 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
index baae05a96f79..30a8058edd2e 100644
--- a/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/AppendDatabaseAction.java
@@ -39,12 +39,11 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 
 public class AppendDatabaseAction implements BaseAction {
 
-    private static final Log LOGGER = LogFactory.getLog(AppendDatabaseAction.class);
 
     private final JabRefFrame frame;
     private final BasePanel panel;
@@ -102,7 +101,7 @@ private static void mergeFromBibtex(BasePanel panel, ParserResult parserResult,
                         newGroups.setGroup(group);
                         group.add(appendedEntries);
                     } catch (IllegalArgumentException e) {
-                        LOGGER.error(e);
+                        LogFactory.getLog(AppendDatabaseAction.class).error("unknown error", e);
                     }
                 }
 
@@ -186,7 +185,7 @@ private void openIt(boolean importEntries, boolean importStrings, boolean import
                         importSelectorWords);
                 panel.output(Localization.lang("Imported from library") + " '" + file + "'");
             } catch (IOException | KeyCollisionException ex) {
-                LOGGER.warn("Could not open database", ex);
+                Logger.warn(this, "Could not open database", ex);
                 JOptionPane.showMessageDialog(panel, ex.getMessage(), Localization.lang("Open library"),
                         JOptionPane.ERROR_MESSAGE);
             }
diff --git a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
index 631cb059e39e..0b3d14542085 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -46,14 +46,12 @@
 import org.jabref.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.shared.exception.NotASharedDatabaseException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 // The action concerned with opening an existing database.
 
 public class OpenDatabaseAction extends MnemonicAwareAction {
 
-    public static final Log LOGGER = LogFactory.getLog(OpenDatabaseAction.class);
     // List of actions that may need to be called after opening the file. Such as
     // upgrade actions etc. that may depend on the JabRef version that wrote the file:
     private static final List<GUIPostOpenAction> POST_OPEN_ACTIONS = new ArrayList<>();
@@ -111,7 +109,7 @@ public void actionPerformed(ActionEvent e) {
                     .runInJavaFXThread(() -> ds.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration));
             filesToOpen.addAll(chosenFiles);
         } else {
-            LOGGER.info(Action.NAME + " " + e.getActionCommand());
+            Logger.info(this, Action.NAME + " " + e.getActionCommand());
             filesToOpen.add(Paths.get(StringUtil.getCorrectFileName(e.getActionCommand(), "bib")));
         }
 
@@ -242,7 +240,7 @@ private void openTheFile(Path file, boolean raisePanel) {
                         NotASharedDatabaseException e) {
                     result.getDatabaseContext().clearDatabaseFile(); // do not open the original file
                     result.getDatabase().clearSharedDatabaseID();
-                    LOGGER.error("Connection error", e);
+                    Logger.error(this, "Connection error", e);
                     JOptionPane.showMessageDialog(frame,
                             e.getMessage() + "\n\n" + Localization.lang("A local copy will be opened."),
                             Localization.lang("Connection error"), JOptionPane.WARNING_MESSAGE);
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java
index f2fa6f030993..601db68d5dc2 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/ACMPortalFetcher.java
@@ -42,12 +42,10 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ACMPortalFetcher implements PreviewEntryFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(ACMPortalFetcher.class);
 
     private static final String START_URL = "http://portal.acm.org/";
     private static final String SEARCH_URL_PART = "results.cfm?query=";
@@ -165,7 +163,7 @@ public boolean processQueryGetPreview(String query, FetcherPreviewDialog preview
             return true;
 
         } catch (IOException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             preview.showErrorMessage(this.getTitle(), e.getLocalizedMessage());
             return false;
         }
@@ -239,13 +237,13 @@ private void parse(String text, int hits, Map<String, JLabel> entries) {
         }
     }
 
-    private static String getEntryBibTeXURL(String fullCitation) {
+    private String getEntryBibTeXURL(String fullCitation) {
         // Get ID
         Matcher idMatcher = ACMPortalFetcher.ID_PATTERN.matcher(fullCitation);
         if (idMatcher.find()) {
             return idMatcher.group(1);
         }
-        LOGGER.info("Did not find ID in: " + fullCitation);
+        Logger.info(this, "Did not find ID in: " + fullCitation);
         return null;
     }
 
@@ -303,13 +301,13 @@ private boolean getNextEntryURL(String allText, int entryNumber,
                 entries.put(link, preview);
                 return true;
             }
-            LOGGER.warn("Citation unmatched " + Integer.toString(entryNumber));
+            Logger.warn(this, "Citation unmatched " + Integer.toString(entryNumber));
             return false;
         }
         return false;
     }
 
-    private static Optional<BibEntry> downloadEntryBibTeX(String id, boolean downloadAbstract) {
+    private Optional<BibEntry> downloadEntryBibTeX(String id, boolean downloadAbstract) {
         try {
             URL url = new URL(
                     ACMPortalFetcher.START_URL + ACMPortalFetcher.BIBTEX_URL + id + ACMPortalFetcher.BIBTEX_URL_END);
@@ -327,7 +325,7 @@ private static Optional<BibEntry> downloadEntryBibTeX(String id, boolean downloa
                 items = new BibtexParser(Globals.prefs.getImportFormatPreferences()).parseEntries(bibtexString);
 
             } catch (IOException | ParseException e) {
-                LOGGER.info("Download of BibTeX information from ACM Portal failed.", e);
+                Logger.info(this, "Download of BibTeX information from ACM Portal failed.", e);
             }
             if ((items == null) || items.isEmpty()) {
                 return Optional.empty();
@@ -349,13 +347,13 @@ private static Optional<BibEntry> downloadEntryBibTeX(String id, boolean downloa
 
             return Optional.of(entry);
         } catch (NoSuchElementException e) {
-            LOGGER.info(
+            Logger.info(this,
                     "Bad BibTeX record read at: " + ACMPortalFetcher.BIBTEX_URL + id + ACMPortalFetcher.BIBTEX_URL_END,
                     e);
         } catch (MalformedURLException e) {
-            LOGGER.info("Malformed URL.", e);
+            Logger.info(this, "Malformed URL.", e);
         } catch (IOException e) {
-            LOGGER.info("Cannot connect.", e);
+            Logger.info(this, "Cannot connect.", e);
         } catch (InterruptedException ignored) {
             // Ignored
         }
@@ -376,7 +374,7 @@ private String convertHTMLChars(String text) {
      * Find out how many hits were found.
      * @param page
      */
-    private static int getNumberOfHits(String page, String marker, Pattern pattern) throws IOException {
+    private int getNumberOfHits(String page, String marker, Pattern pattern) throws IOException {
         int ind = page.indexOf(marker);
         if (ind >= 0) {
             String substring = page.substring(ind, Math.min(ind + 100, page.length()));
@@ -390,7 +388,7 @@ private static int getNumberOfHits(String page, String marker, Pattern pattern)
                     throw new IOException("Cannot parse number of hits");
                 }
             }
-            LOGGER.info("Unmatched! " + substring);
+            Logger.info(this, "Unmatched! " + substring);
         }
         throw new IOException("Cannot parse number of hits");
     }
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java
index ffe11017c578..13690679f839 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/CiteSeerXFetcher.java
@@ -20,8 +20,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class CiteSeerXFetcher implements EntryFetcher {
 
@@ -42,7 +41,6 @@ public class CiteSeerXFetcher implements EntryFetcher {
             .compile(CiteSeerXFetcher.BASE_PATTERN.replace(CiteSeerXFetcher.QUERY_MARKER, "citation_year"));
     private static final Pattern ABSTRACT_PATTERN = Pattern.compile("<h3>Abstract</h3>\\s*<p>(.*)</p>");
 
-    private static final Log LOGGER = LogFactory.getLog(CiteSeerXFetcher.class);
 
     private boolean stopFetching;
 
@@ -63,7 +61,7 @@ public boolean processQuery(String query, ImportInspector inspector, OutputPrint
 
             return true;
         } catch (IOException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             ((ImportInspectionDialog)inspector).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
             return false;
         }
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java
index 326b32373ac2..209b96bd8d91 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java
@@ -12,19 +12,17 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
+import com.jcabi.log.Logger;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class DOAJFetcher implements EntryFetcher {
 
     private static final String SEARCH_URL = "https://doaj.org/api/v1/search/articles/";
-    private static final Log LOGGER = LogFactory.getLog(DOAJFetcher.class);
     private static final int MAX_PER_PAGE = 100;
     private boolean shouldContinue;
 
@@ -94,7 +92,7 @@ public boolean processQuery(String query, ImportInspector inspector, OutputPrint
                 return false;
             }
         } catch (UnirestException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             ((ImportInspectionDialog)inspector).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
             return false;
         }
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java
index 86b277307627..a4016ee859f4 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/IEEEXploreFetcher.java
@@ -36,15 +36,13 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 public class IEEEXploreFetcher implements EntryFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(IEEEXploreFetcher.class);
     private static final String URL_SEARCH = "http://ieeexplore.ieee.org/rest/search?reload=true";
     private static final String URL_BIBTEX_START = "http://ieeexplore.ieee.org/xpl/downloadCitations?reload=true&recordIds=";
     private static final String URL_BIBTEX_END = "&download-format=download-bibtex&x=0&y=0";
@@ -161,7 +159,7 @@ public boolean processQuery(String query, ImportInspector dialog, OutputPrinter
             return true;
 
         } catch (ParseException | IOException | JSONException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             ((ImportInspectionDialog)dialog).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
         }
 
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java
index 4a9c41951ad4..349029223b93 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/INSPIREFetcher.java
@@ -22,8 +22,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  *
@@ -41,7 +40,6 @@ public class INSPIREFetcher implements EntryFetcher {
 
     private static final String INSPIRE_HOST = "inspirehep.net";
 
-    private static final Log LOGGER = LogFactory.getLog(INSPIREFetcher.class);
     /**
      * Construct the query URL
      *
@@ -63,7 +61,7 @@ private String constructUrl(String key) {
         StringBuilder sb = new StringBuilder(87).append("http://").append(INSPIREFetcher.INSPIRE_HOST)
                 .append("/search?ln=en&ln=en&p=find+").append(identifier)
                 .append("&action_search=Search&sf=&so=d&rm=&rg=1000&sc=0&of=hx");
-        LOGGER.debug("Inspire URL: " + sb + "\n");
+        Logger.debug(this, "Inspire URL: " + sb + "\n");
         return sb.toString();
     }
 
@@ -148,7 +146,7 @@ public boolean processQuery(String query, ImportInspector dialog, OutputPrinter
             bd.getEntries().forEach(dialog::addEntry);
             return true;
         } catch (Exception e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             ((ImportInspectionDialog)dialog).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
         }
         return false;
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java
index fc3244521b00..87b9257c0ab8 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java
@@ -27,8 +27,7 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.Month;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -44,7 +43,6 @@
  */
 public class OAI2Fetcher implements EntryFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(OAI2Fetcher.class);
     private static final String OAI2_ARXIV_PREFIXIDENTIFIER = "oai%3AarXiv.org%3A";
     private static final String OAI2_ARXIV_HOST = "export.arxiv.org";
     private static final String OAI2_ARXIV_SCRIPT = "oai2";
@@ -88,7 +86,7 @@ public OAI2Fetcher(String oai2Host, String oai2Script, String oai2Metadataprefix
             SAXParserFactory parserFactory = SAXParserFactory.newInstance();
             saxParser = parserFactory.newSAXParser();
         } catch (ParserConfigurationException | SAXException e) {
-            LOGGER.error("Error creating SAXParser for OAI2Fetcher", e);
+            Logger.error(this, "Error creating SAXParser for OAI2Fetcher", e);
         }
     }
 
@@ -251,7 +249,7 @@ public boolean processQuery(String query, ImportInspector dialog, OutputPrinter
                     be = importOai2Entry(key);
                 } catch (SAXException e) {
                     String url = constructUrl(OAI2Fetcher.fixKey(key));
-                    LOGGER.error("Error while fetching from " + getTitle(), e);
+                    Logger.error(this, "Error while fetching from " + getTitle(), e);
                     ((ImportInspectionDialog)dialog).showMessage(Localization.lang("Error while fetching from %0", getTitle()) + "\n" +
                                     Localization.lang("A SAX exception occurred while parsing '%0':", url),
                             Localization.lang("Search %0", getTitle()), JOptionPane.ERROR_MESSAGE);
@@ -272,7 +270,7 @@ public boolean processQuery(String query, ImportInspector dialog, OutputPrinter
 
             return true;
         } catch (IOException | InterruptedException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             ((ImportInspectionDialog)dialog).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
     }
         return false;
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java
index 459bad48a682..faed4acaf5c5 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/SearchBasedEntryFetcher.java
@@ -14,15 +14,13 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Wrapper around {@link SearchBasedFetcher} which implements the old {@link EntryFetcher} interface.
  */
 public class SearchBasedEntryFetcher implements EntryFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(SearchBasedEntryFetcher.class);
     private final SearchBasedFetcher fetcher;
 
     public SearchBasedEntryFetcher(SearchBasedFetcher fetcher) {
@@ -38,7 +36,7 @@ public boolean processQuery(String query, ImportInspector inspector, OutputPrint
             matches.forEach(inspector::addEntry);
             return !matches.isEmpty();
         } catch (FetcherException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             ((ImportInspectionDialog)inspector).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
         }
 
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java b/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java
index c1181ae00e3a..04b6c01662c5 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java
@@ -14,12 +14,11 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
+import com.jcabi.log.Logger;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -27,7 +26,6 @@ public class SpringerFetcher implements EntryFetcher {
 
     private static final String API_URL = "http://api.springer.com/metadata/json?q=";
     private static final String API_KEY = "b0c7151179b3d9c1119cf325bca8460d";
-    private static final Log LOGGER = LogFactory.getLog(SpringerFetcher.class);
     private static final int MAX_PER_PAGE = 100;
     private boolean shouldContinue;
 
@@ -97,7 +95,7 @@ public boolean processQuery(String query, ImportInspector inspector, OutputPrint
                 return false;
             }
         } catch (IOException | UnirestException e) {
-            LOGGER.error("Error while fetching from " + getTitle(), e);
+            Logger.error(this, "Error while fetching from " + getTitle(), e);
             ((ImportInspectionDialog)inspector).showErrorMessage(this.getTitle(), e.getLocalizedMessage());
         }
         return false;
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
index 5bacfc4cc0b4..768496d8e8cd 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
+++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
@@ -27,8 +27,7 @@
 import org.jabref.logic.util.FileExtensions;
 import org.jabref.preferences.PreferencesService;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This class provides a model for managing journal abbreviation lists.
@@ -38,7 +37,6 @@
  */
 public class ManageJournalAbbreviationsViewModel extends AbstractViewModel {
 
-    private final Log logger = LogFactory.getLog(ManageJournalAbbreviationsViewModel.class);
     private final SimpleListProperty<AbbreviationsFileViewModel> journalFiles = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final SimpleListProperty<AbbreviationViewModel> abbreviations = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final SimpleIntegerProperty abbreviationsCount = new SimpleIntegerProperty();
@@ -187,7 +185,7 @@ private void openFile(Path filePath) {
             try {
                 abbreviationsFile.readAbbreviations();
             } catch (FileNotFoundException e) {
-                logger.debug(e.getLocalizedMessage());
+                Logger.debug(this, e.getLocalizedMessage(), e);
             }
         }
         journalFiles.add(abbreviationsFile);
@@ -309,7 +307,7 @@ public void saveJournalAbbreviationFiles() {
             try {
                 file.writeOrCreate();
             } catch (IOException e) {
-                logger.debug(e.getLocalizedMessage());
+                Logger.debug(this, e.getLocalizedMessage());
             }
         });
     }
diff --git a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
index b8444e27ca8d..7b41ad657b8d 100644
--- a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
@@ -25,7 +25,7 @@
 
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 
 /**
@@ -35,7 +35,6 @@
  * The inner class actions can also be used independently.
  */
 public class EmacsKeyBindings {
-    private static final Log LOGGER = LogFactory.getLog(EmacsKeyBindings.class);
 
     private static final String KILL_LINE_ACTION = "emacs-kill-line";
 
@@ -257,7 +256,7 @@ public static void unload() {
      * JTextComponent}.
      */
     private static void loadEmacsKeyBindings() {
-        EmacsKeyBindings.LOGGER.debug("Loading emacs keybindings");
+        LogFactory.getLog(EmacsKeyBindings.class).debug("Loading emacs keybindings");
 
         for (JTextComponent jtc : EmacsKeyBindings.JTCS) {
             Action[] origActions = jtc.getActions();
@@ -544,7 +543,7 @@ public void actionPerformed(ActionEvent event) {
                     KillRing.getInstance().add(jtc.getText(YankAction.start, YankAction.end));
                     KillRing.getInstance().setCurrentTextComponent(jtc);
                 } catch (BadLocationException e) {
-                    LOGGER.info("Bad location when yanking", e);
+                    Logger.info(this, "Bad location when yanking", e);
                 }
             }
         }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
index 3f7f341b1b50..544dd6d85d6d 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
@@ -22,12 +22,10 @@
 
 import org.jabref.logic.util.OS;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class KeyBindingRepository {
 
-    private static final Log LOGGER = LogFactory.getLog(KeyBindingRepository.class);
     /**
      * sorted by localization
      */
@@ -199,7 +197,7 @@ private KeyStroke getKeyForMac(KeyStroke ks) {
                 try {
                     shortcutMask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
                 } catch (AWTError | HeadlessException e) {
-                    LOGGER.warn("Problem geting shortcut mask", e);
+                    Logger.warn(this, "Problem geting shortcut mask", e);
                 }
             }
 
diff --git a/src/main/java/org/jabref/gui/logging/GuiAppender.java b/src/main/java/org/jabref/gui/logging/GuiAppender.java
index d6a6f25ebd6b..ecc58ae70a4f 100644
--- a/src/main/java/org/jabref/gui/logging/GuiAppender.java
+++ b/src/main/java/org/jabref/gui/logging/GuiAppender.java
@@ -5,6 +5,7 @@
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.logging.LogMessages;
 
+import org.apache.commons.logging.LogFactory;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.LogEvent;
@@ -29,7 +30,7 @@ public static GuiAppender createAppender(@PluginAttribute("name") String name,
                                              @PluginElement("Filters") Filter filter) {
 
         if (name == null) {
-            LOGGER.error("No name provided for GuiAppender");
+            LogFactory.getLog(GuiAppender.class).error("No name provided for GuiAppender");
             return null;
         }
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index ea754e6fd243..f860e61cb4b0 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -59,8 +59,7 @@
 import ca.odell.glazedlists.swing.DefaultEventSelectionModel;
 import ca.odell.glazedlists.swing.GlazedListsSwing;
 import ca.odell.glazedlists.swing.TableComparatorChooser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class MainTable extends JTable {
     private static GeneralRenderer defRenderer;
@@ -79,7 +78,6 @@ public class MainTable extends JTable {
 
     private static List<CompleteRenderer> markedNumberRenderers;
 
-    private static final Log LOGGER = LogFactory.getLog(MainTable.class);
     private final MainTableFormat tableFormat;
 
     private final BasePanel panel;
@@ -330,7 +328,7 @@ private void setWidths() {
                             // set preferred width by using found index j in the width array
                             cm.getColumn(i).setPreferredWidth(Integer.parseInt(widthsFromPreferences.get(j)));
                         } catch (NumberFormatException e) {
-                            LOGGER.info("Exception while setting column widths. Choosing default.", e);
+                            Logger.info(this, "Exception while setting column widths. Choosing default.", e);
                             cm.getColumn(i).setPreferredWidth(BibtexSingleField.DEFAULT_FIELD_LENGTH);
                         }
                         break;
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java b/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java
index ad1b9fc94018..b9538b8222a7 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java
@@ -48,15 +48,13 @@
 import ca.odell.glazedlists.EventList;
 import ca.odell.glazedlists.event.ListEvent;
 import ca.odell.glazedlists.event.ListEventListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * List event, mouse, key and focus listener for the main table that makes up the
  * most part of the BasePanel for a single BIB database.
  */
 public class MainTableSelectionListener implements ListEventListener<BibEntry>, MouseListener, KeyListener, FocusListener {
-    private static final Log LOGGER = LogFactory.getLog(MainTableSelectionListener.class);
 
     private final MainTable table;
     private final BasePanel panel;
@@ -298,7 +296,7 @@ public void mouseClicked(MouseEvent e) {
                                 JabRefDesktop.openExternalViewer(panel.getBibDatabaseContext(), link, fieldName);
                             } catch (IOException ex) {
                                 panel.output(Localization.lang("Unable to open link."));
-                                LOGGER.info("Unable to open link", ex);
+                                Logger.info(this, "Unable to open link", ex);
                             }
                         }
                         break; // only open the first link
diff --git a/src/main/java/org/jabref/gui/menus/RightClickMenu.java b/src/main/java/org/jabref/gui/menus/RightClickMenu.java
index 845bbef351ec..7b4e09782509 100644
--- a/src/main/java/org/jabref/gui/menus/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/menus/RightClickMenu.java
@@ -38,11 +38,9 @@
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreviewPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class RightClickMenu extends JPopupMenu implements PopupMenuListener {
-    private static final Log LOGGER = LogFactory.getLog(RightClickMenu.class);
 
     private final BasePanel panel;
     private final JMenuItem groupAdd;
@@ -311,7 +309,7 @@ public void actionPerformed(ActionEvent e) {
             try {
                 panel.runCommand(command);
             } catch (Throwable ex) {
-                LOGGER.debug("Cannot execute command " + command + ".", ex);
+                Logger.debug(this, "Cannot execute command " + command + ".", ex);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java b/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
index a27e51a08928..ca6d4b073246 100644
--- a/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
+++ b/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
@@ -13,12 +13,10 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class EntryFetchAndMergeWorker extends SwingWorker<Optional<BibEntry>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryFetchAndMergeWorker.class);
 
     private final BasePanel panel;
     private final BibEntry entry;
@@ -36,7 +34,7 @@ protected Optional<BibEntry> doInBackground() throws Exception {
             List<BibEntry> fetchedEntries = fetcher.performSearch(entry);
             return fetchedEntries.stream().findFirst();
         } catch (FetcherException e) {
-            LOGGER.error("Info cannot be found", e);
+            Logger.error(this, "Info cannot be found", e);
             return Optional.empty();
         }
     }
@@ -57,7 +55,7 @@ protected void done() {
                 panel.frame().setStatus(Localization.lang("Could not find any bibliographic information."));
             }
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while fetching Entry", e);
+            Logger.error(this, "Error while fetching Entry", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
index 4ab8b3daac42..7307d3f5422f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
@@ -15,12 +15,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class FetchAndMergeWorker extends SwingWorker<Optional<BibEntry>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(FetchAndMergeWorker.class);
 
     private final BasePanel panel;
     private final BibEntry entry;
@@ -48,7 +46,7 @@ protected Optional<BibEntry> doInBackground() throws Exception {
                 return Optional.empty();
             }
         } catch (FetcherException e) {
-            LOGGER.error("Info cannot be found", e);
+            Logger.error(this, "Info cannot be found", e);
             return Optional.empty();
         }
     }
@@ -69,7 +67,7 @@ protected void done() {
                 panel.frame().setStatus(Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
             }
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while fetching Entry", e);
+            Logger.error(this, "Error while fetching Entry", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
index c3cc49260a7b..6e4291e348c9 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
@@ -40,12 +40,11 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.ColumnSpec;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.layout.RowSpec;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * @author Oscar Gustafsson
@@ -55,7 +54,6 @@
 
 public class MergeEntries {
 
-    private static final Log LOGGER = LogFactory.getLog(MergeEntries.class);
 
 
     private static final String MARGIN = "10px";
@@ -444,7 +442,7 @@ private void updateAll() {
             new BibEntryWriter(new LatexFieldFormatter(Globals.prefs.getLatexFieldFormatterPreferences()),
                     false).write(mergedEntry, writer, databaseType);
         } catch (IOException ex) {
-            LOGGER.error("Error in entry", ex);
+            Logger.error(this, "Error in entry", ex);
         }
         sourceView.setText(writer.getBuffer().toString());
         sourceView.setCaretPosition(0);
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationManager.java b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
index 47a90885688a..33a49009e195 100644
--- a/src/main/java/org/jabref/gui/openoffice/CitationManager.java
+++ b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
@@ -29,6 +29,7 @@
 import ca.odell.glazedlists.EventList;
 import ca.odell.glazedlists.gui.TableFormat;
 import ca.odell.glazedlists.swing.DefaultEventTableModel;
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
@@ -40,15 +41,12 @@
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Dialog for modifying existing citations.
  */
 class CitationManager {
 
-    private static final Log LOGGER = LogFactory.getLog(CitationManager.class);
     private final OOBibBase ooBase;
     private final JDialog diag;
     private final EventList<CitationEntry> list;
@@ -93,7 +91,7 @@ public CitationManager(final JabRefFrame frame, OOBibBase ooBase)
                 storeSettings();
             } catch (UnknownPropertyException | NotRemoveableException | PropertyExistException | IllegalTypeException |
                     IllegalArgumentException ex) {
-                LOGGER.warn("Problem modifying citation", ex);
+                Logger.warn(this, "Problem modifying citation", ex);
                 JOptionPane.showMessageDialog(frame, Localization.lang("Problem modifying citation"));
             }
             diag.dispose();
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index cefd592556db..1aef652ae9da 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -44,6 +44,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
+import com.jcabi.log.Logger;
 import com.sun.star.awt.Point;
 import com.sun.star.beans.IllegalTypeException;
 import com.sun.star.beans.NotRemoveableException;
@@ -89,8 +90,6 @@
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Class for manipulating the Bibliography of the currently start document in OpenOffice.
@@ -110,7 +109,6 @@ class OOBibBase {
     private static final int AUTHORYEAR_INTEXT = 2;
     private static final int INVISIBLE_CIT = 3;
 
-    private static final Log LOGGER = LogFactory.getLog(OOBibBase.class);
     private XMultiServiceFactory mxDocFactory;
     private XTextDocument mxDoc;
     private XText text;
@@ -167,7 +165,7 @@ public Optional<String> getCurrentDocumentTitle() {
                 return Optional
                         .of(String.valueOf(OOUtil.getProperty(mxDoc.getCurrentController().getFrame(), "Title")));
             } catch (UnknownPropertyException | WrappedTargetException e) {
-                LOGGER.warn("Could not get document title", e);
+                Logger.warn(this, "Could not get document title", e);
                 return Optional.empty();
             }
         }
@@ -225,12 +223,12 @@ private XDesktop simpleBootstrap(String pathToExecutable)
                 method.setAccessible(true);
                 method.invoke(cl, new File(pathToExecutable).toURI().toURL());
             } catch (SecurityException | NoSuchMethodException | MalformedURLException t) {
-                LOGGER.error("Error, could not add URL to system classloader", t);
+                Logger.error(this, "Error, could not add URL to system classloader", t);
                 cl.close();
                 throw new IOException("Error, could not add URL to system classloader", t);
             }
         } else {
-            LOGGER.error("Error occured, URLClassLoader expected but " + loader.getClass()
+            Logger.error(this, "Error occured, URLClassLoader expected but " + loader.getClass()
                     + " received. Could not continue.");
         }
 
@@ -344,7 +342,7 @@ public void insertEntry(List<BibEntry> entries, BibDatabase database,
 
             // If we should store metadata for page info, do that now:
             if (pageInfo != null) {
-                LOGGER.info("Storing page info: " + pageInfo);
+                Logger.info(this, "Storing page info: " + pageInfo);
                 setCustomProperty(bName, pageInfo);
             }
 
@@ -510,8 +508,8 @@ private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOB
                     if (tmpEntry.isPresent()) {
                         cEntries[j] = tmpEntry.get();
                     } else {
-                        LOGGER.info("BibTeX key not found: '" + keys[j] + '\'');
-                        LOGGER.info("Problem with reference mark: '" + names.get(i) + '\'');
+                        Logger.info(this, "BibTeX key not found: '" + keys[j] + '\'');
+                        Logger.info(this, "Problem with reference mark: '" + names.get(i) + '\'');
                         cEntries[j] = new UndefinedBibtexEntry(keys[j]);
                     }
                 }
@@ -880,8 +878,8 @@ private Map<BibEntry, BibDatabase> getSortedEntriesFromSortedRefMarks(List<Strin
                             newList.put(origEntry.get(), database);
                         }
                     } else {
-                        LOGGER.info("BibTeX key not found: '" + key + "'");
-                        LOGGER.info("Problem with reference mark: '" + name + "'");
+                        Logger.info(this, "BibTeX key not found: '" + key + "'");
+                        Logger.info(this, "Problem with reference mark: '" + name + "'");
                         newList.put(new UndefinedBibtexEntry(key), null);
                     }
                 }
@@ -954,7 +952,7 @@ public String getCitationContext(XNameAccess nameAccess, String refMarkName, int
                     break;
                 }
             } catch (IndexOutOfBoundsException ex) {
-                LOGGER.warn("Problem going left", ex);
+                Logger.warn(this, "Problem going left", ex);
             }
         }
         int length = cursor.getString().length();
@@ -970,7 +968,7 @@ public String getCitationContext(XNameAccess nameAccess, String refMarkName, int
                     }
                 }
             } catch (IndexOutOfBoundsException ex) {
-                LOGGER.warn("Problem going right", ex);
+                Logger.warn(this, "Problem going right", ex);
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index 81e76f6f6f45..47a0663cc51c 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -65,6 +65,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
@@ -76,7 +77,6 @@
 import com.sun.star.comp.helper.BootstrapException;
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.lang.WrappedTargetException;
-import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
@@ -85,7 +85,6 @@
  * between JabRef and OpenOffice.
  */
 public class OpenOfficePanel extends AbstractWorker {
-    private static final Log LOGGER = LogFactory.getLog(OpenOfficePanel.class);
 
     private OpenOfficeSidePanel sidePane;
     private JDialog diag;
@@ -156,7 +155,7 @@ private void initPanel() {
                     NoSuchElementException | NoDocumentException ex) {
                 JOptionPane.showMessageDialog(frame, ex.getMessage(), Localization.lang("Error"),
                         JOptionPane.ERROR_MESSAGE);
-                LOGGER.warn("Problem connecting", ex);
+                Logger.warn(this, "Problem connecting", ex);
             }
 
         });
@@ -172,7 +171,7 @@ private void initPanel() {
                 try {
                     style.ensureUpToDate();
                 } catch (IOException e) {
-                    LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", e);
+                    Logger.warn(this, "Unable to reload style file '" + style.getPath() + "'", e);
                 }
                 frame.setStatus(Localization.lang("Current style is '%0'", style.getName()));
             });
@@ -224,17 +223,17 @@ public void actionPerformed(ActionEvent e) {
                             Localization
                                     .lang("You must select either a valid style file, or use one of the default styles."),
                             Localization.lang("No valid style file defined"), JOptionPane.ERROR_MESSAGE);
-                    LOGGER.warn("Problem with style file", ex);
+                    Logger.warn(this, "Problem with style file", ex);
                 } catch (BibEntryNotFoundException ex) {
                     JOptionPane.showMessageDialog(frame,
                             Localization.lang(
                                     "Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
                                     ex.getBibtexKey()),
                             Localization.lang("Unable to synchronize bibliography"), JOptionPane.ERROR_MESSAGE);
-                    LOGGER.debug("BibEntry not found", ex);
+                    Logger.debug(this, "BibEntry not found", ex);
                 } catch (com.sun.star.lang.IllegalArgumentException | PropertyVetoException | UnknownPropertyException | WrappedTargetException | NoSuchElementException |
                         CreationException ex) {
-                    LOGGER.warn("Could not update bibliography", ex);
+                    Logger.warn(this, "Could not update bibliography", ex);
                 }
             }
         };
@@ -249,7 +248,7 @@ public void actionPerformed(ActionEvent e) {
             } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
                     CreationException | NoSuchElementException | WrappedTargetException | IOException |
                     BibEntryNotFoundException ex) {
-                LOGGER.warn("Problem combining cite markers", ex);
+                Logger.warn(this, "Problem combining cite markers", ex);
             }
 
         });
@@ -259,7 +258,7 @@ public void actionPerformed(ActionEvent e) {
                 CitationManager cm = new CitationManager(frame, ooBase);
                 cm.showDialog();
             } catch (NoSuchElementException | WrappedTargetException | UnknownPropertyException ex) {
-                LOGGER.warn("Problem showing citation manager", ex);
+                Logger.warn(this, "Problem showing citation manager", ex);
             }
         });
 
@@ -342,11 +341,11 @@ private void exportEntries() {
                             "Your OpenOffice/LibreOffice document references the BibTeX key '%0', which could not be found in your current library.",
                             ex.getBibtexKey()),
                     Localization.lang("Unable to synchronize bibliography"), JOptionPane.ERROR_MESSAGE);
-            LOGGER.debug("BibEntry not found", ex);
+            Logger.debug(this, "BibEntry not found", ex);
         } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
                 UndefinedCharacterFormatException | NoSuchElementException | WrappedTargetException | IOException |
                 CreationException e) {
-            LOGGER.warn("Problem generating new database.", e);
+            Logger.warn(this, "Problem generating new database.", e);
         }
 
     }
@@ -413,12 +412,12 @@ private void connect(boolean autoDetect) {
             exportCitations.setEnabled(true);
 
         } catch (UnsatisfiedLinkError e) {
-            LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", e);
+            Logger.warn(this, "Could not connect to running OpenOffice/LibreOffice", e);
             JOptionPane.showMessageDialog(frame,
                     Localization.lang("Unable to connect. One possible reason is that JabRef "
                             + "and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode."));
         } catch (IOException e) {
-            LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", e);
+            Logger.warn(this, "Could not connect to running OpenOffice/LibreOffice", e);
             JOptionPane.showMessageDialog(frame,
                     Localization.lang("Could not connect to running OpenOffice/LibreOffice.") + "\n"
                             + Localization.lang("Make sure you have installed OpenOffice/LibreOffice with Java support.") + "\n"
@@ -469,7 +468,7 @@ private static void addURL(List<URL> jarList) throws IOException {
             }
         } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException |
                 InvocationTargetException e) {
-            LOGGER.error("Could not add URL to system classloader", e);
+            LogFactory.getLog(OpenOfficePanel.class).error("Could not add URL to system classloader", e);
             throw new IOException("Error, could not add URL to system classloader", e);
 
         }
@@ -605,7 +604,7 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
                             Localization
                                     .lang("You must select either a valid style file, or use one of the default styles."),
                             Localization.lang("No valid style file defined"), JOptionPane.ERROR_MESSAGE);
-                    LOGGER.warn("Problem with style file", ex);
+                    Logger.warn(this, "Problem with style file", ex);
                 } catch (ConnectionLostException ex) {
                     showConnectionLostErrorMessage();
                 } catch (UndefinedCharacterFormatException ex) {
@@ -616,7 +615,7 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
                         CreationException | NoSuchElementException | WrappedTargetException | IOException |
                         BibEntryNotFoundException | IllegalTypeException | PropertyExistException |
                         NotRemoveableException ex) {
-                    LOGGER.warn("Could not insert entry", ex);
+                    Logger.warn(this, "Could not insert entry", ex);
                 }
             }
 
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index 1114df09da30..985568be6ba6 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -66,18 +66,16 @@
 import ca.odell.glazedlists.swing.DefaultEventSelectionModel;
 import ca.odell.glazedlists.swing.DefaultEventTableModel;
 import ca.odell.glazedlists.swing.GlazedListsSwing;
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * This class produces a dialog box for choosing a style file.
  */
 class StyleSelectDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(StyleSelectDialog.class);
 
     private final JabRefFrame frame;
     private EventList<OOBibStyle> styles;
@@ -260,7 +258,7 @@ private void setupPopupMenu() {
                             new UnknownExternalFileType("jstyle"));
                 }
             } catch (IOException e) {
-                LOGGER.warn("Problem open style file editor", e);
+                Logger.warn(this, "Problem open style file editor", e);
             }
         }));
 
@@ -273,7 +271,7 @@ private void setupPopupMenu() {
                     Localization.lang("Are you sure you want to remove the style?"), Localization.lang("Remove style"),
                     JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)) {
                 if (!loader.removeStyle(style)) {
-                    LOGGER.info("Problem removing style");
+                    Logger.info(this, "Problem removing style");
                 }
                 updateStyles();
             }
@@ -286,7 +284,7 @@ private void setupPopupMenu() {
             try {
                 style.ensureUpToDate();
             } catch (IOException e) {
-                LOGGER.warn("Problem with style file '" + style.getPath() + "'", e);
+                Logger.warn(this, "Problem with style file '" + style.getPath() + "'", e);
             }
         }));
 
diff --git a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
index 6ce4035ede6b..de7c07a7aaa1 100644
--- a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
+++ b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
@@ -88,9 +88,8 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * import from plain text => simple mark/copy/paste into bibtex entry
@@ -104,7 +103,6 @@
  */
 public class TextInputDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(TextInputDialog.class);
 
     private final JButton okButton = new JButton(Localization.lang("Accept"));
     private final JButton cancelButton = new JButton(Localization.lang("Cancel"));
@@ -200,7 +198,7 @@ private void initRawPanel() {
         try {
             document.insertString(0, "", document.getStyle("regular"));
         } catch (BadLocationException ex) {
-            LOGGER.warn("Problem setting style", ex);
+            Logger.warn(this, "Problem setting style", ex);
 
         }
 
@@ -500,7 +498,7 @@ private void updateSourceView() {
                     false).write(entry, sw, frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
             sourcePreview.setText(sw.getBuffer().toString());
         } catch (IOException ex) {
-            LOGGER.error("Error in entry" + ": " + ex.getMessage(), ex);
+            Logger.error(this, "Error in entry" + ": " + ex.getMessage(), ex);
         }
 
         fieldList.clearSelection();
@@ -541,7 +539,7 @@ public void actionPerformed(ActionEvent e) {
             try {
                 document.insertString(cPos, data, document.getStyle("regular"));
             } catch (BadLocationException ex) {
-                LOGGER.warn("Could not paste text", ex);
+                Logger.warn(this, "Could not paste text", ex);
             }
         }
     }
@@ -576,7 +574,7 @@ public void actionPerformed(ActionEvent e) {
                     }
                 }
             } catch (BadLocationException | IOException ex) {
-                LOGGER.warn("Problem reading or inserting file", ex);
+                Logger.warn(this, "Problem reading or inserting file", ex);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
index 1031b1b54504..582e5d71e5e0 100644
--- a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
@@ -22,14 +22,12 @@
 import org.jabref.logic.util.OS;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 class AppearancePrefsTab extends JPanel implements PrefsTab {
-    private static final Log LOGGER = LogFactory.getLog(AppearancePrefsTab.class);
 
     private final JabRefPreferences prefs;
 
@@ -302,7 +300,7 @@ public void storeSettings() {
             prefs.putInt(JabRefPreferences.TABLE_ROW_PADDING, padding);
         } catch (NumberFormatException ex) {
             // should not happen as values are checked beforehand
-            LOGGER.error("Invalid data value, integer expected", ex);
+            Logger.error(this, "Invalid data value, integer expected", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
index 156bbe872b15..ee85e95470e4 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
@@ -42,9 +42,8 @@
 import org.jabref.preferences.JabRefPreferencesFilter;
 import org.jabref.shared.prefs.SharedDatabasePreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Preferences dialog. Contains a TabbedPane, and tabs will be defined in
@@ -57,7 +56,6 @@
  */
 public class PreferencesDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(PreferencesDialog.class);
 
     private final JPanel main;
 
@@ -180,7 +178,7 @@ public PreferencesDialog(JabRefFrame parent) {
                             Localization.lang("Import preferences"), JOptionPane.WARNING_MESSAGE);
                     this.dispose();
                 } catch (JabRefException ex) {
-                    LOGGER.warn(ex.getMessage(), ex);
+                    Logger.warn(this, ex.getMessage(), ex);
                     JOptionPane.showMessageDialog(PreferencesDialog.this, ex.getLocalizedMessage(),
                             Localization.lang("Import preferences"), JOptionPane.ERROR_MESSAGE);
                 }
@@ -200,7 +198,7 @@ public PreferencesDialog(JabRefFrame parent) {
                             Localization.lang("You must restart JabRef for this to come into effect."),
                             Localization.lang("Reset preferences"), JOptionPane.WARNING_MESSAGE);
                 } catch (BackingStoreException ex) {
-                    LOGGER.warn(ex.getMessage(), ex);
+                    Logger.warn(this, ex.getMessage(), ex);
                     JOptionPane.showMessageDialog(PreferencesDialog.this, ex.getLocalizedMessage(),
                             Localization.lang("Reset preferences"), JOptionPane.ERROR_MESSAGE);
                 }
@@ -303,7 +301,7 @@ public void actionPerformed(ActionEvent e) {
                     Globals.prefs.exportPreferences(exportFile.toString());
                     Globals.prefs.put(JabRefPreferences.PREFS_EXPORT_PATH, exportFile.toString());
                 } catch (JabRefException ex) {
-                    LOGGER.warn(ex.getMessage(), ex);
+                    Logger.warn(this, ex.getMessage(), ex);
                     JOptionPane.showMessageDialog(PreferencesDialog.this, ex.getLocalizedMessage(),
                             Localization.lang("Export preferences"), JOptionPane.WARNING_MESSAGE);
                 }
diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
index 7cc668414210..2d8bd689e3bc 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
@@ -27,15 +27,13 @@
 import org.jabref.logic.util.TestEntry;
 import org.jabref.preferences.PreviewPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.factories.Paddings;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class PreviewPrefsTab extends JPanel implements PrefsTab {
 
-    private static final Log LOGGER = LogFactory.getLog(PreviewPrefsTab.class);
 
     private SwingWorker<List<CitationStyle>, Void> discoverCitationStyleWorker;
 
@@ -121,7 +119,7 @@ private void setupLogic() {
                 testPane.setPreferredSize(new Dimension(800, 350));
                 JOptionPane.showMessageDialog(PreviewPrefsTab.this, new JScrollPane(testPane), Localization.lang("Preview"), JOptionPane.PLAIN_MESSAGE);
             } catch (StringIndexOutOfBoundsException exception) {
-                LOGGER.warn("Parsing error.", exception);
+                Logger.warn(this, "Parsing error.", exception);
                 JOptionPane.showMessageDialog(null,
                         Localization.lang("Parsing error") + ": " + Localization.lang("illegal backslash expression")
                                 + ".\n" + exception.getMessage(),
@@ -173,7 +171,7 @@ public void setValues() {
                 chosenModel.addElement(CitationStyle.createCitationStyleFromFile(style));
             } else {
                 if (isPreviewChosen) {
-                    LOGGER.error("Preview is already in the list, something went wrong");
+                    Logger.error(this, "Preview is already in the list, something went wrong");
                     continue;
                 }
                 isPreviewChosen = true;
@@ -214,7 +212,7 @@ public void done() {
 
                     btnRight.setEnabled(!availableModel.isEmpty());
                 } catch (InterruptedException | ExecutionException e) {
-                    LOGGER.error("something went wrong while adding the discovered CitationStyles to the list ");
+                    Logger.error(this, "something went wrong while adding the discovered CitationStyles to the list ");
                 }
             }
         };
diff --git a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java b/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
index 5176a32b1a37..35380fe04505 100644
--- a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
@@ -44,15 +44,13 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 class TableColumnsTab extends JPanel implements PrefsTab {
 
-    private static final Log LOGGER = LogFactory.getLog(TableColumnsTab.class);
 
     private final JabRefPreferences prefs;
     private boolean tableChanged;
@@ -664,7 +662,7 @@ public void actionPerformed(ActionEvent e) {
                         }
                     }
                 } catch (Throwable ex) {
-                    LOGGER.warn("Problem with table columns", ex);
+                    Logger.warn(this, "Problem with table columns", ex);
                 }
                 colSetup.revalidate();
                 colSetup.repaint();
diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
index 7ff7856fa6b6..94cc81998da0 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
+++ b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
@@ -56,18 +56,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * This class produces a dialog box for managing term list files.
  */
 public class ProtectedTermsDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(ProtectedTermsDialog.class);
 
     private final JabRefFrame frame;
     private JDialog diag;
@@ -244,7 +242,7 @@ private void setupPopupMenu() {
                     }
                 }
             } catch (IOException e) {
-                LOGGER.warn("Problem open protected terms file editor", e);
+                Logger.warn(this, "Problem open protected terms file editor", e);
             }
         }));
 
@@ -259,7 +257,7 @@ private void setupPopupMenu() {
                     Localization.lang("Remove protected terms file"),
                     JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)) {
                 if (!loader.removeProtectedTermsList(list)) {
-                    LOGGER.info("Problem removing protected terms file");
+                    Logger.info(this, "Problem removing protected terms file");
                 }
                 tableModel.fireTableDataChanged();
             }
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index a7d872427d02..c26cf78b283e 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -20,17 +20,15 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.jcabi.log.Logger;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Abstract class for pushing entries into different editors.
  */
 public abstract class AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(AbstractPushToApplication.class);
 
     protected boolean couldNotCall; // Set to true in case the command could not be executed, e.g., if the file is not found
     protected boolean couldNotConnect; // Set to true in case the tunnel to the program (if one is used) does not operate
@@ -81,7 +79,7 @@ public void pushEntries(BibDatabase database, List<BibEntry> entries, String key
         catch (IOException excep) {
             couldNotCall = true;
 
-            LOGGER.warn("Error: Could not call executable '" + commandPath + "'.", excep);
+            Logger.warn(this, "Error: Could not call executable '" + commandPath + "'.", excep);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacs.java b/src/main/java/org/jabref/gui/push/PushToEmacs.java
index 7dacedf2a972..c88c23697932 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacs.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacs.java
@@ -20,12 +20,10 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class PushToEmacs extends AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(PushToEmacs.class);
 
     private final JTextField additionalParams = new JTextField(30);
 
@@ -109,20 +107,20 @@ public void pushEntries(BibDatabase database, List<BibEntry> entries, String key
                             sb.append((char) c);
                         }
                     } catch (IOException e) {
-                        LOGGER.warn("Could not read from stderr.", e);
+                        Logger.warn(this, "Could not read from stderr.", e);
                     }
                     // Error stream has been closed. See if there were any errors:
                     if (!sb.toString().trim().isEmpty()) {
-                        LOGGER.warn("Push to Emacs error: " + sb);
+                        Logger.warn(this, "Push to Emacs error: " + sb);
                         couldNotConnect = true;
                     }
                 } catch (IOException e) {
-                    LOGGER.warn("File problem.", e);
+                    Logger.warn(this, "File problem.", e);
                 }
             });
         } catch (IOException excep) {
             couldNotCall = true;
-            LOGGER.warn("Problem pushing to Emacs.", excep);
+            Logger.warn(this, "Problem pushing to Emacs.", excep);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/src/main/java/org/jabref/gui/push/PushToLyx.java
index f766c3573f6d..a79cda65ea56 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyx.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyx.java
@@ -20,12 +20,10 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class PushToLyx extends AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(PushToLyx.class);
 
     @Override
     public String getApplicationName() {
@@ -107,7 +105,7 @@ public void pushEntries(BibDatabase database, final List<BibEntry> entries, fina
                 fw.close();
             } catch (IOException excep) {
                 couldNotCall = true;
-                LOGGER.warn("Problem pushing to LyX/Kile.", excep);
+                Logger.warn(this, "Problem pushing to LyX/Kile.", excep);
             }
         });
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToVim.java b/src/main/java/org/jabref/gui/push/PushToVim.java
index 1077ec6dfa7b..2515bf07fae2 100644
--- a/src/main/java/org/jabref/gui/push/PushToVim.java
+++ b/src/main/java/org/jabref/gui/push/PushToVim.java
@@ -19,12 +19,10 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class PushToVim extends AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(PushToVim.class);
 
     private final JTextField vimServer = new JTextField(30);
 
@@ -91,20 +89,20 @@ public void pushEntries(BibDatabase database, List<BibEntry> entries, String key
                             sb.append((char) c);
                         }
                     } catch (IOException e) {
-                        LOGGER.warn("Could not read from stderr.", e);
+                        Logger.warn(this, "Could not read from stderr.", e);
                     }
                     // Error stream has been closed. See if there were any errors:
                     if (!sb.toString().trim().isEmpty()) {
-                        LOGGER.warn("Push to Vim error: " + sb);
+                        Logger.warn(this, "Push to Vim error: " + sb);
                         couldNotConnect = true;
                     }
                 } catch (IOException e) {
-                    LOGGER.warn("File problem.", e);
+                    Logger.warn(this, "File problem.", e);
                 }
             });
         } catch (IOException excep) {
             couldNotCall = true;
-            LOGGER.warn("Problem pushing to Vim.", excep);
+            Logger.warn(this, "Problem pushing to Vim.", excep);
         }
 
     }
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java b/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java
index 40ba9aee8bb9..8e141f461ae9 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java
@@ -15,12 +15,10 @@
 import org.jabref.logic.search.SearchQuery;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class GlobalSearchWorker extends SwingWorker<Map<BasePanel, List<BibEntry>>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(GlobalSearchWorker.class);
 
     private final JabRefFrame frame;
     private final SearchQuery searchQuery;
@@ -61,7 +59,7 @@ protected void done() {
             dialog.selectFirstEntry();
             dialog.setVisible(true);
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("something went wrong during the search", e);
+            Logger.error(this, "something went wrong during the search", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
index 7df262a9585e..c7ee4556b24e 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultFrame.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
@@ -72,8 +72,7 @@
 import ca.odell.glazedlists.swing.DefaultEventTableModel;
 import ca.odell.glazedlists.swing.GlazedListsSwing;
 import ca.odell.glazedlists.swing.TableComparatorChooser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Dialog to display search results, potentially from more than one BasePanel, with
@@ -89,7 +88,6 @@ public class SearchResultFrame {
     private static final int URL_COL = 2;
     private static final int PAD = 3;
 
-    private static final Log LOGGER = LogFactory.getLog(SearchResultFrame.class);
 
     private final JabRefFrame frame;
     private JFrame searchResultFrame;
@@ -480,7 +478,7 @@ public void mouseClicked(MouseEvent e) {
                     entry.getField(FieldName.URL).ifPresent(link -> { try {
                         JabRefDesktop.openExternalViewer(p.getBibDatabaseContext(), link, FieldName.URL);
                     } catch (IOException ex) {
-                            LOGGER.warn("Could not open viewer", ex);
+                            Logger.warn(this, "Could not open viewer", ex);
                         }
                     });
                     break;
diff --git a/src/main/java/org/jabref/gui/search/SearchWorker.java b/src/main/java/org/jabref/gui/search/SearchWorker.java
index 75656c51885f..580fd5b75d56 100644
--- a/src/main/java/org/jabref/gui/search/SearchWorker.java
+++ b/src/main/java/org/jabref/gui/search/SearchWorker.java
@@ -15,8 +15,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 
 /**
@@ -24,7 +23,6 @@
  */
 class SearchWorker extends SwingWorker<List<BibEntry>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(SearchWorker.class);
 
     private final BasePanel basePanel;
     private final BibDatabase database;
@@ -37,7 +35,7 @@ public SearchWorker(BasePanel basePanel, SearchQuery searchQuery, SearchDisplayM
         this.database = Objects.requireNonNull(basePanel.getDatabase());
         this.searchQuery = Objects.requireNonNull(searchQuery);
         this.searchDisplayMode = Objects.requireNonNull(searchDisplayMode);
-        LOGGER.debug("Search (" + this.searchDisplayMode.getDisplayName() + "): " + this.searchQuery);
+        Logger.debug(this, "Search (" + this.searchDisplayMode.getDisplayName() + "): " + this.searchQuery);
     }
 
     @Override
@@ -56,7 +54,7 @@ protected void done() {
         try {
             updateUIWithSearchResult(get());
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("something went wrong during the search", e);
+            Logger.error(this, "something went wrong during the search", e);
         }
     }
 
@@ -88,7 +86,7 @@ private void updateUIWithSearchResult(List<BibEntry> matchedEntries) {
                 basePanel.getMainTable().getTableModel().updateSearchState(MainTableDataModel.DisplayOption.FILTER);
                 break;
             default:
-                LOGGER.error("Following searchDisplayMode was not defined: " + searchDisplayMode);
+                Logger.error(this, "Following searchDisplayMode was not defined: " + searchDisplayMode);
                 break;
         }
 
diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
index 5d181cafd5ad..4a15591cd979 100644
--- a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
+++ b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
@@ -57,12 +57,10 @@
 import org.jabref.shared.prefs.SharedDatabasePreferences;
 import org.jabref.shared.security.Password;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ConnectToSharedDatabaseDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(ConnectToSharedDatabaseDialog.class);
 
     private final JabRefFrame frame;
 
@@ -147,7 +145,7 @@ public void openSharedDatabase() {
                 try {
                     new SaveDatabaseAction(panel, Paths.get(fileLocationField.getText())).runCommand();
                 } catch (Throwable e) {
-                    LOGGER.error("Error while saving the database", e);
+                    Logger.error(this, "Error while saving the database", e);
                 }
             }
 
@@ -254,7 +252,7 @@ private void applyPreferences() {
                 passwordField.setText(
                         new Password(sharedDatabasePassword.get().toCharArray(), sharedDatabaseUser.get()).decrypt());
             } catch (GeneralSecurityException | UnsupportedEncodingException e) {
-                LOGGER.error("Could not read the password due to decryption problems.", e);
+                Logger.error(this, "Could not read the password due to decryption problems.", e);
             }
         }
 
@@ -402,7 +400,7 @@ private void setPreferences() {
             try {
                 prefs.setPassword(new Password(passwordField.getPassword(), userField.getText()).encrypt());
             } catch (GeneralSecurityException | UnsupportedEncodingException e) {
-                LOGGER.error("Could not store the password due to encryption problems.", e);
+                Logger.error(this, "Could not store the password due to encryption problems.", e);
             }
         } else {
             prefs.clearPassword(); // for the case that the password is already set
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
index bed9b589bc7d..9a66c4607f8e 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
@@ -14,12 +14,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.specialfields.SpecialField;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class SpecialFieldAction implements BaseAction {
 
-    private static final Log LOGGER = LogFactory.getLog(SpecialFieldAction.class);
     private final JabRefFrame frame;
     private final SpecialField specialField;
     private final String value;
@@ -76,7 +74,7 @@ public void action() {
                 // even no output message
             }
         } catch (Throwable ex) {
-            LOGGER.error("Problem setting special fields", ex);
+            Logger.error(this, "Problem setting special fields", ex);
         }
     }
 
@@ -97,7 +95,7 @@ private String getTextDone(SpecialField field, String... params) {
             return Localization.lang("Cleared '%0' for %1 entries", viewModel.getLocalization(), params[0]);
         } else {
             // invalid usage
-            LOGGER.info("Creation of special field status change message failed: illegal argument combination.");
+            Logger.info(this, "Creation of special field status change message failed: illegal argument combination.");
             return "";
         }
     }
diff --git a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
index d288e81b9d5d..02a46352d0fb 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
@@ -5,8 +5,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This class represents a change in any field value. The relevant
@@ -14,7 +13,6 @@
  * new value. Old/new values can be null.
  */
 public class UndoableFieldChange extends AbstractUndoableJabRefEdit {
-    private static final Log LOGGER = LogFactory.getLog(UndoableFieldChange.class);
 
     private final BibEntry entry;
     private final String field;
@@ -56,7 +54,7 @@ public void undo() {
 
             // this is the only exception explicitly thrown here
         } catch (IllegalArgumentException ex) {
-            LOGGER.info("Cannot perform undo", ex);
+            Logger.info(this, "Cannot perform undo", ex);
         }
     }
 
@@ -73,7 +71,7 @@ public void redo() {
             }
 
         } catch (IllegalArgumentException ex) {
-            LOGGER.info("Cannot perform redo", ex);
+            Logger.info(this, "Cannot perform redo", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java b/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java
index b400199ae991..7a7defe385d1 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java
@@ -6,8 +6,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This class represents the removal of an entry. The constructor needs
@@ -17,7 +16,6 @@
  */
 public class UndoableInsertEntry extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableInsertEntry.class);
     private final BibDatabase base;
     private final BibEntry entry;
 
@@ -46,7 +44,7 @@ public void undo() {
             // If the entry has an editor currently open, we must close it.
             panel.ensureNotShowingBottomPanel(entry);
         } catch (Throwable ex) {
-            LOGGER.warn("Problem to undo `insert entry`", ex);
+            Logger.warn(this, "Problem to undo `insert entry`", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
index 59364a8fb406..312391e7b16c 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
@@ -7,12 +7,10 @@
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class UndoableInsertString extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableInsertString.class);
 
     private final BibDatabase base;
     private final BasePanel panel;
@@ -48,7 +46,7 @@ public void redo() {
         try {
             base.addString(string);
         } catch (KeyCollisionException ex) {
-            LOGGER.warn("Problem to redo `insert entry`", ex);
+            Logger.warn(this, "Problem to redo `insert entry`", ex);
         }
 
         panel.updateStringDialog();
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java
index 805dfc317f38..22bd7bf45d4f 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java
@@ -7,8 +7,7 @@
 import org.jabref.model.entry.event.EntryEventSource;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This class represents the removal of an entry. The constructor needs
@@ -18,7 +17,6 @@
  */
 public class UndoableRemoveEntry extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableRemoveEntry.class);
     private final BibDatabase base;
     private final BibEntry entry;
 
@@ -53,7 +51,7 @@ public void redo() {
             // If the entry has an editor currently open, we must close it.
             panel.ensureNotShowingBottomPanel(entry);
         } catch (Throwable ex) {
-            LOGGER.warn("Problem to redo `remove entry`", ex);
+            Logger.warn(this, "Problem to redo `remove entry`", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
index 57e0bc5ddf41..5aab0069835b 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
@@ -7,12 +7,10 @@
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class UndoableRemoveString extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableRemoveString.class);
     private final BibDatabase base;
     private final BibtexString string;
 
@@ -38,7 +36,7 @@ public void undo() {
         try {
             base.addString(string);
         } catch (KeyCollisionException ex) {
-            LOGGER.warn("Problem to undo `remove string`", ex);
+            Logger.warn(this, "Problem to undo `remove string`", ex);
         }
 
         panel.updateStringDialog();
diff --git a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
index e82e30df1eb4..d97935d11cd1 100644
--- a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
@@ -4,8 +4,7 @@
 
 import org.jabref.gui.externalfiles.FileDownloadTask;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Implementation of {@link TaskExecutor} that runs every task on the current thread, i.e. in a sequential order.
@@ -14,7 +13,6 @@
  */
 public class CurrentThreadTaskExecutor implements TaskExecutor {
 
-    private static final Log LOGGER = LogFactory.getLog(CurrentThreadTaskExecutor.class);
 
     /**
      * Executes the task on the current thread.
@@ -38,7 +36,7 @@ public <V> void execute(BackgroundTask<V> task) {
             if (onException != null) {
                 onException.accept(exception);
             } else {
-                LOGGER.error("Unhandled exception", exception);
+                Logger.error(this, "Unhandled exception", exception);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java b/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
index ee90e87f4f5f..f41020cbc10d 100644
--- a/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
+++ b/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
@@ -10,8 +10,7 @@
 
 import org.jabref.gui.desktop.JabRefDesktop;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -26,7 +25,6 @@
  */
 public class OpenHyperlinksInExternalBrowser implements ChangeListener<Worker.State>, EventListener {
 
-    private static final Log LOGGER = LogFactory.getLog(OpenHyperlinksInExternalBrowser.class);
     private static final String CLICK_EVENT = "click";
     private static final String ANCHOR_TAG = "a";
 
@@ -57,7 +55,7 @@ public void handleEvent(Event event) {
         try {
             JabRefDesktop.openBrowser(href);
         } catch (IOException e) {
-            LOGGER.error(e);
+            Logger.error(this, "error at open browser", e);
         }
         event.preventDefault();
     }
diff --git a/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java b/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java
index 9b7773ebd038..98a2d5583a34 100644
--- a/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java
+++ b/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java
@@ -26,8 +26,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreviewPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Copies the selected entries and formats them with the selected citation style (or preview), then it is copied to the clipboard.
@@ -35,7 +34,6 @@
  */
 public class CitationStyleToClipboardWorker extends SwingWorker<List<String>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(CitationStyleToClipboardWorker.class);
 
     private final BasePanel basePanel;
     private final List<BibEntry> selectedEntries;
@@ -99,7 +97,7 @@ public void done() {
                         transferable = processText(citations);
                         break;
                     default:
-                        LOGGER.warn("unknown output format: '" + outputFormat + "', processing it via the default.");
+                        Logger.warn(this, "unknown output format: '" + outputFormat + "', processing it via the default.");
                         transferable = processText(citations);
                         break;
                 }
@@ -108,7 +106,7 @@ public void done() {
 
             basePanel.frame().setStatus(Localization.lang("Copied %0 citations.", String.valueOf(selectedEntries.size())));
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while copying citations to the clipboard", e);
+            Logger.error(this, "Error while copying citations to the clipboard", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/worker/CitationStyleWorker.java b/src/main/java/org/jabref/gui/worker/CitationStyleWorker.java
index 4a8bbdd629eb..0af59baffb07 100644
--- a/src/main/java/org/jabref/gui/worker/CitationStyleWorker.java
+++ b/src/main/java/org/jabref/gui/worker/CitationStyleWorker.java
@@ -13,8 +13,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 
 /**
@@ -22,7 +21,6 @@
  */
 public class CitationStyleWorker extends SwingWorker<String, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(CitationStyleWorker.class);
 
     private final PreviewPanel previewPanel;
 
@@ -62,7 +60,7 @@ public void done() {
         try {
             text = this.get();
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while generating citation style", e);
+            Logger.error(this, "Error while generating citation style", e);
             text = Localization.lang("Error while generating citation style");
             success = false;
         }
diff --git a/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java b/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java
index a859b3d60998..339ff247c416 100644
--- a/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java
+++ b/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java
@@ -15,12 +15,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.Identifier;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class LookupIdentifiersWorker<T extends Identifier> extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(LookupIdentifiersWorker.class);
     private final JabRefFrame frame;
     private final IdFetcher<T> fetcher;
 
@@ -48,7 +46,7 @@ public void run() {
                 try {
                     identifier = fetcher.findIdentifier(bibEntry);
                 } catch (FetcherException e) {
-                    LOGGER.error("Could not fetch " + fetcher.getIdentifierName(), e);
+                    Logger.error(this, "Could not fetch " + fetcher.getIdentifierName(), e);
                 }
                 if (identifier.isPresent() && !bibEntry.hasField(identifier.get().getDefaultField())) {
                     Optional<FieldChange> fieldChange = bibEntry.setField(identifier.get().getDefaultField(), identifier.get().getNormalized());
diff --git a/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java b/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java
index ed2ed9f93da8..5ac69918c6e0 100644
--- a/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java
+++ b/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java
@@ -15,12 +15,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class MarkEntriesAction extends AbstractWorker implements ActionListener {
 
-    private static final Log LOGGER = LogFactory.getLog(MarkEntriesAction.class);
     private final JabRefFrame frame;
     private final int level;
     private final JMenuItem menuItem;
@@ -50,7 +48,7 @@ public void actionPerformed(ActionEvent actionEvent) {
             getWorker().run();
             getCallBack().update();
         } catch (Throwable t) {
-            LOGGER.warn("Problem marking entries", t);
+            Logger.warn(this, "Problem marking entries", t);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java b/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
index bf939ae2cc2c..b802d39ad4e5 100644
--- a/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
@@ -20,8 +20,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Sends the selected entry as email - by Oliver Kopp
@@ -35,7 +34,6 @@
  */
 public class SendAsEMailAction extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(SendAsEMailAction.class);
     private final JabRefFrame frame;
     private String message;
 
@@ -71,7 +69,7 @@ public void run() {
             try {
                 bibtexEntryWriter.write(entry, sw, panel.getBibDatabaseContext().getMode());
             } catch (IOException e) {
-                LOGGER.warn("Problem creating BibTeX file for mailing.", e);
+                Logger.warn(this, "Problem creating BibTeX file for mailing.", e);
             }
         }
 
@@ -89,7 +87,7 @@ public void run() {
                 try {
                     JabRefDesktop.openFolderAndSelectFile(f.toAbsolutePath());
                 } catch (IOException e) {
-                    LOGGER.debug("Cannot open file", e);
+                    Logger.debug(this, "Cannot open file", e);
                 }
             }
         }
@@ -107,7 +105,7 @@ public void run() {
             uriMailTo = new URI("mailto", mailTo, null);
         } catch (URISyntaxException e1) {
             message = Localization.lang("Error creating email");
-            LOGGER.warn(message, e1);
+            Logger.warn(this, message, e1);
             return;
         }
 
@@ -116,7 +114,7 @@ public void run() {
             desktop.mail(uriMailTo);
         } catch (IOException e) {
             message = Localization.lang("Error creating email");
-            LOGGER.warn(message, e);
+            Logger.warn(this, message, e);
             return;
         }
 
diff --git a/src/main/java/org/jabref/gui/worker/VersionWorker.java b/src/main/java/org/jabref/gui/worker/VersionWorker.java
index c6b853215ff1..de450a3714ae 100644
--- a/src/main/java/org/jabref/gui/worker/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/worker/VersionWorker.java
@@ -15,8 +15,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Version;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 
 /**
@@ -28,7 +27,6 @@
  */
 public class VersionWorker extends SwingWorker<List<Version>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(VersionWorker.class);
 
     private final JabRefFrame mainFrame;
 
@@ -54,7 +52,7 @@ protected List<Version> doInBackground() throws Exception {
         try {
             return Version.getAllAvailableVersions();
         } catch (IOException ioException) {
-            LOGGER.warn("Could not connect to the updateserver.", ioException);
+            Logger.warn(this, "Could not connect to the updateserver.", ioException);
             return Collections.emptyList();
         }
     }
@@ -76,7 +74,7 @@ public void done() {
             }
 
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error("Error while checking for updates", e);
+            Logger.error(this, "Error while checking for updates", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
index 9cc8f4d3510f..31a0a9ba110f 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
@@ -15,8 +15,7 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Saves the given {@link BibDatabaseContext} on every {@link BibDatabaseContextChangedEvent} by posting a new {@link AutosaveEvent}.
@@ -24,7 +23,6 @@
  */
 public class AutosaveManager {
 
-    private static final Log LOGGER = LogFactory.getLog(AutosaveManager.class);
 
     private static Set<AutosaveManager> runningInstances = new HashSet<>();
 
@@ -48,7 +46,7 @@ public synchronized void listen(@SuppressWarnings("unused") BibDatabaseContextCh
                 eventBus.post(new AutosaveEvent());
             });
         } catch (RejectedExecutionException e) {
-            LOGGER.debug("Rejecting autosave while another save process is already running.");
+            Logger.debug(this, "Rejecting autosave while another save process is already running.");
         }
     }
 
@@ -92,8 +90,7 @@ public void unregisterListener(Object listener) {
         try {
             eventBus.unregister(listener);
         } catch (IllegalArgumentException e) {
-            // occurs if the event source has not been registered, should not prevent shutdown
-            LOGGER.debug(e);
+            Logger.debug(this, "occurs if the event source has not been registered, should not prevent shutdown", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
index 15d04bcaddda..7666bddde32c 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
@@ -19,6 +19,7 @@
 import org.jabref.logic.exporter.FileSaveSession;
 import org.jabref.logic.exporter.SaveException;
 import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.util.Version;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
@@ -26,7 +27,7 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 
 /**
@@ -37,7 +38,6 @@
  */
 public class BackupManager {
 
-    private static final Log LOGGER = LogFactory.getLog(BackupManager.class);
 
     private static final String BACKUP_EXTENSION = ".sav";
 
@@ -109,7 +109,7 @@ public static void restoreBackup(Path originalPath) {
         try {
             Files.copy(backupPath, originalPath, StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
-            LOGGER.error("Error while restoring the backup file.", e);
+            LogFactory.getLog(BackupManager.class).error("Error while restoring the backup file.", e);
         }
     }
 
@@ -125,7 +125,7 @@ private void performBackup(Path backupPath) {
             new BibtexDatabaseWriter<>(FileSaveSession::new).saveDatabase(bibDatabaseContext, savePreferences).commit
                     (backupPath);
         } catch (SaveException e) {
-            LOGGER.error("Error while saving file.", e);
+            Logger.error(this, "Error while saving file.", e);
         }
     }
 
@@ -149,7 +149,7 @@ private void startBackupTask() {
         try {
             executor.submit(backupTask);
         } catch (RejectedExecutionException e) {
-            LOGGER.debug("Rejecting while another backup process is already running.");
+            Logger.debug(this, "Rejecting while another backup process is already running.");
         }
     }
 
@@ -170,7 +170,7 @@ private void deleteBackupFile(Path backupPath) {
                 Files.delete(backupPath);
             }
         } catch (IOException e) {
-            LOGGER.error("Error while deleting the backup file.", e);
+            Logger.error(this, "Error while deleting the backup file.", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/auxparser/AuxParser.java b/src/main/java/org/jabref/logic/auxparser/AuxParser.java
index 33c331559bfe..7411f0bd8232 100644
--- a/src/main/java/org/jabref/logic/auxparser/AuxParser.java
+++ b/src/main/java/org/jabref/logic/auxparser/AuxParser.java
@@ -16,8 +16,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * LaTeX Aux to BibTeX Parser
@@ -34,7 +33,6 @@
  * Nested AUX files: \@input{x}
  */
 public class AuxParser {
-    private static final Log LOGGER = LogFactory.getLog(AuxParser.class);
 
     private static final Pattern CITE_PATTERN = Pattern.compile("\\\\(citation|abx@aux@cite)\\{(.+)\\}");
     private static final Pattern INPUT_PATTERN = Pattern.compile("\\\\@input\\{(.+)\\}");
@@ -82,9 +80,9 @@ private AuxParserResult parseAuxFile() {
                     matchNestedAux(result, fileList, line);
                 }
             } catch (FileNotFoundException e) {
-                LOGGER.info("Cannot locate input file", e);
+                Logger.info(this, "Cannot locate input file", e);
             } catch (IOException e) {
-                LOGGER.warn("Problem opening file", e);
+                Logger.warn(this, "Problem opening file", e);
             }
 
             fileIndex++;
diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternUtil.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternUtil.java
index a9757c22f307..5946e7129394 100644
--- a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternUtil.java
+++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternUtil.java
@@ -26,7 +26,6 @@
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 
@@ -34,7 +33,6 @@
  * This is the utility class of the LabelPattern package.
  */
 public class BibtexKeyPatternUtil {
-    private static final Log LOGGER = LogFactory.getLog(BibtexKeyPatternUtil.class);
 
     private static final String STARTING_CAPITAL_PATTERN = "[^A-Z]";
 
@@ -414,7 +412,7 @@ private static String makeLabel(AbstractBibtexKeyPattern citeKeyPattern, BibData
                 }
             }
         } catch (Exception e) {
-            LOGGER.warn("Cannot make label", e);
+            LogFactory.getLog(BibtexKeyPatternUtil.class).warn("Cannot make label", e);
         }
 
         // Remove all illegal characters from the key.
@@ -498,7 +496,7 @@ public static String applyModifiers(final String label, final List<String> parts
                             resultingLabel = label;
                         }
                     } else {
-                        LOGGER.info("Key generator warning: unknown modifier '"
+                        LogFactory.getLog(BibtexKeyPatternUtil.class).info("Key generator warning: unknown modifier '"
                                 + modifier + "'.");
                         resultingLabel = label;
                     }
@@ -710,7 +708,7 @@ else if (val.matches("edtr\\d+")) {
                 return entry.getFieldOrAlias(val).orElse("");
             }
         } catch (NullPointerException ex) {
-            LOGGER.debug("Problem making label", ex);
+            LogFactory.getLog(BibtexKeyPatternUtil.class).debug("Problem making label", ex);
             return "";
         }
 
diff --git a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
index f929c1ffdb05..412ae5ebc6e1 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
@@ -3,12 +3,10 @@
 import java.util.Locale;
 import java.util.Optional;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public final class BibtexCaseChanger {
 
-    private static final Log LOGGER = LogFactory.getLog(BibtexCaseChanger.class);
 
     // stores whether the char before the current char was a colon
     private boolean prevColon = true;
@@ -108,7 +106,7 @@ private String doChangeCase(String s, FORMAT_MODE format) {
                 sb.append(c[i]);
                 i++;
                 if (braceLevel == 0) {
-                    LOGGER.warn("Too many closing braces in string: " + s);
+                    Logger.warn(this, "Too many closing braces in string: " + s);
                 } else {
                     braceLevel--;
                 }
@@ -123,7 +121,7 @@ private String doChangeCase(String s, FORMAT_MODE format) {
             i++;
         }
         if (braceLevel > 0) {
-            LOGGER.warn("No enough closing braces in string: " + s);
+            Logger.warn(this, "No enough closing braces in string: " + s);
         }
         return sb.toString();
     }
@@ -210,7 +208,7 @@ private int convertAccented(char[] c, int start, String s, StringBuilder sb, FOR
             }
             break;
         default:
-            LOGGER.info("convertAccented - Unknown format: " + format);
+            Logger.info(this, "convertAccented - Unknown format: " + format);
             break;
         }
         return pos;
@@ -229,7 +227,7 @@ private int convertNonControl(char[] c, int start, StringBuilder sb, FORMAT_MODE
             pos++;
             break;
         default:
-            LOGGER.info("convertNonControl - Unknown format: " + format);
+            Logger.info(this, "convertNonControl - Unknown format: " + format);
             break;
         }
         return pos;
@@ -257,7 +255,7 @@ private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb,
             sb.append(Character.toUpperCase(c[i]));
             break;
         default:
-            LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: " + format);
+            Logger.info(this, "convertCharIfBraceLevelIsZero - Unknown format: " + format);
             break;
         }
         i++;
diff --git a/src/main/java/org/jabref/logic/bst/VM.java b/src/main/java/org/jabref/logic/bst/VM.java
index 6c8d9cce1f8f..d611ad168fd6 100644
--- a/src/main/java/org/jabref/logic/bst/VM.java
+++ b/src/main/java/org/jabref/logic/bst/VM.java
@@ -18,6 +18,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
+import com.jcabi.log.Logger;
 import org.antlr.runtime.ANTLRFileStream;
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CharStream;
@@ -25,8 +26,6 @@
 import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.tree.CommonTree;
 import org.antlr.runtime.tree.Tree;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  *
@@ -46,7 +45,6 @@ public class VM implements Warn {
 
     private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile("([^\\.\\?\\!\\}\\s])(\\}|\\s)*$");
 
-    private static final Log LOGGER = LogFactory.getLog(VM.class);
 
     private List<BstEntry> entries;
 
@@ -500,7 +498,7 @@ private VM(CommonTree tree) {
          */
         buildInFunctions.put("stack$", context -> {
             while (!stack.empty()) {
-                LOGGER.debug(stack.pop());
+                Logger.debug(this, stack.pop().toString());
             }
         });
 
@@ -564,7 +562,7 @@ private VM(CommonTree tree) {
         /**
          * Pops and prints the top of the stack to the log file. It's useful for debugging.
          */
-        buildInFunctions.put("top$", context -> LOGGER.debug(stack.pop()));
+        buildInFunctions.put("top$", context -> Logger.debug(this, stack.pop().toString()));
 
         /**
          * Pushes the current entry's type (book, article, etc.), but pushes
@@ -589,7 +587,7 @@ private VM(CommonTree tree) {
 
             @Override
             public void execute(BstEntry context) {
-                LOGGER.warn("Warning (#" + (warning++) + "): " + stack.pop());
+                Logger.warn(this, "Warning (#" + (warning++) + "): " + stack.pop());
             }
         });
 
@@ -892,7 +890,7 @@ public String run(Collection<BibEntry> bibtex) {
                 macro(child);
                 break;
             default:
-                LOGGER.info("Unknown type: " + child.getType());
+                Logger.info(this, "Unknown type: " + child.getType());
                 break;
             }
         }
@@ -1085,9 +1083,9 @@ public void execute(BstEntry context) {
                     }
                 } catch (VMException e) {
                     if (file == null) {
-                        LOGGER.error("ERROR " + e.getMessage() + " (" + c.getLine() + ")");
+                        Logger.error(this, "ERROR " + e.getMessage() + " (" + c.getLine() + ")");
                     } else {
-                        LOGGER.error("ERROR " + e.getMessage() + " (" + file.getPath() + ":"
+                        Logger.error(this, "ERROR " + e.getMessage() + " (" + file.getPath() + ":"
                                 + c.getLine() + ")");
                     }
                     throw e;
@@ -1235,7 +1233,7 @@ public Stack<Object> getStack() {
 
     @Override
     public void warn(String string) {
-        LOGGER.warn(string);
+        Logger.warn(this, string);
     }
 
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index f862fe459c23..fbc749c0a31a 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -22,12 +22,10 @@
 import org.jabref.model.metadata.FileDirectoryPreferences;
 import org.jabref.model.util.FileHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class MoveFilesCleanup implements CleanupJob {
 
-    private static final Log LOGGER = LogFactory.getLog(MoveFilesCleanup.class);
     private final BibDatabaseContext databaseContext;
     private final FileDirectoryPreferences fileDirectoryPreferences;
 
@@ -108,7 +106,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     Files.createDirectories(newTargetFile);
                 }
             } catch (IOException e) {
-                LOGGER.error("Could no create necessary target directoires for renaming", e);
+                Logger.error(this, "Could no create necessary target directoires for renaming", e);
             }
 
             if (FileUtil.renameFile(oldFile.get(), newTargetFile, true)) {
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index c557d4607daa..aa648a0484c1 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -23,12 +23,10 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class RenamePdfCleanup implements CleanupJob {
 
-    private static final Log LOGGER = LogFactory.getLog(RenamePdfCleanup.class);
 
     private final BibDatabaseContext databaseContext;
     private final boolean onlyRelativePaths;
@@ -106,7 +104,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 // Since File.exists is sometimes not case-sensitive, the check pathsDifferOnlyByCase ensures that we
                 // nonetheless rename files to a new name which just differs by case.
                 // TODO: we could check here if the newPath file is linked with the current entry. And if not, we could add a link
-                LOGGER.debug("There already exists a file with that name " + newPath.getFileName()
+                Logger.debug(this, "There already exists a file with that name " + newPath.getFileName()
                         + " so I won't rename it");
                 newFileList.add(flEntry);
                 continue;
@@ -117,7 +115,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     Files.createDirectories(newPath);
                 }
             } catch (IOException e) {
-                LOGGER.error("Could not create necessary target directoires for renaming", e);
+                Logger.error(this, "Could not create necessary target directoires for renaming", e);
             }
 
             boolean renameSuccessful = FileUtil.renameFile(Paths.get(expandedOldFilePath), newPath, true);
diff --git a/src/main/java/org/jabref/logic/exporter/BibTeXMLExportFormat.java b/src/main/java/org/jabref/logic/exporter/BibTeXMLExportFormat.java
index 5aaacfd7d3c6..110a129cb0e0 100644
--- a/src/main/java/org/jabref/logic/exporter/BibTeXMLExportFormat.java
+++ b/src/main/java/org/jabref/logic/exporter/BibTeXMLExportFormat.java
@@ -39,8 +39,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Export format for the BibTeXML format.
@@ -49,7 +48,6 @@ public class BibTeXMLExportFormat extends ExportFormat {
 
     private static final String BIBTEXML_NAMESPACE_URI = "http://bibtexml.sf.net/";
     private static final Locale ENGLISH = Locale.ENGLISH;
-    private static final Log LOGGER = LogFactory.getLog(BibTeXMLExportFormat.class);
     private JAXBContext context;
 
 
@@ -117,7 +115,7 @@ public void performExport(final BibDatabaseContext databaseContext, final String
                     parse(new Unpublished(), bibEntry, entry);
                     break;
                 default:
-                    LOGGER.warn("unexpected type appeared");
+                    Logger.warn(this, "unexpected type appeared");
                     break;
             }
             file.getEntry().add(entry);
@@ -158,7 +156,7 @@ private void parseInbook(Inbook inbook, BibEntry bibEntry, Entry entry) {
                             new QName(BIBTEXML_NAMESPACE_URI, "year"), XMLGregorianCalendar.class, calendar);
                     inbook.getContent().add(year);
                 } catch (DatatypeConfigurationException e) {
-                    LOGGER.error("A configuration error occured");
+                    Logger.error(this, "A configuration error occured");
                 }
             } else if ("number".equals(key)) {
                 JAXBElement<BigInteger> number = new JAXBElement<>(new QName(BIBTEXML_NAMESPACE_URI, "number"),
@@ -206,7 +204,7 @@ private <T> void parse(T entryType, BibEntry bibEntry, Entry entry) {
                                     .newXMLGregorianCalendar(value);
                             method.invoke(entryType, calendar);
                         } catch (DatatypeConfigurationException e) {
-                            LOGGER.error("A configuration error occured");
+                            Logger.error(this, "A configuration error occured");
                         }
                         break;
                     } else if ("number".equals(key) && key.equals(methodNameWithoutSet)) {
@@ -217,7 +215,7 @@ private <T> void parse(T entryType, BibEntry bibEntry, Entry entry) {
                         break;
                     }
                 } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-                    LOGGER.error("Could not invoke method", e);
+                    Logger.error(this, "Could not invoke method", e);
                 }
             }
 
@@ -231,7 +229,7 @@ private <T> void parse(T entryType, BibEntry bibEntry, Entry entry) {
                     try {
                         method.invoke(entry, entryType);
                     } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-                        LOGGER.warn("Could not set the type to the entry");
+                        Logger.warn(this, "Could not set the type to the entry");
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/logic/exporter/ExportFormat.java b/src/main/java/org/jabref/logic/exporter/ExportFormat.java
index 871d35091368..89b2fb184251 100644
--- a/src/main/java/org/jabref/logic/exporter/ExportFormat.java
+++ b/src/main/java/org/jabref/logic/exporter/ExportFormat.java
@@ -23,8 +23,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Base class for export formats based on templates.
@@ -33,7 +32,6 @@ public class ExportFormat implements IExportFormat {
 
     private static final String LAYOUT_PREFIX = "/resource/layout/";
 
-    private static final Log LOGGER = LogFactory.getLog(ExportFormat.class);
     private String displayName;
     private String consoleName;
     private String lfFileName;
@@ -195,7 +193,7 @@ public void performExport(final BibDatabaseContext databaseContext, final String
             } catch (SaveException ex) {
                 // Perhaps the overriding encoding doesn't work?
                 // We will fall back on the default encoding.
-                LOGGER.warn("Cannot get save session.", ex);
+                Logger.warn(this, "Cannot get save session.", ex);
             }
         }
         if (ss == null) {
@@ -245,7 +243,7 @@ public void performExport(final BibDatabaseContext databaseContext, final String
             if (defLayout != null) {
                 missingFormatters.addAll(defLayout.getMissingFormatters());
                 if (!missingFormatters.isEmpty()) {
-                    LOGGER.warn(missingFormatters);
+                    Logger.warn(this, "missing formatters is not empty", missingFormatters);
                 }
             }
             Map<String, Layout> layouts = new HashMap<>();
@@ -306,7 +304,7 @@ public void performExport(final BibDatabaseContext databaseContext, final String
             if (!missingFormatters.isEmpty()) {
                 StringBuilder sb = new StringBuilder("The following formatters could not be found: ");
                 sb.append(String.join(", ", missingFormatters));
-                LOGGER.warn(sb);
+                Logger.warn(this, sb.toString());
             }
             finalizeSaveSession(ss, outFile);
         }
@@ -352,7 +350,7 @@ private void readFormatterFile() {
 
             } catch (IOException ex) {
                 // TODO: show error message here?
-                LOGGER.warn("Problem opening formatter file.", ex);
+                Logger.warn(this, "Problem opening formatter file.", ex);
             }
         }
     }
@@ -362,7 +360,7 @@ public void finalizeSaveSession(final SaveSession ss, Path file) throws SaveExce
         ss.getWriter().close();
 
         if (!ss.getWriter().couldEncodeAll()) {
-            LOGGER.warn("Could not encode...");
+            Logger.warn(this, "Could not encode...");
         }
         ss.commit(file);
     }
diff --git a/src/main/java/org/jabref/logic/exporter/FileSaveSession.java b/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
index e1b403da4600..ecb445003560 100644
--- a/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
+++ b/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
@@ -11,8 +11,7 @@
 import org.jabref.logic.util.io.FileBasedLock;
 import org.jabref.logic.util.io.FileUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Class used to handle safe storage to disk.
@@ -30,7 +29,6 @@
  */
 public class FileSaveSession extends SaveSession {
 
-    private static final Log LOGGER = LogFactory.getLog(FileSaveSession.class);
 
     // Filenames.
     private static final String BACKUP_EXTENSION = ".bak";
@@ -82,7 +80,7 @@ public void commit(Path file) throws SaveException {
                     }
                 }
             } catch (IOException ex) {
-                LOGGER.error("Error when creating lock file.", ex);
+                Logger.error(this, "Error when creating lock file.", ex);
             }
 
             // Try to save file permissions to restore them later (by default: 664)
@@ -95,7 +93,7 @@ public void commit(Path file) throws SaveException {
                 try {
                     oldFilePermissions = Files.getPosixFilePermissions(file);
                 } catch (IOException exception) {
-                    LOGGER.warn("Error getting file permissions.", exception);
+                    Logger.warn(this, "Error getting file permissions.", exception);
                 }
             }
 
@@ -115,7 +113,7 @@ public void commit(Path file) throws SaveException {
         try {
             Files.deleteIfExists(temporaryFile);
         } catch (IOException e) {
-            LOGGER.warn("Cannot delete temporary file", e);
+            Logger.warn(this, "Cannot delete temporary file", e);
         }
     }
 
@@ -124,7 +122,7 @@ public void cancel() {
         try {
             Files.deleteIfExists(temporaryFile);
         } catch (IOException e) {
-            LOGGER.warn("Cannot delete temporary file", e);
+            Logger.warn(this, "Cannot delete temporary file", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
index 0a13ea58f2ce..349a8faa4b1a 100644
--- a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
+++ b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
@@ -16,8 +16,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -29,7 +28,6 @@
  */
 class OOCalcDatabase {
 
-    private static final Log LOGGER = LogFactory.getLog(OOCalcDatabase.class);
 
     private final List<BibEntry> entries;
 
@@ -187,7 +185,7 @@ public Document getDOMrepresentation() {
 
             result.appendChild(collection);
         } catch (Exception e) {
-            LOGGER.warn("Exception caught...", e);
+            Logger.warn(this, "Exception caught...", e);
         }
         return result;
     }
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
index 44b202a17ee4..bf9b1964f884 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
@@ -16,8 +16,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -29,7 +28,6 @@
  */
 class OpenDocumentRepresentation {
 
-    private static final Log LOGGER = LogFactory.getLog(OpenDocumentRepresentation.class);
     private final List<BibEntry> entries;
 
     private final BibDatabase database;
@@ -193,7 +191,7 @@ public Document getDOMrepresentation() {
 
             result.appendChild(collection);
         } catch (Exception e) {
-            LOGGER.warn("Exception caught...", e);
+            Logger.warn(this, "Exception caught...", e);
         }
         return result;
     }
diff --git a/src/main/java/org/jabref/logic/exporter/StringSaveSession.java b/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
index b1f522d6d880..90381e681ed7 100644
--- a/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
+++ b/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
@@ -7,12 +7,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class StringSaveSession extends SaveSession {
 
-    private static final Log LOGGER = LogFactory.getLog(StringSaveSession.class);
 
     private final ByteArrayOutputStream outputStream;
 
@@ -29,7 +27,7 @@ public String getStringValue() {
         try {
             return outputStream.toString(encoding.name());
         } catch (UnsupportedEncodingException e) {
-            LOGGER.warn(e);
+            Logger.warn(this, "error during string conversion", e);
             return "";
         }
     }
@@ -48,7 +46,7 @@ public void cancel() {
         try {
             outputStream.close();
         } catch (IOException e) {
-            LOGGER.warn(e);
+            Logger.warn(this, "error during stream closing", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
index e09f55f6a562..0d05cef1e3e0 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
@@ -10,12 +10,10 @@
 import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps;
 import org.jabref.model.cleanup.Formatter;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class HtmlToLatexFormatter implements LayoutFormatter, Formatter {
 
-    private static final Log LOGGER = LogFactory.getLog(HtmlToLatexFormatter.class);
 
     private static final int MAX_TAG_LENGTH = 100;
 
@@ -91,7 +89,7 @@ public String format(String text) {
         m = ESCAPED_PATTERN3.matcher(result);
         while (m.find()) {
             int num = Integer.decode(m.group(1).replace("x", "#") + m.group(3));
-            LOGGER.warn("HTML escaped char not converted: " + m.group(1) + m.group(2) + m.group(3) + " = " + Integer.toString(num));
+            Logger.warn(this, "HTML escaped char not converted: " + m.group(1) + m.group(2) + m.group(3) + " = " + Integer.toString(num));
         }
 
         // Remove $$ in case of two adjacent conversions
@@ -100,7 +98,7 @@ public String format(String text) {
         // Find non-covered special characters with alphabetic codes
         m = ESCAPED_PATTERN4.matcher(result);
         while (m.find()) {
-            LOGGER.warn("HTML escaped char not converted: " + m.group(1));
+            Logger.warn(this, "HTML escaped char not converted: " + m.group(1));
         }
 
         return result.trim();
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
index 9feb6c4d83f7..d98800be4f60 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
@@ -8,12 +8,10 @@
 import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps;
 import org.jabref.model.cleanup.Formatter;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class UnicodeToLatexFormatter implements LayoutFormatter, Formatter {
 
-    private static final Log LOGGER = LogFactory.getLog(UnicodeToLatexFormatter.class);
 
     @Override
     public String format(String text) {
@@ -56,7 +54,7 @@ public String format(String text) {
         for (int i = 0; i <= (result.length() - 1); i++) {
             int cp = result.codePointAt(i);
             if (cp >= 129) {
-                LOGGER.warn("Unicode character not converted: " + cp);
+                Logger.warn(this, "Unicode character not converted: " + cp);
             }
         }
         return result;
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
index cc65b6a2047d..8d8e5953e74b 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
@@ -18,14 +18,12 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Utility class for trying to resolve URLs to full-text PDF for articles.
  */
 public class FulltextFetchers {
-    private static final Log LOGGER = LogFactory.getLog(FulltextFetchers.class);
 
     private final List<FulltextFetcher> finders = new ArrayList<>();
 
@@ -57,7 +55,7 @@ public Optional<URL> findFullTextPDF(BibEntry entry) {
                         .findIdentifier(clonedEntry)
                         .ifPresent(e -> clonedEntry.setField(FieldName.DOI, e.getDOI()));
             } catch (FetcherException e) {
-                LOGGER.debug("Failed to find DOI", e);
+                Logger.debug(this, "Failed to find DOI", e);
             }
         }
 
@@ -69,7 +67,7 @@ public Optional<URL> findFullTextPDF(BibEntry entry) {
                     return result;
                 }
             } catch (IOException | FetcherException e) {
-                LOGGER.debug("Failed to find fulltext PDF at given URL", e);
+                Logger.debug(this, "Failed to find fulltext PDF at given URL", e);
             }
         }
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
index e8c00dc4f5f8..52b9a39d43c7 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
@@ -13,8 +13,7 @@
 import org.jabref.model.cleanup.Formatter;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.jsoup.helper.StringUtil;
 
 /**
@@ -25,8 +24,6 @@
  */
 public interface IdBasedParserFetcher extends IdBasedFetcher {
 
-    Log LOGGER = LogFactory.getLog(IdBasedParserFetcher.class);
-
     /**
      * Constructs a URL based on the query.
      * @param identifier the ID
@@ -69,7 +66,7 @@ default Optional<BibEntry> performSearchById(String identifier) throws FetcherEx
             }
 
             if (fetchedEntries.size() > 1) {
-                LOGGER.info("Fetcher " + getName() + "found more than one result for identifier " + identifier
+                Logger.info(this, "Fetcher " + getName() + "found more than one result for identifier " + identifier
                         + ". We will use the first entry.");
             }
 
@@ -82,7 +79,7 @@ default Optional<BibEntry> performSearchById(String identifier) throws FetcherEx
         } catch (URISyntaxException e) {
             throw new FetcherException("Search URI is malformed", e);
         } catch (FileNotFoundException e) {
-            LOGGER.debug("Id not found");
+            Logger.debug(this, "Id not found");
             return Optional.empty();
         } catch (IOException e) {
             // TODO: Catch HTTP Response 401 errors and report that user has no rights to access resource
diff --git a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
index f9608feac732..642986294c67 100644
--- a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
@@ -15,8 +15,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.Identifier;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Provides a convenient interface for {@link IdFetcher}, which follow the usual three-step procedure:
@@ -26,8 +25,6 @@
  */
 public interface IdParserFetcher<T extends Identifier> extends IdFetcher<T> {
 
-    Log LOGGER = LogFactory.getLog(IdParserFetcher.class);
-
     /**
      * Constructs a URL based on the {@link BibEntry}.
      *
@@ -85,7 +82,7 @@ default Optional<T> findIdentifier(BibEntry entry) throws FetcherException {
         } catch (URISyntaxException e) {
             throw new FetcherException("Search URI is malformed", e);
         } catch (FileNotFoundException e) {
-            LOGGER.debug("Id not found");
+            Logger.debug(this, "Id not found");
             return Optional.empty();
         } catch (IOException e) {
             // TODO: Catch HTTP Response 401 errors and report that user has no rights to access resource
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java b/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
index d485ce3bf173..fcb90c1b9f40 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
@@ -10,8 +10,7 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -20,7 +19,6 @@
  * FulltextFetcher implementation that attempts to find a PDF URL at ACS.
  */
 public class ACS implements FulltextFetcher {
-    private static final Log LOGGER = LogFactory.getLog(ACS.class);
 
     private static final String SOURCE = "http://pubs.acs.org/doi/abs/%s";
 
@@ -49,7 +47,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             Element link = html.select(".pdf-high-res a").first();
 
             if (link != null) {
-                LOGGER.info("Fulltext PDF found @ ACS.");
+                Logger.info(this, "Fulltext PDF found @ ACS.");
                 pdfLink = Optional.of(new URL(source.replaceFirst("/abs/", "/pdf/")));
             }
         }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
index aa60da7a625a..7d493c61fad8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
@@ -35,8 +35,7 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.apache.http.client.utils.URIBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -54,7 +53,6 @@
  * <a herf="https://gitlab.c3sl.ufpr.br/portalmec/dspace-portalmec/blob/aa209d15082a9870f9daac42c78a35490ce77b52/dspace-api/src/main/java/org/dspace/submit/lookup/ArXivService.java">dspace-portalmec</a>
  */
 public class ArXiv implements FulltextFetcher, SearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
-    private static final Log LOGGER = LogFactory.getLog(ArXiv.class);
 
     private static final String API_URL = "http://export.arxiv.org/api/query";
 
@@ -76,11 +74,11 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                     .findFirst();
 
             if (pdfUrl.isPresent()) {
-                LOGGER.info("Fulltext PDF found @ arXiv.");
+                Logger.info(this, "Fulltext PDF found @ arXiv.");
             }
             return pdfUrl;
         } catch (FetcherException e) {
-            LOGGER.warn("arXiv API request failed", e);
+            Logger.warn(this, "arXiv API request failed", e);
         }
 
         return Optional.empty();
@@ -117,7 +115,7 @@ private List<ArXivEntry> searchForEntries(BibEntry entry) throws FetcherExceptio
                 // Get pdf of entry with the specified id
                 return OptionalUtil.toList(searchForEntryById(identifier.get()));
             } catch (FetcherException e) {
-                LOGGER.warn("arXiv eprint API request failed", e);
+                Logger.warn(this, "arXiv eprint API request failed", e);
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
index 534045ce6b26..056ab66908a8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -14,8 +14,7 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -26,7 +25,6 @@
  * FulltextFetcher implementation that follows the DOI resolution redirects and scans for a full-text PDF URL.
  */
 public class DoiResolution implements FulltextFetcher {
-    private static final Log LOGGER = LogFactory.getLog(DoiResolution.class);
 
     @Override
     public Optional<URL> findFullText(BibEntry entry) throws IOException {
@@ -67,11 +65,11 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                     }
                     // return if only one link was found (high accuracy)
                     if (links.size() == 1) {
-                        LOGGER.info("Fulltext PDF found @ " + sciLink);
+                        Logger.info(this, "Fulltext PDF found @ " + sciLink);
                         pdfLink = links.get(0);
                     }
                 } catch (IOException e) {
-                    LOGGER.warn("DoiResolution fetcher failed: ", e);
+                    Logger.warn(this, "DoiResolution fetcher failed: ", e);
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
index 1a1a47d24239..58ad9c07ba17 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
@@ -25,8 +25,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.apache.http.client.utils.URIBuilder;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -36,7 +35,6 @@
  * FulltextFetcher implementation that attempts to find a PDF URL at GoogleScholar.
  */
 public class GoogleScholar implements FulltextFetcher, SearchBasedFetcher {
-    private static final Log LOGGER = LogFactory.getLog(GoogleScholar.class);
 
     private static final Pattern LINK_TO_BIB_PATTERN = Pattern.compile("(https:\\/\\/scholar.googleusercontent.com\\/scholar.bib[^\"]*)");
 
@@ -81,7 +79,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
                     if (!"".equals(s)) {
                         // TODO: check title inside pdf + length?
                         // TODO: report error function needed?! query -> result
-                        LOGGER.info("Fulltext PDF found @ Google: " + s);
+                        Logger.info(this, "Fulltext PDF found @ Google: " + s);
                         pdfLink = Optional.of(new URL(s));
                         break;
                     }
@@ -158,7 +156,7 @@ private BibEntry downloadEntry(String link) throws IOException, FetcherException
         } else {
             Collection<BibEntry> entries = result.getDatabase().getEntries();
             if (entries.size() != 1) {
-                LOGGER.debug(entries.size() + " entries found! (" + link + ")");
+                Logger.debug(this, entries.size() + " entries found! (" + link + ")");
                 throw new FetcherException("Parsing entries from Google Scholar bib file failed.");
             } else {
                 BibEntry entry = entries.iterator().next();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
index d7b02b16bda5..d6c41016147b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
@@ -13,8 +13,7 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Class for finding PDF URLs for entries on IEEE
@@ -23,7 +22,6 @@
  */
 public class IEEE implements FulltextFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(IEEE.class);
     private static final Pattern STAMP_PATTERN = Pattern.compile("(/stamp/stamp.jsp\\?t?p?=?&?arnumber=[0-9]+)");
     private static final Pattern PDF_PATTERN = Pattern
             .compile("\"(http://ieeexplore.ieee.org/ielx[0-9/]+\\.pdf[^\"]+)\"");
@@ -72,7 +70,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         Matcher matcher = PDF_PATTERN.matcher(framePage);
         if (matcher.find()) {
             // The PDF was found
-            LOGGER.debug("Full text document found on IEEE Xplore");
+            Logger.debug(this, "Full text document found on IEEE Xplore");
             return Optional.of(new URL(matcher.group(1)));
         }
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java
index 82c50b95ff4c..d3dce990b31c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java
@@ -11,6 +11,7 @@
 import org.jabref.logic.importer.ParseException;
 import org.jabref.model.entry.BibEntry;
 
+import com.jcabi.log.Logger;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
@@ -67,7 +68,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
         if (fetchedEntries.isEmpty()) {
             return Optional.empty();
         } else if (fetchedEntries.size() > 1) {
-            LOGGER.info("Fetcher " + getName() + "found more than one result for identifier " + identifier
+            Logger.info(this, "Fetcher " + getName() + "found more than one result for identifier " + identifier
                     + ". We will use the first entry.");
         }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
index 0ed8ad7acdea..0ce3cfd9d370 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -32,8 +32,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.apache.http.client.utils.URIBuilder;
 
 /**
@@ -42,7 +41,6 @@
  * See <a href="http://help.jabref.org/en/MedlineRIS">help.jabref.org</a> for a detailed documentation of the available fields.
  */
 public class MedlineFetcher implements IdBasedParserFetcher, SearchBasedFetcher {
-    private static final Log LOGGER = LogFactory.getLog(MedlineFetcher.class);
 
     private static final int NUMBER_TO_FETCH = 50;
     private static final String ID_URL = "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi";
@@ -167,11 +165,11 @@ public List<BibEntry> performSearch(String query) throws FetcherException {
             List<String> idList = getPubMedIdsFromQuery(searchTerm);
 
             if (idList.isEmpty()) {
-                LOGGER.info("No results found.");
+                Logger.info(this, "No results found.");
                 return Collections.emptyList();
             }
             if (numberOfResultsFound > NUMBER_TO_FETCH) {
-                LOGGER.info(
+                Logger.info(this,
                         numberOfResultsFound + " results found. Only 50 relevant results will be fetched by default.");
             }
 
@@ -207,7 +205,7 @@ private List<BibEntry> fetchMedline(List<String> ids) throws FetcherException {
             ParserResult result = new MedlineImporter().importDatabase(
                     new BufferedReader(new InputStreamReader(data.getInputStream(), StandardCharsets.UTF_8)));
             if (result.hasWarnings()) {
-                LOGGER.warn(result.getErrorMessage());
+                Logger.warn(this, result.getErrorMessage());
             }
             List<BibEntry> resultList = result.getDatabase().getEntries();
             resultList.forEach(this::doPostCleanup);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
index bfe46bae3818..fff21d1196b1 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package org.jabref.logic.importer.fetcher;
 
 import java.io.BufferedReader;
@@ -22,15 +19,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.apache.http.client.utils.URIBuilder;
 
 /**
  * This class is responible to get the recommendations from MDL
  */
 public class MrDLibFetcher implements EntryBasedFetcher {
-    private static final Log LOGGER = LogFactory.getLog(MrDLibFetcher.class);
 
     private static final String NAME = "MDL_FETCHER";
     private final String LANGUAGE;
@@ -67,7 +62,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
                     parserResult = new ParserResult(errorBibDataBase);
                 }
             } catch (IOException e) {
-                LOGGER.error(e.getMessage(), e);
+                Logger.error(this, e.getMessage(), e);
                 throw new FetcherException("XML Parser IOException.");
             }
             return parserResult.getDatabase().getEntries();
@@ -119,7 +114,7 @@ private String constructQuery(String queryWithTitle) {
         try {
             uri = builder.build();
         } catch (URISyntaxException e) {
-            LOGGER.error(e.getMessage(), e);
+            Logger.error(this, e.getMessage(), e);
         }
         System.out.println("Query: " + uri.toString());
         return uri.toString();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
index 8d9e8e049dd4..f78bb5cf8503 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
@@ -11,12 +11,11 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 
+import com.jcabi.log.Logger;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -30,7 +29,6 @@
  * @see http://dev.elsevier.com/
  */
 public class ScienceDirect implements FulltextFetcher {
-    private static final Log LOGGER = LogFactory.getLog(ScienceDirect.class);
 
     private static final String API_URL = "http://api.elsevier.com/content/article/doi/";
     private static final String API_KEY = "fb82f2e692b3c72dafe5f4f1fa0ac00b";
@@ -57,7 +55,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                     Element link = html.getElementById("pdfLink");
 
                     if (link != null) {
-                        LOGGER.info("Fulltext PDF found @ ScienceDirect (old page).");
+                        Logger.info(this, "Fulltext PDF found @ ScienceDirect (old page).");
                         Optional<URL> pdfLink = Optional.of(new URL(link.attr("pdfurl")));
                         return pdfLink;
                     }
@@ -65,13 +63,13 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                     String url = html.getElementsByClass("pdf-download-btn-link").attr("href");
 
                     if (url != null) {
-                        LOGGER.info("Fulltext PDF found @ ScienceDirect (new page).");
+                        Logger.info(this, "Fulltext PDF found @ ScienceDirect (new page).");
                         Optional<URL> pdfLink = Optional.of(new URL("http://www.sciencedirect.com" + url));
                         return pdfLink;
                     }
                 }
             } catch (UnirestException e) {
-                LOGGER.warn("ScienceDirect API request failed", e);
+                Logger.warn(this, "ScienceDirect API request failed", e);
             }
         }
         return Optional.empty();
@@ -97,7 +95,7 @@ private String getUrlByDoi(String doi) throws UnirestException {
             }
             return sciLink;
         } catch (JSONException e) {
-            LOGGER.debug("No ScienceDirect link found in API request", e);
+            Logger.debug(this, "No ScienceDirect link found in API request", e);
             return sciLink;
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
index 1cebab8d3d8c..e9a9b1257ef6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
@@ -10,12 +10,11 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.identifier.DOI;
 
+import com.jcabi.log.Logger;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.json.JSONObject;
 
 /**
@@ -24,7 +23,6 @@
  * Uses Springer API, see @link{https://dev.springer.com}
  */
 public class SpringerLink implements FulltextFetcher {
-    private static final Log LOGGER = LogFactory.getLog(SpringerLink.class);
 
     private static final String API_URL = "http://api.springer.com/meta/v1/json";
     private static final String API_KEY = "b0c7151179b3d9c1119cf325bca8460d";
@@ -50,11 +48,11 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                 int results = json.getJSONArray("result").getJSONObject(0).getInt("total");
 
                 if (results > 0) {
-                    LOGGER.info("Fulltext PDF found @ Springer.");
+                    Logger.info(this, "Fulltext PDF found @ Springer.");
                     pdfLink = Optional.of(new URL("http", CONTENT_HOST, String.format("/content/pdf/%s.pdf", doi.get().getDOI())));
                 }
             } catch (UnirestException e) {
-                LOGGER.warn("SpringerLink API request failed", e);
+                Logger.warn(this, "SpringerLink API request failed", e);
             }
         }
         return pdfLink;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java b/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java
index f4aca185790d..b8c2fbbda8a9 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/zbMATH.java
@@ -17,15 +17,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.utils.URIBuilder;
 
 /**
  * Fetches data from the Zentralblatt Math (https://www.zbmath.org/)
  */
 public class zbMATH implements SearchBasedParserFetcher {
-    private static final Log LOGGER = LogFactory.getLog(zbMATH.class);
 
     private final ImportFormatPreferences preferences;
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
index 212999060875..39b9ae2e9930 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
@@ -29,8 +29,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Importer for the BibTeXML format.
@@ -40,7 +39,6 @@
  */
 public class BibTeXMLImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(BibTeXMLImporter.class);
 
     private static final Pattern START_PATTERN = Pattern.compile("<(bibtex:)?file .*");
 
@@ -145,7 +143,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 bibItems.add(bibEntry);
             }
         } catch (JAXBException e) {
-            LOGGER.error("Error with XML parser configuration", e);
+            Logger.error(this, "Error with XML parser configuration", e);
             return ParserResult.fromError(e);
         }
         return new ParserResult(bibItems);
@@ -179,7 +177,7 @@ private <T> void parse(T entryType, Map<String, String> fields) {
                     putIfValueNotNull(fields, method.getName().replace("get", ""), (String) method.invoke(entryType));
                 }
             } catch (IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
-                LOGGER.error("Could not invoke method", e);
+                Logger.error(this, "Could not invoke method", e);
             }
         }
     }
@@ -218,10 +216,10 @@ private void parseInbook(Inbook inbook, Map<String, String> fields) {
                 if (FieldName.YEAR.equals(localName)) {
                     putYear(fields, value);
                 } else {
-                    LOGGER.info("Unexpected field was found");
+                    Logger.info(this, "Unexpected field was found");
                 }
             } else {
-                LOGGER.info("Unexpected field was found");
+                Logger.info(this, "Unexpected field was found");
             }
         }
     }
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 e0c6f122a05b..5e7c90aad1b1 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -38,8 +38,7 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.metadata.MetaData;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Class for importing BibTeX-files.
@@ -58,7 +57,6 @@
  */
 public class BibtexParser implements Parser {
 
-    private static final Log LOGGER = LogFactory.getLog(BibtexParser.class);
     private static final Integer LOOKAHEAD = 64;
     private final FieldContentParser fieldContentParser;
     private final Deque<Character> pureTextFromFile = new LinkedList<>();
@@ -252,7 +250,7 @@ private void parseAndAddEntry(String type) {
                 parserResult.addDuplicateKey(entry.getCiteKey());
             }
         } catch (IOException ex) {
-            LOGGER.debug("Could not parse entry", ex);
+            Logger.debug(this, "Could not parse entry", ex);
             parserResult.addWarning(Localization.lang("Error occurred when parsing entry") + ": '" + ex.getMessage()
                     + "'. " + Localization.lang("Skipped entry."));
 
@@ -268,7 +266,7 @@ private void parseJabRefComment(Map<String, String> meta) {
             * which means that we should just return and the comment will be picked up as arbitrary text
             *  by the parser
              */
-            LOGGER.info("Found unbracketed comment");
+            Logger.info(this, "Found unbracketed comment");
             return;
         }
 
@@ -492,18 +490,18 @@ private BibtexString parseString() throws IOException {
         skipWhitespace();
         consume('{', '(');
         skipWhitespace();
-        LOGGER.debug("Parsing string name");
+        Logger.debug(this, "Parsing string name");
         String name = parseTextToken();
-        LOGGER.debug("Parsed string name");
+        Logger.debug(this, "Parsed string name");
         skipWhitespace();
-        LOGGER.debug("Now the contents");
+        Logger.debug(this, "Now the contents");
         consume('=');
         String content = parseFieldContent(name);
-        LOGGER.debug("Now I'm going to consume a }");
+        Logger.debug(this, "Now I'm going to consume a }");
         consume('}', ')');
         // Consume new line which signals end of entry
         skipOneNewline();
-        LOGGER.debug("Finished string parsing.");
+        Logger.debug(this, "Finished string parsing.");
 
         return new BibtexString(name, content);
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java
index 63967d5903b3..7b91db2c6923 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java
@@ -32,8 +32,7 @@
 import org.jabref.model.entry.EntryType;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This importer parses text format citations using the online API of FreeCite -
@@ -41,7 +40,6 @@
  */
 public class FreeCiteImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(FreeCiteImporter.class);
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -71,7 +69,7 @@ public ParserResult importEntries(String text) {
         try {
             urlencodedCitation = URLEncoder.encode(text, StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
-            LOGGER.warn("Unsupported encoding", e);
+            Logger.warn(this, "Unsupported encoding", e);
         }
 
         // Send the request
@@ -81,10 +79,10 @@ public ParserResult importEntries(String text) {
             url = new URL("http://freecite.library.brown.edu/citations/create");
             conn = url.openConnection();
         } catch (MalformedURLException e) {
-            LOGGER.warn("Bad URL", e);
+            Logger.warn(this, "Bad URL", e);
             return new ParserResult();
         } catch (IOException e) {
-            LOGGER.warn("Could not download", e);
+            Logger.warn(this, "Could not download", e);
             return new ParserResult();
         }
         try {
@@ -97,9 +95,9 @@ public ParserResult importEntries(String text) {
             writer.write(data);
             writer.flush();
         } catch (IllegalStateException e) {
-            LOGGER.warn("Already connected.", e);
+            Logger.warn(this, "Already connected.", e);
         } catch (IOException e) {
-            LOGGER.warn("Unable to connect to FreeCite online service.", e);
+            Logger.warn(this, "Unable to connect to FreeCite online service.", e);
             return ParserResult.fromErrorMessage(Localization.lang("Unable to connect to FreeCite online service."));
         }
         // output is in conn.getInputStream();
@@ -218,7 +216,7 @@ public ParserResult importEntries(String text) {
             }
             parser.close();
         } catch (IOException | XMLStreamException ex) {
-            LOGGER.warn("Could not parse", ex);
+            Logger.warn(this, "Could not parse", ex);
             return new ParserResult();
         }
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
index b6ecf195f9f3..6455ca48aaa9 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
@@ -15,8 +15,7 @@
 import org.jabref.model.entry.FieldName;
 
 import com.google.common.base.Strings;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -24,7 +23,6 @@
 import org.xml.sax.SAXException;
 
 public class GvkParser implements Parser {
-    private static final Log LOGGER = LogFactory.getLog(GvkParser.class);
 
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
@@ -98,7 +96,7 @@ private BibEntry parseEntry(Element e) {
         List<Element> datafields = getChildren("datafield", e);
         for (Element datafield : datafields) {
             String tag = datafield.getAttribute("tag");
-            LOGGER.debug("tag: " + tag);
+            Logger.debug(this, "tag: " + tag);
 
             // mak
             if ("002@".equals(tag)) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
index 790f01e56b60..01813567403f 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -78,8 +78,7 @@
 import org.jabref.model.strings.StringUtil;
 
 import com.google.common.base.Joiner;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Importer for the Medline/Pubmed format.
@@ -89,7 +88,6 @@
  */
 public class MedlineImporter extends Importer implements Parser {
 
-    private static final Log LOGGER = LogFactory.getLog(MedlineImporter.class);
     private static final String KEYWORD_SEPARATOR = "; ";
 
     private static final Locale ENGLISH = Locale.ENGLISH;
@@ -179,7 +177,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 }
             }
         } catch (JAXBException | XMLStreamException e) {
-            LOGGER.debug("could not parse document", e);
+            Logger.debug(this, "could not parse document", e);
             return ParserResult.fromError(e);
         }
         return new ParserResult(bibItems);
@@ -276,7 +274,7 @@ private void addBookInformation(Map<String, String> fields, Book book) {
                     handleAuthors(fields, authorList);
                 }
             } else {
-                LOGGER.info(String.format("Size of authorlist was %s", authorLists.size()));
+                Logger.info(this, String.format("Size of authorlist was %s", authorLists.size()));
             }
         }
 
@@ -690,7 +688,7 @@ public List<BibEntry> parseEntries(InputStream inputStream) throws ParseExceptio
                     new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
 
         } catch (IOException e) {
-            LOGGER.error(e.getLocalizedMessage(), e);
+            Logger.error(this, e.getLocalizedMessage(), e);
         }
         return Collections.emptyList();
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
index 325683a23263..3441a86caa0d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
@@ -59,8 +59,7 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.google.common.base.Joiner;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Importer for the MODS format.<br>
@@ -69,7 +68,6 @@
  */
 public class ModsImporter extends Importer implements Parser {
 
-    private static final Log LOGGER = LogFactory.getLog(ModsImporter.class);
     private static final String KEYWORD_SEPARATOR = JabRefPreferences.getInstance().getImportFormatPreferences()
             .getKeywordSeparator() + " ";
 
@@ -107,10 +105,10 @@ public ParserResult importDatabase(BufferedReader input) throws IOException {
                 ModsDefinition modsDefinition = mods.get();
                 parseMods(bibItems, modsDefinition);
             } else {
-                LOGGER.warn("Not expected root element found");
+                Logger.warn(this, "Not expected root element found");
             }
         } catch (JAXBException e) {
-            LOGGER.debug("could not parse document", e);
+            Logger.debug(this, "could not parse document", e);
             return ParserResult.fromError(e);
         }
         return new ParserResult(bibItems);
@@ -487,7 +485,7 @@ public List<BibEntry> parseEntries(InputStream inputStream) throws ParseExceptio
         try {
             return importDatabase(new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
         } catch (IOException e) {
-            LOGGER.error(e.getLocalizedMessage(), e);
+            Logger.error(this, e.getLocalizedMessage(), e);
         }
         return Collections.emptyList();
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
index 3aa99e0e337e..f8ca653e93b3 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package org.jabref.logic.importer.fileformat;
 
 import java.io.BufferedReader;
@@ -23,8 +20,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -35,7 +31,6 @@
  */
 public class MrDLibImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(MrDLibImporter.class);
     public ParserResult parserResult;
 
     @Override
@@ -53,11 +48,11 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
             try (InputStream stream = new ByteArrayInputStream(recommendationsAsString.getBytes())) {
                 saxParser.parse(stream, handler);
             } catch (Exception e) {
-                LOGGER.error(e.getMessage(), e);
+                Logger.error(this, e.getMessage(), e);
                 return false;
             }
         } catch (ParserConfigurationException | SAXException e) {
-            LOGGER.error(e.getMessage(), e);
+            Logger.error(this, e.getMessage(), e);
             return false;
         }
         return true;
@@ -98,7 +93,7 @@ private String convertToString(BufferedReader input) throws IOException {
                 stringBuilder.append(line);
             }
         } catch (Exception e) {
-            LOGGER.error(e.getMessage());
+            Logger.error(this, e.getMessage());
         }
         return stringBuilder.toString();
     }
@@ -137,14 +132,14 @@ private void parse(BufferedReader input) throws IOException {
             try (InputStream stream = new ByteArrayInputStream(recommendations.getBytes())) {
                 saxParser.parse(stream, handler);
             } catch (SAXException e) {
-                LOGGER.error(e.getMessage(), e);
+                Logger.error(this, e.getMessage(), e);
             }
             List<RankedBibEntry> rankedBibEntries = handler.getRankedBibEntries();
             rankedBibEntries.sort((RankedBibEntry rankedBibEntry1,
                     RankedBibEntry rankedBibEntry2) -> rankedBibEntry1.rank.compareTo(rankedBibEntry2.rank));
             bibEntries = rankedBibEntries.stream().map(e -> e.entry).collect(Collectors.toList());
         } catch (ParserConfigurationException | SAXException e) {
-            LOGGER.error(e.getMessage(), e);
+            Logger.error(this, e.getMessage(), e);
         }
 
         for (BibEntry bibentry : bibEntries) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
index 4f61ce2ef83e..2bd70c4df198 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
@@ -16,8 +16,7 @@
 import org.jabref.model.entry.Date;
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Imports a New Economics Papers-Message from the REPEC-NEP Service.
@@ -141,7 +140,6 @@
  */
 public class RepecNepImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(RepecNepImporter.class);
 
     private static final Collection<String> RECOGNIZED_FIELDS = Arrays.asList("Keywords", "JEL", "Date", "URL", "By");
     private final ImportFormatPreferences importFormatPreferences;
@@ -420,7 +418,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 message += ", paper no. " + paperNoStr + ": ";
             }
             message += e.getLocalizedMessage();
-            LOGGER.error(message, e);
+            Logger.error(this, message, e);
             return ParserResult.fromErrorMessage(message);
         }
 
diff --git a/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java b/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java
index 72d33e2c07cc..e548e19f17d8 100644
--- a/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/JSONEntryParser.java
@@ -8,14 +8,13 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.entry.Month;
 
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class JSONEntryParser {
 
-    private static final Log LOGGER = LogFactory.getLog(JSONEntryParser.class);
 
     /**
      * Convert a JSONObject containing a bibJSON entry to a BibEntry
@@ -41,12 +40,12 @@ public BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character keywordS
                 if (authors.getJSONObject(i).has("name")) {
                     authorList.add(authors.getJSONObject(i).getString("name"));
                 } else {
-                    LOGGER.info("Empty author name.");
+                    Logger.info(this, "Empty author name.");
                 }
             }
             entry.setField(FieldName.AUTHOR, String.join(" and ", authorList));
         } else {
-            LOGGER.info("No author found.");
+            Logger.info(this, "No author found.");
         }
 
         // Direct accessible fields
@@ -73,7 +72,7 @@ public BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character keywordS
             if (journal.has("title")) {
                 entry.setField(FieldName.JOURNAL, journal.getString("title"));
             } else {
-                LOGGER.info("No journal title found.");
+                Logger.info(this, "No journal title found.");
             }
             // Other journal related fields
             for (String field : journalSingleFieldStrings) {
@@ -82,7 +81,7 @@ public BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character keywordS
                 }
             }
         } else {
-            LOGGER.info("No journal information found.");
+            Logger.info(this, "No journal information found.");
         }
 
         // Keywords
@@ -161,12 +160,12 @@ public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
                 if (authors.getJSONObject(i).has("creator")) {
                     authorList.add(authors.getJSONObject(i).getString("creator"));
                 } else {
-                    LOGGER.info("Empty author name.");
+                    LogFactory.getLog(JSONEntryParser.class).info("Empty author name.");
                 }
             }
             entry.setField(FieldName.AUTHOR, String.join(" and ", authorList));
         } else {
-            LOGGER.info("No author found.");
+            LogFactory.getLog(JSONEntryParser.class).info( "No author found.");
         }
 
         // Direct accessible fields
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
index 589081ab6e07..6f98ef320fb0 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
@@ -17,15 +17,13 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Reads abbreviation files (property files using NAME = ABBREVIATION as a format) into a list of Abbreviations.
  */
 public class AbbreviationParser {
 
-    private static final Log LOGGER = LogFactory.getLog(AbbreviationParser.class);
 
     private final Set<Abbreviation> abbreviations = new HashSet<>(5000);
 
@@ -34,7 +32,7 @@ public void readJournalListFromResource(String resourceFileName) {
         try {
             readJournalList(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8));
         } catch (IOException e) {
-            LOGGER.info("Could not read journal list from file " + resourceFileName, e);
+            Logger.info(this, "Could not read journal list from file " + resourceFileName, e);
         }
     }
 
@@ -44,7 +42,7 @@ public void readJournalListFromFile(File file) throws FileNotFoundException {
         } catch (FileNotFoundException e) {
             throw e;
         } catch (IOException e) {
-            LOGGER.warn("Could not read journal list from file " + file.getAbsolutePath(), e);
+            Logger.warn(this, "Could not read journal list from file " + file.getAbsolutePath(), e);
         }
     }
 
@@ -55,7 +53,7 @@ public void readJournalListFromFile(File file, Charset encoding) throws FileNotF
         } catch (FileNotFoundException e) {
             throw e;
         } catch (IOException e) {
-            LOGGER.warn("Could not read journal list from file " + file.getAbsolutePath(), e);
+            Logger.warn(this, "Could not read journal list from file " + file.getAbsolutePath(), e);
         }
     }
 
@@ -73,7 +71,7 @@ private void readJournalList(Reader in) {
             }
 
         } catch (IOException ex) {
-            LOGGER.info("Could not read journal list from file ", ex);
+            Logger.info(this, "Could not read journal list from file ", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
index 08743e3ffe26..447648538969 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
@@ -7,15 +7,13 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * A repository for all journal abbreviations, including add and find methods.
  */
 public class JournalAbbreviationRepository {
 
-    private static final Log LOGGER = LogFactory.getLog(JournalAbbreviationRepository.class);
     private final Set<Abbreviation> abbreviations = new HashSet<>(16000); // We have over 15.000 abbreviations in the built-in lists
 
     public JournalAbbreviationRepository(Abbreviation... abbreviations) {
@@ -63,7 +61,7 @@ public void addEntry(Abbreviation abbreviation) {
         if (abbreviations.contains(abbreviation)) {
             Abbreviation previous = getAbbreviation(abbreviation.getName()).get();
             abbreviations.remove(previous);
-            LOGGER.info("Duplicate journal abbreviation - old one will be overwritten by new one\nOLD: "
+            Logger.info(this, "Duplicate journal abbreviation - old one will be overwritten by new one\nOLD: "
                     + previous + "\nNEW: " + abbreviation);
         }
 
diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/src/main/java/org/jabref/logic/layout/Layout.java
index 8b541cc36a3f..dcaa4744a74b 100644
--- a/src/main/java/org/jabref/logic/layout/Layout.java
+++ b/src/main/java/org/jabref/logic/layout/Layout.java
@@ -8,15 +8,13 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Main class for formatting DOCUMENT ME!
  */
 public class Layout {
 
-    private static final Log LOGGER = LogFactory.getLog(Layout.class);
 
     private final List<LayoutEntry> layoutEntries;
 
@@ -53,8 +51,8 @@ public Layout(List<StringInt> parsedEntries, LayoutFormatterPreferences prefs) {
                         tmpEntries.add(le);
                         blockEntries = null;
                     } else {
-                        LOGGER.debug(blockStart + '\n' + parsedEntry.s);
-                        LOGGER.warn("Nested field/group entries are not implemented!");
+                        Logger.debug(this, blockStart + '\n' + parsedEntry.s);
+                        Logger.warn(this, "Nested field/group entries are not implemented!");
                         Thread.dumpStack();
                     }
                 }
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index 0bf81c481c14..153868640228 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -80,11 +80,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class LayoutEntry {
-    private static final Log LOGGER = LogFactory.getLog(LayoutEntry.class);
 
     private List<LayoutFormatter> option;
 
@@ -128,7 +126,7 @@ public LayoutEntry(List<StringInt> parsedEntries, int layoutType, LayoutFormatte
         String blockEnd = parsedEntries.get(parsedEntries.size() - 1).s;
 
         if (!blockStart.equals(blockEnd)) {
-            LOGGER.warn("Field start and end entry must be equal.");
+            Logger.warn(this, "Field start and end entry must be equal.");
         }
 
         type = layoutType;
@@ -151,7 +149,7 @@ public LayoutEntry(List<StringInt> parsedEntries, int layoutType, LayoutFormatte
                     tmpEntries.add(le);
                     blockEntries = null;
                 } else {
-                    LOGGER.warn("Nested field entries are not implemented!");
+                    Logger.warn(this, "Nested field entries are not implemented!");
                 }
                 break;
             case LayoutHelper.IS_LAYOUT_TEXT:
@@ -216,7 +214,7 @@ private String handleOptionField(BibEntry bibtex, BibDatabase database) {
         if (BibEntry.TYPE_HEADER.equals(text)) {
             fieldEntry = bibtex.getType();
         } else if (BibEntry.OBSOLETE_TYPE_HEADER.equals(text)) {
-            LOGGER.warn("'" + BibEntry.OBSOLETE_TYPE_HEADER
+            Logger.warn(this, "'" + BibEntry.OBSOLETE_TYPE_HEADER
                     + "' is an obsolete name for the entry type. Please update your layout to use '"
                     + BibEntry.TYPE_HEADER + "' instead.");
             fieldEntry = bibtex.getType();
@@ -571,7 +569,7 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
                 results.add(f);
                 continue;
             } catch (Exception ex) {
-                LOGGER.info("Problem with formatter", ex);
+                Logger.info(this, "Problem with formatter", ex);
             }
 
             // Then check whether this is a user defined formatter
diff --git a/src/main/java/org/jabref/logic/layout/format/FileLink.java b/src/main/java/org/jabref/logic/layout/format/FileLink.java
index 185a8ca56020..e8d31010f630 100644
--- a/src/main/java/org/jabref/logic/layout/format/FileLink.java
+++ b/src/main/java/org/jabref/logic/layout/format/FileLink.java
@@ -8,16 +8,12 @@
 import org.jabref.model.entry.FileFieldParser;
 import org.jabref.model.entry.LinkedFile;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * Export formatter that handles the file link list of JabRef 2.3 and later, by
  * selecting the first file link, if any, specified by the field.
  */
 public class FileLink implements ParamLayoutFormatter {
 
-    private static final Log LOGGER = LogFactory.getLog(FileLink.class);
     private final FileLinkPreferences prefs;
     private String fileType;
 
diff --git a/src/main/java/org/jabref/logic/layout/format/RTFChars.java b/src/main/java/org/jabref/logic/layout/format/RTFChars.java
index 325812058fd3..a489b447f5d0 100644
--- a/src/main/java/org/jabref/logic/layout/format/RTFChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/RTFChars.java
@@ -5,8 +5,7 @@
 import org.jabref.logic.util.strings.RtfCharMap;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Transform a LaTeX-String to RTF.
@@ -25,7 +24,6 @@
  */
 public class RTFChars implements LayoutFormatter {
 
-    private static final Log LOGGER = LogFactory.getLog(LayoutFormatter.class);
 
     private static final RtfCharMap RTF_CHARS = new RtfCharMap();
 
@@ -133,7 +131,7 @@ else if (c == '\\') {
                             i += part.i;
                             sb.append("{\\b ").append(part.s).append('}');
                         } else {
-                            LOGGER.info("Unknown command " + command);
+                            Logger.info(this, "Unknown command " + command);
                         }
                         if (c == ' ') {
                             // command was separated with the content by ' '
diff --git a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
index 7630f15ecb22..aead7c29c8a6 100644
--- a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
+++ b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
@@ -12,9 +12,6 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.FileHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * This formatter iterates over all file links, or all file links of a specified
  * type, outputting a format string given as the first argument. The format string
@@ -79,7 +76,6 @@
  */
 public class WrapFileLinks extends AbstractParamLayoutFormatter {
 
-    private static final Log LOGGER = LogFactory.getLog(WrapFileLinks.class);
     private static final int STRING = 0;
     private static final int ITERATION_COUNT = 1;
     private static final int FILE_PATH = 2;
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
index 56703304e3db..237af816cca1 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
@@ -15,8 +15,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -34,7 +33,6 @@ public class MSBibDatabase {
     public static final String NAMESPACE = "http://schemas.openxmlformats.org/officeDocument/2006/bibliography";
     public static final String PREFIX = "b:";
 
-    private static final Log LOGGER = LogFactory.getLog(MSBibDatabase.class);
 
     private Set<MSBibEntry> entries;
 
@@ -74,7 +72,7 @@ public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
             DocumentBuilder documentBuilder = factory.newDocumentBuilder();
             inputDocument = documentBuilder.parse(new InputSource(reader));
         } catch (ParserConfigurationException | SAXException | IOException e) {
-            LOGGER.warn("Could not parse document", e);
+            Logger.warn(this, "Could not parse document", e);
             return Collections.emptyList();
         }
         NodeList rootList = inputDocument.getElementsByTagNameNS("*", "Sources");
@@ -128,7 +126,7 @@ public Document getDomForExport() {
             }
             document.appendChild(rootNode);
         } catch (ParserConfigurationException e) {
-            LOGGER.warn("Could not build XML document", e);
+            Logger.warn(this, "Could not build XML document", e);
         }
         return document;
     }
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index cec9c307c8c3..df5fa88b3ea3 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -36,11 +36,12 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import org.jabref.logic.util.Version;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.util.FileHelper;
 
+import com.jcabi.log.Logger;
 import com.mashape.unirest.http.Unirest;
-import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
@@ -57,7 +58,6 @@
 public class URLDownload {
     public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36";
 
-    private static final Log LOGGER = LogFactory.getLog(URLDownload.class);
     private final URL source;
     private final Map<String, String> parameters = new HashMap<>();
     private String postData = "";
@@ -90,7 +90,7 @@ public URLDownload(URL source) {
      * Taken from http://stackoverflow.com/a/6055903/873661
      */
     public static void bypassSSLVerification() {
-        LOGGER.warn("Fix SSL exceptions by accepting ALL certificates");
+        LogFactory.getLog(URLDownload.class).warn("Fix SSL exceptions by accepting ALL certificates");
 
         // Create a trust manager that does not validate certificate chains
         TrustManager[] trustAllCerts = {new X509TrustManager() {
@@ -114,7 +114,7 @@ public X509Certificate[] getAcceptedIssuers() {
             context.init(null, trustAllCerts, new SecureRandom());
             HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
         } catch (Exception e) {
-            LOGGER.error("A problem occurred when bypassing SSL verification", e);
+            LogFactory.getLog(URLDownload.class).error("A problem occurred when bypassing SSL verification", e);
         }
     }
 
@@ -133,7 +133,7 @@ public String getMimeType() throws IOException {
                 return contentType;
             }
         } catch (Exception e) {
-            LOGGER.debug("Error getting MIME type of URL via HEAD request", e);
+            Logger.debug(this, "Error getting MIME type of URL via HEAD request", e);
         }
 
         // Use GET request as alternative if no HEAD request is available
@@ -143,7 +143,7 @@ public String getMimeType() throws IOException {
                 return contentType;
             }
         } catch (Exception e) {
-            LOGGER.debug("Error getting MIME type of URL via GET request", e);
+            Logger.debug(this, "Error getting MIME type of URL via GET request", e);
         }
 
         // Try to resolve local URIs
@@ -155,7 +155,7 @@ public String getMimeType() throws IOException {
                 return contentType;
             }
         } catch (IOException e) {
-            LOGGER.debug("Error trying to get MIME type of local URI", e);
+            Logger.debug(this, "Error trying to get MIME type of local URI", e);
         }
 
         return "";
@@ -220,7 +220,7 @@ public List<HttpCookie> getCookieFromUrl() throws IOException {
         try {
             return cookieManager.getCookieStore().get(this.source.toURI());
         } catch (URISyntaxException e) {
-            LOGGER.error("Unable to convert download URL to URI", e);
+            Logger.error(this, "Unable to convert download URL to URI", e);
             return Collections.emptyList();
         }
     }
@@ -234,7 +234,7 @@ public void toFile(Path destination) throws IOException {
         try (InputStream input = new BufferedInputStream(this.openConnection().getInputStream())) {
             Files.copy(input, destination, StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
-            LOGGER.warn("Could not copy input", e);
+            Logger.warn(this, "Could not copy input", e);
             throw e;
         }
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
index acaa48c8a1ad..d6ba58e68a2d 100644
--- a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
@@ -33,8 +33,8 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
+
 
 /**
  * This class embodies a bibliography formatting for OpenOffice, which is composed
@@ -101,7 +101,6 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
 
     private static final Pattern QUOTED = Pattern.compile("\".*\"");
 
-    private static final Log LOGGER = LogFactory.getLog(OOBibStyle.class);
 
     private String name = "";
 
@@ -374,7 +373,7 @@ private void handleStructureLine(String line) {
                 }
 
             } catch (IOException ex) {
-                LOGGER.warn("Cannot parse bibliography structure", ex);
+                Logger.warn(this, "Cannot parse bibliography structure", ex);
             }
         }
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/StyleLoader.java b/src/main/java/org/jabref/logic/openoffice/StyleLoader.java
index 405478002c97..8c652e203bf6 100644
--- a/src/main/java/org/jabref/logic/openoffice/StyleLoader.java
+++ b/src/main/java/org/jabref/logic/openoffice/StyleLoader.java
@@ -11,15 +11,13 @@
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class StyleLoader {
 
     public static final String DEFAULT_AUTHORYEAR_STYLE_PATH = "/resource/openoffice/default_authoryear.jstyle";
     public static final String DEFAULT_NUMERICAL_STYLE_PATH = "/resource/openoffice/default_numerical.jstyle";
 
-    private static final Log LOGGER = LogFactory.getLog(StyleLoader.class);
 
     // All internal styles
     private final List<String> internalStyleFiles = Arrays.asList(DEFAULT_AUTHORYEAR_STYLE_PATH,
@@ -60,19 +58,19 @@ public boolean addStyleIfValid(String filename) {
         try {
             OOBibStyle newStyle = new OOBibStyle(new File(filename), layoutFormatterPreferences, encoding);
             if (externalStyles.contains(newStyle)) {
-                LOGGER.info("External style file " + filename + " already existing.");
+                Logger.info(this, "External style file " + filename + " already existing.");
             } else if (newStyle.isValid()) {
                 externalStyles.add(newStyle);
                 storeExternalStyles();
                 return true;
             } else {
-                LOGGER.error(String.format("Style with filename %s is invalid", filename));
+                Logger.error(this, String.format("Style with filename %s is invalid", filename));
             }
         } catch (FileNotFoundException e) {
             // The file couldn't be found... should we tell anyone?
-            LOGGER.info("Cannot find external style file " + filename, e);
+            Logger.info(this, "Cannot find external style file " + filename, e);
         } catch (IOException e) {
-            LOGGER.info("Problem reading external style file " + filename, e);
+            Logger.info(this, "Problem reading external style file " + filename, e);
         }
         return false;
 
@@ -88,13 +86,13 @@ private void loadExternalStyles() {
                 if (style.isValid()) { //Problem!
                     externalStyles.add(style);
                 } else {
-                    LOGGER.error(String.format("Style with filename %s is invalid", filename));
+                    Logger.error(this, String.format("Style with filename %s is invalid", filename));
                 }
             } catch (FileNotFoundException e) {
                 // The file couldn't be found... should we tell anyone?
-                LOGGER.info("Cannot find external style file " + filename, e);
+                Logger.info(this, "Cannot find external style file " + filename, e);
             } catch (IOException e) {
-                LOGGER.info("Problem reading external style file " + filename, e);
+                Logger.info(this, "Problem reading external style file " + filename, e);
             }
         }
     }
@@ -105,7 +103,7 @@ private void loadInternalStyles() {
             try {
                 internalStyles.add(new OOBibStyle(filename, layoutFormatterPreferences));
             } catch (IOException e) {
-                LOGGER.info("Problem reading internal style file " + filename, e);
+                Logger.info(this, "Problem reading internal style file " + filename, e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
index 33baadedd6bb..8677f485fd3a 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -10,12 +10,10 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class FileAnnotationCache {
 
-    private static final Log LOGGER = LogFactory.getLog(FileAnnotation.class);
     //cache size in entries
     private final static int CACHE_SIZE = 10;
 
@@ -38,12 +36,12 @@ public Map<String, List<FileAnnotation>> load(BibEntry entry) throws Exception {
      * @return Map containing a list of annotations in a list for each file
      */
     public Map<String, List<FileAnnotation>> getFromCache(BibEntry entry) {
-        LOGGER.debug(String.format("Loading Bibentry '%s' from cache.", entry.getCiteKeyOptional().orElse(entry.getId())));
+        Logger.debug(this, String.format("Loading Bibentry '%s' from cache.", entry.getCiteKeyOptional().orElse(entry.getId())));
         return annotationCache.getUnchecked(entry);
     }
 
     public void remove(BibEntry entry) {
-        LOGGER.debug(String.format("Deleted Bibentry '%s' from cache.", entry.getCiteKeyOptional().orElse(entry.getId())));
+        Logger.debug(this, String.format("Deleted Bibentry '%s' from cache.", entry.getCiteKeyOptional().orElse(entry.getId())));
         annotationCache.invalidate(entry);
     }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
index e74351fab672..ca1f48fb51bb 100644
--- a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
@@ -14,8 +14,7 @@
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.model.pdf.FileAnnotationType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -24,7 +23,6 @@
 
 public class PdfAnnotationImporter implements AnnotationImporter {
 
-    private static final Log LOGGER = LogFactory.getLog(PdfAnnotationImporter.class);
 
     /**
      * Imports the comments from a pdf specified by its path
@@ -61,7 +59,7 @@ public List<FileAnnotation> importAnnotations(final Path path) {
                 }
             }
         } catch (IOException e) {
-            LOGGER.error(String.format("Failed to read file '%s'.", path), e);
+            Logger.error(this, String.format("Failed to read file '%s'.", path), e);
         }
         return annotationsList;
     }
@@ -71,7 +69,7 @@ private boolean isSupportedAnnotationType(PDAnnotation annotation) {
             return false;
         }
         if ("Link".equals(annotation.getSubtype()) || "Widget".equals(annotation.getSubtype())) {
-            LOGGER.debug(annotation.getSubtype() + " is excluded from the supported file annotations");
+            Logger.debug(this, annotation.getSubtype() + " is excluded from the supported file annotations");
             return false;
         }
         try {
@@ -79,7 +77,7 @@ private boolean isSupportedAnnotationType(PDAnnotation annotation) {
                 return false;
             }
         } catch (IllegalArgumentException e) {
-            LOGGER.debug(String.format("Could not parse the FileAnnotation %s into any known FileAnnotationType. It was %s!", annotation, annotation.getSubtype()));
+            Logger.debug(this, String.format("Could not parse the FileAnnotation %s into any known FileAnnotationType. It was %s!", annotation, annotation.getSubtype()));
         }
         return true;
     }
@@ -106,17 +104,17 @@ private boolean validatePath(Path path) {
         Objects.requireNonNull(path);
 
         if (!path.toString().toLowerCase(Locale.ROOT).endsWith(".pdf")) {
-            LOGGER.warn(String.format("File '%s' does not end with .pdf!", path));
+            Logger.warn(this, String.format("File '%s' does not end with .pdf!", path));
             return false;
         }
 
         if (!Files.exists(path)) {
-            LOGGER.warn(String.format("File '%s' does not exist!", path));
+            Logger.warn(this, String.format("File '%s' does not exist!", path));
             return false;
         }
 
         if (!Files.isRegularFile(path) || !Files.isReadable(path)) {
-            LOGGER.warn(String.format("File '%s' is not readable!", path));
+            Logger.warn(this, String.format("File '%s' is not readable!", path));
             return false;
         }
 
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
index 8517c453c50d..134748549477 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
@@ -12,12 +12,10 @@
 
 import org.jabref.logic.util.OS;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class ProtectedTermsList implements Comparable<ProtectedTermsList> {
 
-    private static final Log LOGGER = LogFactory.getLog(ProtectedTermsList.class);
 
     private String description;
     private final List<String> termsList;
@@ -93,7 +91,7 @@ public boolean addProtectedTerm(String term, boolean create) {
             writer.write(s);
             termsList.add(term);
         } catch (IOException ioe) {
-            LOGGER.warn("Problem adding protected term to list", ioe);
+            Logger.warn(this, "Problem adding protected term to list", ioe);
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
index aac990c5b9c1..be8540605e5f 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
@@ -17,15 +17,13 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Reads abbreviation files (property files using NAME = ABBREVIATION as a format) into a list of Abbreviations.
  */
 public class ProtectedTermsParser {
 
-    private static final Log LOGGER = LogFactory.getLog(ProtectedTermsParser.class);
 
     private final List<String> terms = new ArrayList<>();
     private String description = Localization.lang("The text after the last line starting with # will be used");
@@ -40,7 +38,7 @@ public void readTermsFromResource(String resourceFileName, String descriptionStr
         try {
             readTermsList(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8));
         } catch (IOException e) {
-            LOGGER.info("Could not read protected terms from resource " + resourceFileName, e);
+            Logger.info(this, "Could not read protected terms from resource " + resourceFileName, e);
         }
     }
 
@@ -51,7 +49,7 @@ public void readTermsFromFile(File file) throws FileNotFoundException {
         } catch (FileNotFoundException e) {
             throw e;
         } catch (IOException e) {
-            LOGGER.warn("Could not read terms from file " + file.getAbsolutePath(), e);
+            Logger.warn(this, "Could not read terms from file " + file.getAbsolutePath(), e);
         }
     }
 
@@ -63,7 +61,7 @@ public void readTermsFromFile(File file, Charset encoding) throws FileNotFoundEx
         } catch (FileNotFoundException e) {
             throw e;
         } catch (IOException e) {
-            LOGGER.warn("Could not read terms from file " + file.getAbsolutePath(), e);
+            Logger.warn(this, "Could not read terms from file " + file.getAbsolutePath(), e);
         }
     }
 
@@ -81,7 +79,7 @@ private void readTermsList(Reader in) {
             }
 
         } catch (IOException ex) {
-            LOGGER.info("Could not read journal list from file ", ex);
+            Logger.info(this, "Could not read journal list from file ", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
index e07b89bbef31..aff0142716e6 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
@@ -8,11 +8,9 @@
 
 import org.jabref.logic.remote.shared.Protocol;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class RemoteListenerServer implements Runnable {
-    private static final Log LOGGER = LogFactory.getLog(RemoteListenerServer.class);
 
     private static final int BACKLOG = 1;
 
@@ -46,7 +44,7 @@ public void run() {
                 } catch (SocketException ex) {
                     return;
                 } catch (IOException e) {
-                    LOGGER.warn("RemoteListenerServer crashed", e);
+                    Logger.warn(this, "RemoteListenerServer crashed", e);
                 }
             }
         } finally {
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java
index c043a186c263..0f8cf0647735 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java
@@ -5,8 +5,7 @@
 
 import org.jabref.JabRefExecutorService;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Manages the RemoteListenerServerThread through typical life cycle methods.
@@ -18,7 +17,6 @@
  */
 public class RemoteListenerServerLifecycle implements AutoCloseable {
 
-    private static final Log LOGGER = LogFactory.getLog(RemoteListenerServerLifecycle.class);
 
     private RemoteListenerServerThread remoteListenerServerThread;
 
@@ -42,7 +40,7 @@ public void open(MessageHandler messageHandler, int port) {
         try {
             result = new RemoteListenerServerThread(messageHandler, port);
         } catch (BindException e) {
-            LOGGER.warn("Port is blocked", e);
+            Logger.warn(this, "Port is blocked", e);
             result = null;
         } catch (IOException e) {
             result = null;
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
index 922d824377ae..eb27e660931f 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
@@ -2,15 +2,13 @@
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This thread wrapper is required to be able to interrupt the remote listener while listening on a port.
  */
 public class RemoteListenerServerThread extends Thread {
 
-    private static final Log LOGGER = LogFactory.getLog(RemoteListenerServerThread.class);
 
     private final RemoteListenerServer server;
 
@@ -23,7 +21,7 @@ public RemoteListenerServerThread(MessageHandler messageHandler, int port) throw
     public void interrupt() {
         super.interrupt();
 
-        LOGGER.debug("Interrupting " + this.getName());
+        Logger.debug(this, "Interrupting " + this.getName());
         this.server.closeServerSocket();
     }
 
diff --git a/src/main/java/org/jabref/logic/remote/shared/Protocol.java b/src/main/java/org/jabref/logic/remote/shared/Protocol.java
index 81440b1b0c98..245a4ddc8c70 100644
--- a/src/main/java/org/jabref/logic/remote/shared/Protocol.java
+++ b/src/main/java/org/jabref/logic/remote/shared/Protocol.java
@@ -6,8 +6,7 @@
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Every message is terminated with '\0'.
@@ -16,7 +15,6 @@ public class Protocol {
 
     public static final String IDENTIFIER = "jabref";
 
-    private static final Log LOGGER = LogFactory.getLog(Protocol.class);
 
     private final Socket socket;
     private final OutputStream out;
@@ -43,7 +41,7 @@ public String receiveMessage() throws IOException {
                 result.append((char) c);
             }
         } catch (SocketTimeoutException ex) {
-            LOGGER.info("Connection timed out.", ex);
+            Logger.info(this, "Connection timed out.", ex);
         }
         return result.toString();
     }
diff --git a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
index 425fee9c9b8e..7fcc0186a223 100644
--- a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
+++ b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
@@ -9,15 +9,13 @@
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * @author Silberer, Zirn
  */
 public class DatabaseSearcher {
 
-    private static final Log LOGGER = LogFactory.getLog(DatabaseSearcher.class);
     private final SearchQuery query;
 
     private final BibDatabase database;
@@ -28,10 +26,10 @@ public DatabaseSearcher(SearchQuery query, BibDatabase database) {
     }
 
     public List<BibEntry> getMatches() {
-        LOGGER.debug("Search term: " + query);
+        Logger.debug(this, "Search term: " + query);
 
         if (!query.isValid()) {
-            LOGGER.warn("Search failed: illegal search expression");
+            Logger.warn(this, "Search failed: illegal search expression");
             return Collections.emptyList();
         }
 
diff --git a/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java b/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java
index 38b26da8c0d1..b80183dfc3d1 100644
--- a/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/CiteKeyBasedFileFinder.java
@@ -19,12 +19,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileHelper;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class CiteKeyBasedFileFinder implements FileFinder {
 
-    private static final Log LOGGER = LogFactory.getLog(CiteKeyBasedFileFinder.class);
     private final boolean exactKeyOnly;
 
     CiteKeyBasedFileFinder(boolean exactKeyOnly) {
@@ -91,7 +89,7 @@ public Set<Path> findFilesByExtension(List<Path> directories, List<String> exten
             try (Stream<Path> files = Files.find(directory, Integer.MAX_VALUE, isFileWithCorrectExtension)) {
                 result.addAll(files.collect(Collectors.toSet()));
             } catch (IOException e) {
-                LOGGER.error("Problem in finding files", e);
+                Logger.error(this, "Problem in finding files", e);
             }
         }
         return result;
diff --git a/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java b/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
index 10f0e2a0a450..aaca66dc5b2b 100644
--- a/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
@@ -19,11 +19,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 class RegExpBasedFileFinder implements FileFinder {
-    private static final Log LOGGER = LogFactory.getLog(RegExpBasedFileFinder.class);
 
     private static final String EXT_MARKER = "__EXTENSION__";
 
@@ -242,7 +240,7 @@ private List<Path> findFile(BibEntry entry, Path directory, String file, String
                         }
                     });
                 } catch (IOException e) {
-                    LOGGER.debug(e);
+                    Logger.debug(this, "I/O issues", e);
                 }
             } // End process directory information
         }
@@ -258,7 +256,7 @@ private List<Path> findFile(BibEntry entry, Path directory, String file, String
                     .collect(Collectors.toList());
             res.addAll(matches);
         } catch (IOException e) {
-            LOGGER.debug(e);
+            Logger.debug(this, "I/O issues", e);
         }
         return res;
     }
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 22a76ec948f6..4b80bde8d8c9 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -35,14 +35,12 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * A bibliography database.
  */
 public class BibDatabase {
-    private static final Log LOGGER = LogFactory.getLog(BibDatabase.class);
     private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(".*#[^#]+#.*");
     /**
      * State attributes
@@ -464,7 +462,7 @@ private String resolveString(String label, Set<String> usedIds, Set<String> allU
                 // circular reference, and have to stop to avoid
                 // infinite recursion.
                 if (usedIds.contains(string.getId())) {
-                    LOGGER.info("Stopped due to circular reference in strings: " + label);
+                    Logger.info(this, "Stopped due to circular reference in strings: " + label);
                     return label;
                 }
                 // If not, log this string's ID now.
@@ -570,8 +568,7 @@ public void unregisterListener(Object listener) {
         try {
             this.eventBus.unregister(listener);
         } catch (IllegalArgumentException e) {
-            // occurs if the event source has not been registered, should not prevent shutdown
-            LOGGER.debug(e);
+            Logger.debug(this, "occurs if the event source has not been registered, should not prevent shutdown", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 1f5e900a5c41..8747bbcd4310 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -31,8 +31,7 @@
 
 import com.google.common.base.Strings;
 import com.google.common.eventbus.EventBus;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class BibEntry implements Cloneable {
 
@@ -41,7 +40,6 @@ public class BibEntry implements Cloneable {
     public static final String KEY_FIELD = "bibtexkey";
     public static final String DEFAULT_TYPE = "misc";
     protected static final String ID_FIELD = "id";
-    private static final Log LOGGER = LogFactory.getLog(BibEntry.class);
     private static final Pattern REMOVE_TRAILING_WHITESPACE = Pattern.compile("\\s+$");
     private final SharedBibEntryData sharedBibEntryData;
     /**
@@ -327,7 +325,7 @@ private Optional<String> genericGetFieldOrAlias(String name, GetFieldInterface g
                     return parsedDate.get().getDay().map(Object::toString);
                 }
             } else {
-                LOGGER.warn("Could not parse date " + date.get());
+                Logger.warn(this, "Could not parse date " + date.get());
                 return Optional.empty(); // Date field not in valid format
             }
         }
@@ -719,8 +717,7 @@ public void unregisterListener(Object object) {
         try {
             this.eventBus.unregister(object);
         } catch (IllegalArgumentException e) {
-            // occurs if the event source has not been registered, should not prevent shutdown
-            LOGGER.debug(e);
+            Logger.debug(this, "occurs if the event source has not been registered, should not prevent shutdown", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/model/entry/identifier/DOI.java b/src/main/java/org/jabref/model/entry/identifier/DOI.java
index b3e6d75b824f..45701289a4e4 100644
--- a/src/main/java/org/jabref/model/entry/identifier/DOI.java
+++ b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -9,8 +9,7 @@
 
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Class for working with Digital object identifiers (DOIs)
@@ -18,7 +17,6 @@
  * @see https://en.wikipedia.org/wiki/Digital_object_identifier
  */
 public class DOI implements Identifier {
-    private static final Log LOGGER = LogFactory.getLog(DOI.class);
 
     // DOI resolver
     private static final URI RESOLVER = URI.create("https://doi.org");
@@ -156,7 +154,7 @@ public Optional<URI> getExternalURI() {
             return Optional.of(uri);
         } catch (URISyntaxException e) {
             // should never happen
-            LOGGER.error(doi + " could not be encoded as URI.", e);
+            Logger.error(this, doi + " could not be encoded as URI.", e);
             return Optional.empty();
         }
     }
diff --git a/src/main/java/org/jabref/model/entry/identifier/Eprint.java b/src/main/java/org/jabref/model/entry/identifier/Eprint.java
index 863841fc3c83..b41a9657c9af 100644
--- a/src/main/java/org/jabref/model/entry/identifier/Eprint.java
+++ b/src/main/java/org/jabref/model/entry/identifier/Eprint.java
@@ -9,8 +9,7 @@
 
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Class for working with Eprint identifiers
@@ -21,7 +20,6 @@
 
 public class Eprint implements Identifier {
     public static final URI RESOLVER = URI.create("http://arxiv.org");
-    private static final Log LOGGER = LogFactory.getLog(Eprint.class);
 
     // Regex
     // (see https://arxiv.org/help/arxiv_identifier)
@@ -109,7 +107,7 @@ public Optional<URI> getExternalURI() {
             return Optional.of(uri);
         } catch (URISyntaxException e) {
             // should never happen
-            LOGGER.error(eprint + " could not be encoded as URI.", e);
+            Logger.error(this, eprint + " could not be encoded as URI.", e);
             return Optional.empty();
         }
     }
diff --git a/src/main/java/org/jabref/model/groups/SearchGroup.java b/src/main/java/org/jabref/model/groups/SearchGroup.java
index e3f77004984f..8d27cd3aeb79 100644
--- a/src/main/java/org/jabref/model/groups/SearchGroup.java
+++ b/src/main/java/org/jabref/model/groups/SearchGroup.java
@@ -5,8 +5,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.GroupSearchQuery;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This group matches entries by a complex search pattern, which might include conditions about the values of
@@ -14,7 +13,6 @@
  */
 public class SearchGroup extends AbstractGroup {
 
-    private static final Log LOGGER = LogFactory.getLog(SearchGroup.class);
     private final GroupSearchQuery query;
 
     public SearchGroup(String name, GroupHierarchyType context, String searchExpression, boolean caseSensitive,
@@ -56,7 +54,7 @@ public AbstractGroup deepCopy() {
         } catch (Throwable t) {
             // this should never happen, because the constructor obviously
             // succeeded in creating _this_ instance!
-            LOGGER.error("Internal error in SearchGroup.deepCopy(). "
+            Logger.error(this, "Internal error in SearchGroup.deepCopy(). "
                     + "Please report this on https://github.com/JabRef/jabref/issues", t);
             return null;
         }
diff --git a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
index 1cabbeaabbeb..6d47161ac431 100644
--- a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
@@ -14,6 +14,7 @@
 import org.jabref.search.SearchLexer;
 import org.jabref.search.SearchParser;
 
+import com.jcabi.log.Logger;
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.BailErrorStrategy;
 import org.antlr.v4.runtime.BaseErrorListener;
@@ -22,15 +23,12 @@
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * The search query must be specified in an expression that is acceptable by the Search.g4 grammar.
  */
 public class GrammarBasedSearchRule implements SearchRule {
 
-    private static final Log LOGGER = LogFactory.getLog(GrammarBasedSearchRule.class);
 
     private final boolean caseSensitiveSearch;
     private final boolean regExpSearch;
@@ -96,7 +94,7 @@ public boolean applyRule(String query, BibEntry bibEntry) {
         try {
             return new BibtexSearchVisitor(caseSensitiveSearch, regExpSearch, bibEntry).visit(tree);
         } catch (Exception e) {
-            LOGGER.debug("Search failed", e);
+            Logger.debug(this, "Search failed", e);
             return false;
         }
     }
@@ -107,7 +105,7 @@ public boolean validateSearchStrings(String query) {
             init(query);
             return true;
         } catch (ParseCancellationException e) {
-            LOGGER.debug("Search query invalid", e);
+            Logger.debug(this, "Search query invalid", e);
             return false;
         }
     }
diff --git a/src/main/java/org/jabref/pdfimport/PdfImporter.java b/src/main/java/org/jabref/pdfimport/PdfImporter.java
index 2e25ca19e158..334f55f69824 100644
--- a/src/main/java/org/jabref/pdfimport/PdfImporter.java
+++ b/src/main/java/org/jabref/pdfimport/PdfImporter.java
@@ -37,12 +37,10 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class PdfImporter {
 
-    private static final Log LOGGER = LogFactory.getLog(PdfImporter.class);
     private final JabRefFrame frame;
     private final BasePanel panel;
     private final MainTable entryTable;
@@ -159,7 +157,7 @@ private void doXMPImport(String fileName, List<BibEntry> res) {
         BibEntry entry;
         if (localRes.isEmpty()) {
             // import failed -> generate default entry
-            LOGGER.info("Import failed");
+            Logger.info(this, "Import failed");
             createNewBlankEntry(fileName).ifPresent(res::add);
             return;
         }
@@ -268,7 +266,7 @@ private Optional<BibEntry> createNewEntry() {
 
                 return Optional.of(bibEntry);
             } catch (KeyCollisionException ex) {
-                LOGGER.info("Key collision occurred", ex);
+                Logger.info(this, "Key collision occurred", ex);
             }
         }
         return Optional.empty();
diff --git a/src/main/java/org/jabref/preferences/CustomExportList.java b/src/main/java/org/jabref/preferences/CustomExportList.java
index db63efc83667..cfe47d045eeb 100644
--- a/src/main/java/org/jabref/preferences/CustomExportList.java
+++ b/src/main/java/org/jabref/preferences/CustomExportList.java
@@ -15,8 +15,7 @@
 import ca.odell.glazedlists.BasicEventList;
 import ca.odell.glazedlists.EventList;
 import ca.odell.glazedlists.SortedList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * This class handles user defined custom export formats. They are initially
@@ -28,7 +27,6 @@
 
 public class CustomExportList {
 
-    private static final Log LOGGER = LogFactory.getLog(CustomExportList.class);
     private final EventList<List<String>> list;
     private final SortedList<List<String>> sorted;
 
@@ -73,7 +71,7 @@ private void readPrefs(JabRefPreferences prefs, JournalAbbreviationLoader loader
                 list.add(s);
             } else {
                 String customExportFormat = prefs.get(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i);
-                LOGGER.error("Error initializing custom export format from string " + customExportFormat);
+                Logger.error(this, "Error initializing custom export format from string " + customExportFormat);
             }
             i++;
         }
diff --git a/src/main/java/org/jabref/preferences/CustomImportList.java b/src/main/java/org/jabref/preferences/CustomImportList.java
index 34202085dcf4..126e6c5c264e 100644
--- a/src/main/java/org/jabref/preferences/CustomImportList.java
+++ b/src/main/java/org/jabref/preferences/CustomImportList.java
@@ -7,8 +7,7 @@
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.fileformat.CustomImporter;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Collection of user defined custom import formats.
@@ -18,7 +17,6 @@
  */
 public class CustomImportList extends TreeSet<CustomImporter> {
 
-    private static final Log LOGGER = LogFactory.getLog(CustomImportList.class);
 
     private final JabRefPreferences prefs;
 
@@ -42,7 +40,7 @@ private void readPrefs() {
                     super.add(new CustomImporter(s.get(3), s.get(2)));
                 }
             } catch (Exception e) {
-                LOGGER.warn("Could not load " + s.get(0) + " from preferences. Will ignore.", e);
+                Logger.warn(this, "Could not load " + s.get(0) + " from preferences. Will ignore.", e);
             }
             i++;
         }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 4334f0d4c95f..a56a8d82311b 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -79,8 +79,7 @@
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 public class JabRefPreferences implements PreferencesService {
 
@@ -374,7 +373,6 @@ public class JabRefPreferences implements PreferencesService {
     // Telemetry collection
     private static final String COLLECT_TELEMETRY = "collectTelemetry";
     private static final String ALREADY_ASKED_TO_COLLECT_TELEMETRY = "askedCollectTelemetry";
-    private static final Log LOGGER = LogFactory.getLog(JabRefPreferences.class);
     private static final Class PREFS_BASE_CLASS = JabRefMain.class;
     private static final String DB_CONNECT_USERNAME = "dbConnectUsername";
     private static final String DB_CONNECT_DATABASE = "dbConnectDatabase";
@@ -432,7 +430,7 @@ private JabRefPreferences() {
                 importPreferences("jabref.xml");
             }
         } catch (JabRefException e) {
-            LOGGER.warn("Could not import preferences from jabref.xml: " + e.getMessage(), e);
+            Logger.warn(this, "Could not import preferences from jabref.xml: " + e.getMessage(), e);
         }
 
         // load user preferences
@@ -917,7 +915,7 @@ public String getUser() {
         try {
             return get(DEFAULT_OWNER) + '-' + InetAddress.getLocalHost().getHostName();
         } catch (UnknownHostException ex) {
-            LOGGER.debug("Hostname not found.", ex);
+            Logger.debug(this, "Hostname not found.", ex);
             return get(DEFAULT_OWNER);
         }
     }
@@ -1135,13 +1133,13 @@ public void flush() {
             try {
                 exportPreferences("jabref.xml");
             } catch (JabRefException e) {
-                LOGGER.warn("Could not export preferences for memory stick mode: " + e.getMessage(), e);
+                Logger.warn(this, "Could not export preferences for memory stick mode: " + e.getMessage(), e);
             }
         }
         try {
             prefs.flush();
         } catch (BackingStoreException ex) {
-            LOGGER.warn("Cannot communicate with backing store", ex);
+            Logger.warn(this, "Cannot communicate with backing store", ex);
         }
     }
 
@@ -1162,7 +1160,7 @@ public GlobalBibtexKeyPattern getKeyPattern() {
                 }
             }
         } catch (BackingStoreException ex) {
-            LOGGER.info("BackingStoreException in JabRefPreferences.getKeyPattern", ex);
+            Logger.info(this, "BackingStoreException in JabRefPreferences.getKeyPattern", ex);
         }
         return keyPattern;
     }
@@ -1180,7 +1178,7 @@ public void putKeyPattern(GlobalBibtexKeyPattern pattern) {
         try {
             pre.clear(); // We remove all old entries.
         } catch (BackingStoreException ex) {
-            LOGGER.info("BackingStoreException in JabRefPreferences.putKeyPattern", ex);
+            Logger.info(this, "BackingStoreException in JabRefPreferences.putKeyPattern", ex);
         }
 
         Set<String> allKeys = pattern.getAllKeys();
@@ -1211,7 +1209,7 @@ public void storeCustomEntryTypes(List<CustomEntryType> customEntryTypes, BibDat
 
             prefsNode.flush();
         } catch (BackingStoreException e) {
-            LOGGER.info("Updating stored custom entry types failed.", e);
+            Logger.info(this, "Updating stored custom entry types failed.", e);
         }
     }
 
@@ -1224,7 +1222,7 @@ public List<CustomEntryType> loadCustomEntryTypes(BibDatabaseMode bibDatabaseMod
                     .filter(Objects::nonNull)
                     .forEach(typeString -> CustomEntryType.parse(typeString).ifPresent(storedEntryTypes::add));
         } catch (BackingStoreException e) {
-            LOGGER.info("Parsing customized entry types failed.", e);
+            Logger.info(this, "Parsing customized entry types failed.", e);
         }
         return storedEntryTypes;
     }
@@ -1248,7 +1246,7 @@ public Map<String, Object> getPreferences() {
                 result.put(key, value);
             }
         } catch (BackingStoreException e) {
-            LOGGER.info("could not retrieve preference keys", e);
+            Logger.info(this, "could not retrieve preference keys", e);
         }
         return result;
     }
diff --git a/src/main/java/org/jabref/shared/DBMSConnection.java b/src/main/java/org/jabref/shared/DBMSConnection.java
index ad15d6d76fe5..ef89c8bd9515 100644
--- a/src/main/java/org/jabref/shared/DBMSConnection.java
+++ b/src/main/java/org/jabref/shared/DBMSConnection.java
@@ -9,12 +9,11 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.shared.exception.InvalidDBMSConnectionPropertiesException;
 
-import org.apache.commons.logging.Log;
+import com.jcabi.log.Logger;
 import org.apache.commons.logging.LogFactory;
 
 public class DBMSConnection {
 
-    private static final Log LOGGER = LogFactory.getLog(DBMSConnection.class);
 
     private final Connection connection;
     private final DBMSConnectionProperties properties;
@@ -39,7 +38,7 @@ public DBMSConnection(DBMSConnectionProperties properties) throws SQLException,
         } catch (SQLException e) {
             // Some systems like PostgreSQL retrieves 0 to every exception.
             // Therefore a stable error determination is not possible.
-            LOGGER.error("Could not connect to database: " + e.getMessage() + " - Error code: " + e.getErrorCode());
+            Logger.error(this, "Could not connect to database: " + e.getMessage() + " - Error code: " + e.getErrorCode());
 
             throw e;
         }
@@ -65,7 +64,7 @@ public static Set<DBMSType> getAvailableDBMSTypes() {
                 dbmsTypes.add(dbms);
             } catch (ClassNotFoundException e) {
                 // In case that the driver is not available do not perform tests for this system.
-                LOGGER.info(Localization.lang("%0 driver not available.", dbms.toString()));
+                LogFactory.getLog(DBMSConnection.class).info(Localization.lang("%0 driver not available.", dbms.toString()));
             }
         }
         return dbmsTypes;
diff --git a/src/main/java/org/jabref/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/shared/DBMSConnectionProperties.java
index f1351bc0bf43..fab2ef6dc2c6 100644
--- a/src/main/java/org/jabref/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/shared/DBMSConnectionProperties.java
@@ -8,15 +8,13 @@
 import org.jabref.shared.prefs.SharedDatabasePreferences;
 import org.jabref.shared.security.Password;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Keeps all essential data for establishing a new connection to a DBMS using {@link DBMSConnection}.
  */
 public class DBMSConnectionProperties {
 
-    private static final Log LOGGER = LogFactory.getLog(DBMSConnectionProperties.class);
 
     private DBMSType type;
     private String host;
@@ -124,7 +122,7 @@ private void setFromPreferences(SharedDatabasePreferences prefs) {
                 try {
                     this.password = new Password(prefs.getPassword().get().toCharArray(), prefs.getUser().get()).decrypt();
                 } catch (UnsupportedEncodingException | GeneralSecurityException e) {
-                    LOGGER.error("Could not decrypt password", e);
+                    Logger.error(this, "Could not decrypt password", e);
                 }
             }
         }
diff --git a/src/main/java/org/jabref/shared/DBMSProcessor.java b/src/main/java/org/jabref/shared/DBMSProcessor.java
index 9d10436e8240..25e7e0912311 100644
--- a/src/main/java/org/jabref/shared/DBMSProcessor.java
+++ b/src/main/java/org/jabref/shared/DBMSProcessor.java
@@ -19,8 +19,7 @@
 import org.jabref.model.entry.event.EntryEventSource;
 import org.jabref.shared.exception.OfflineLockException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Processes all incoming or outgoing bib data to external SQL Database and manages its structure.
@@ -29,9 +28,6 @@ public abstract class DBMSProcessor {
 
     public static final String PROCESSOR_ID = UUID.randomUUID().toString();
 
-
-    protected static final Log LOGGER = LogFactory.getLog(DBMSProcessor.class);
-
     protected final Connection connection;
 
     protected DBMSConnectionProperties connectionProperties;
@@ -102,7 +98,7 @@ public void setupSharedDatabase() throws SQLException {
 
         if (!checkBaseIntegrity()) {
             // can only happen with users direct intervention on shared database
-            LOGGER.error("Corrupt_shared_database_structure.");
+            Logger.error(this, "Corrupt_shared_database_structure.");
         }
     }
 
@@ -165,7 +161,7 @@ protected void insertIntoEntryTable(BibEntry bibEntry) {
                 }
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
@@ -196,7 +192,7 @@ private boolean checkForBibEntryExistence(BibEntry bibEntry) {
                 }
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
         return false;
     }
@@ -230,7 +226,7 @@ private void insertIntoFieldTable(BibEntry bibEntry) {
                 }
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
@@ -287,7 +283,7 @@ public void updateEntry(BibEntry localBibEntry) throws OfflineLockException, SQL
                 throw new OfflineLockException(localBibEntry, sharedBibEntry);
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
             connection.rollback(); // undo changes made in current transaction
         } finally {
             connection.setAutoCommit(true); // enable auto commit mode again
@@ -407,7 +403,7 @@ public void removeEntry(BibEntry bibEntry) {
             preparedStatement.setInt(1, bibEntry.getSharedBibEntryData().getSharedID());
             preparedStatement.executeUpdate();
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
 
     }
@@ -476,7 +472,7 @@ private List<BibEntry> getSharedEntryList(int sharedID) {
                 sharedEntries.add(bibEntry);
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error", e);
+            Logger.error(this, "SQL Error", e);
         }
 
         return sharedEntries;
@@ -498,7 +494,7 @@ public Map<Integer, Integer> getSharedIDVersionMapping() {
                 sharedIDVersionMapping.put(selectEntryResultSet.getInt("SHARED_ID"), selectEntryResultSet.getInt("VERSION"));
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error", e);
+            Logger.error(this, "SQL Error", e);
         }
 
         return sharedIDVersionMapping;
@@ -515,7 +511,7 @@ public Map<String, String> getSharedMetaData() {
                 data.put(resultSet.getString("KEY"), resultSet.getString("VALUE"));
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error", e);
+            Logger.error(this, "SQL Error", e);
         }
 
         return data;
@@ -545,7 +541,7 @@ public void setSharedMetaData(Map<String, String> data) throws SQLException {
                 preparedStatement.setString(2, metaEntry.getValue());
                 preparedStatement.executeUpdate();
             } catch (SQLException e) {
-                LOGGER.error("SQL Error: ", e);
+                Logger.error(this, "SQL Error: ", e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/shared/DBMSSynchronizer.java b/src/main/java/org/jabref/shared/DBMSSynchronizer.java
index fa935d593028..2417ff176ed8 100644
--- a/src/main/java/org/jabref/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/shared/DBMSSynchronizer.java
@@ -32,8 +32,7 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Synchronizes the shared or local databases with their opposite side.
@@ -41,7 +40,6 @@
  */
 public class DBMSSynchronizer {
 
-    private static final Log LOGGER = LogFactory.getLog(DBMSSynchronizer.class);
 
     private DBMSProcessor dbmsProcessor;
     private DBMSType dbmsType;
@@ -144,7 +142,7 @@ public void listen(EntryEvent event) {
      */
     public void initializeDatabases() throws DatabaseNotSupportedException, SQLException {
         if (!dbmsProcessor.checkBaseIntegrity()) {
-            LOGGER.info("Integrity check failed. Fixing...");
+            Logger.info(this, "Integrity check failed. Fixing...");
             dbmsProcessor.setupSharedDatabase();
 
             // This check should only be performed once on initial database setup.
@@ -248,7 +246,7 @@ public void synchronizeSharedEntry(BibEntry bibEntry) {
         } catch (OfflineLockException exception) {
             eventBus.post(new UpdateRefusedEvent(bibDatabaseContext, exception.getLocalBibEntry(), exception.getSharedBibEntry()));
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
@@ -263,7 +261,7 @@ public void synchronizeLocalMetaData() {
         try {
             MetaDataParser.parse(metaData, dbmsProcessor.getSharedMetaData(), keywordSeparator);
         } catch (ParseException e) {
-            LOGGER.error("Parse error", e);
+            Logger.error(this, "Parse error", e);
         }
     }
 
@@ -277,7 +275,7 @@ private void synchronizeSharedMetaData(MetaData data, GlobalBibtexKeyPattern glo
         try {
             dbmsProcessor.setSharedMetaData(MetaDataSerializer.getSerializedStringMap(data, globalCiteKeyPattern));
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
@@ -296,7 +294,7 @@ public void applyMetaData() {
                 } catch (OfflineLockException exception) {
                     eventBus.post(new UpdateRefusedEvent(bibDatabaseContext, exception.getLocalBibEntry(), exception.getSharedBibEntry()));
                 } catch (SQLException e) {
-                    LOGGER.error("SQL Error: ", e);
+                    Logger.error(this, "SQL Error: ", e);
                 }
             }
         }
@@ -329,7 +327,7 @@ public boolean checkCurrentConnection() {
             return isValid;
 
         } catch (SQLException e) {
-            LOGGER.error("SQL Error:", e);
+            Logger.error(this, "SQL Error:", e);
             return false;
         }
     }
@@ -363,7 +361,7 @@ public void closeSharedDatabase() {
             dbmsProcessor.stopNotificationListener();
             currentConnection.close();
         } catch (SQLException e) {
-            LOGGER.error("SQL Error:", e);
+            Logger.error(this, "SQL Error:", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/shared/OracleProcessor.java b/src/main/java/org/jabref/shared/OracleProcessor.java
index d213b44b8485..649dc1043a77 100644
--- a/src/main/java/org/jabref/shared/OracleProcessor.java
+++ b/src/main/java/org/jabref/shared/OracleProcessor.java
@@ -6,6 +6,7 @@
 
 import org.jabref.shared.listener.OracleNotificationListener;
 
+import com.jcabi.log.Logger;
 import oracle.jdbc.OracleConnection;
 import oracle.jdbc.OracleStatement;
 import oracle.jdbc.dcn.DatabaseChangeRegistration;
@@ -91,7 +92,7 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
             }
 
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
 
     }
@@ -102,7 +103,7 @@ public void stopNotificationListener() {
             oracleConnection.unregisterDatabaseChangeNotification(databaseChangeRegistration);
             oracleConnection.close();
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/shared/PostgreSQLProcessor.java b/src/main/java/org/jabref/shared/PostgreSQLProcessor.java
index a6443e4aa392..e15df1ce943c 100644
--- a/src/main/java/org/jabref/shared/PostgreSQLProcessor.java
+++ b/src/main/java/org/jabref/shared/PostgreSQLProcessor.java
@@ -5,7 +5,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.shared.listener.PostgresSQLNotificationListener;
@@ -13,6 +12,7 @@
 import com.impossibl.postgres.api.jdbc.PGConnection;
 import com.impossibl.postgres.jdbc.PGDataSource;
 import com.impossibl.postgres.jdbc.ThreadedHousekeeper;
+import com.jcabi.log.Logger;
 
 /**
  * Processes all incoming or outgoing bib data to PostgreSQL database and manages its structure.
@@ -76,7 +76,7 @@ protected void insertIntoEntryTable(BibEntry bibEntry) {
                 }
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
@@ -88,7 +88,7 @@ String escape(String expression) {
     @Override
     public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
         // Disable cleanup output of ThreadedHousekeeper
-        Logger.getLogger(ThreadedHousekeeper.class.getName()).setLevel(Level.SEVERE);
+        java.util.logging.Logger.getLogger(ThreadedHousekeeper.class.getName()).setLevel(Level.SEVERE);
 
         this.listener = new PostgresSQLNotificationListener(dbmsSynchronizer);
 
@@ -106,7 +106,7 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
             // Otherwise the listener is going to be deleted by GC.
             pgConnection.addNotificationListener(listener);
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
@@ -115,7 +115,7 @@ public void stopNotificationListener() {
         try {
             pgConnection.close();
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 
@@ -124,7 +124,7 @@ public void notifyClients() {
         try {
             pgConnection.createStatement().execute("NOTIFY jabrefLiveUpdate, '" + PROCESSOR_ID + "';");
         } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
+            Logger.error(this, "SQL Error: ", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/shared/prefs/SharedDatabasePreferences.java b/src/main/java/org/jabref/shared/prefs/SharedDatabasePreferences.java
index dd1d08d3a536..d3af013c9329 100644
--- a/src/main/java/org/jabref/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/shared/prefs/SharedDatabasePreferences.java
@@ -11,15 +11,13 @@
 import org.jabref.shared.DBMSConnectionProperties;
 import org.jabref.shared.security.Password;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.jcabi.log.Logger;
 
 /**
  * Stores and reads persistent data for {@link ConnectToSharedDatabaseDialog}.
  */
 public class SharedDatabasePreferences {
 
-    private static final Log LOGGER = LogFactory.getLog(SharedDatabasePreferences.class);
 
     private static final String DEFAULT_NODE = "default";
     private static final String PARENT_NODE = "jabref-shared";
@@ -128,7 +126,7 @@ public void putAllDBMSConnectionProperties(DBMSConnectionProperties properties)
         try {
             setPassword(new Password(properties.getPassword().toCharArray(), properties.getUser()).encrypt());
         } catch (GeneralSecurityException | UnsupportedEncodingException e) {
-            LOGGER.error("Could not store the password due to encryption problems.", e);
+            Logger.error(this, "Could not store the password due to encryption problems.", e);
         }
     }
 }